diff --git a/.bazelproject b/.bazelproject
index 84486b6f3..0607dd038 100644
--- a/.bazelproject
+++ b/.bazelproject
@@ -19,4 +19,4 @@ additional_languages:
 
 
 # Please uncomment an android-SDK platform. Available SDKs are:
-android_sdk_platform: android-28
+android_sdk_platform: android-34
diff --git a/.bazelrc b/.bazelrc
new file mode 100644
index 000000000..c642de9eb
--- /dev/null
+++ b/.bazelrc
@@ -0,0 +1,9 @@
+# Include debug info in the compiled jars
+build --javacopt=-g
+build --host_javacopt=-g
+
+build --experimental_google_legacy_api
+build --enable_platform_specific_config
+build:linux --sandbox_tmpfs_path=/tmp
+test --enable_platform_specific_config
+test:linux --sandbox_tmpfs_path=/tmp
diff --git a/.bazelversion b/.bazelversion
index 1545d9665..18bb4182d 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.5.0
+7.5.0
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..57c46906b
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,121 @@
+name: Build
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - 'axt_**_release_branch'
+
+  pull_request:
+    branches:
+      - main
+      - 'axt_**_release_branch'
+
+env:
+  cache-version: v2
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install Java 21 
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - name: 'Cache Bazel files'
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/bazel
+          key: ${{ runner.os }}-${{ env.cache-version }}-bazel-build-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-version }}-bazel-build-
+      - name: Build maven artifacts
+        run: bazelisk build //:axt_m2repository
+        shell: bash
+      - name: cp to upload dir
+        run: |
+          mkdir -p ~/download
+          cp bazel-bin/axt_m2repository.zip ~/download
+        shell: bash
+      - name: 'Upload local snapshot for tests'
+        uses: actions/upload-artifact@v4
+        with:
+          name: local-snapshot
+          path: ~/download
+      - name: 'Clean bazel cache'
+        run: |
+          rm -rf $(bazel info repository_cache)
+        shell: bash
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - name: 'Cache Bazel files'
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/bazel
+          key: ${{ runner.os }}-${{ env.cache-version }}-bazel-test-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-${{ env.cache-version }}-bazel-test-
+      - name: Run Robolectric tests and fast tagged tests
+        run: bazelisk test --test_tag_filters=robolectric,fast --build_tag_filters=robolectric,fast --test_output=all ...
+        shell: bash
+      - name: 'Clean bazel cache'
+        run: |
+          rm -rf $(bazel info repository_cache)
+        shell: bash
+  gradle-emulator-test:
+    runs-on: ubuntu-latest
+    needs: [build]
+    timeout-minutes: 20
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Install Java 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'zulu'
+          java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - name: Enable KVM group perms
+        run: |
+            echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+            sudo udevadm control --reload-rules
+            sudo udevadm trigger --name-match=kvm       
+      - name: 'Cache Gradle files'
+        uses: gradle/gradle-build-action@v3
+      - name: 'Download local snapshot for tests'
+        uses: actions/download-artifact@v4
+        with:
+          name: local-snapshot
+          path: ~/download
+      - name: 'Install to local maven repo'
+        run: |
+          mkdir -p ~/.m2
+          unzip ~/download/axt_m2repository.zip -d ~/.m2/
+        shell: bash
+      - name: 'Setup Android SDK'
+        uses: android-actions/setup-android@v3
+      - name: 'Run gradle tests'
+        run: |
+          cd ${{ github.workspace }}/gradle-tests
+          ./gradlew nexusOneDebugAndroidTest -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" --no-watch-fs --stacktrace
+        shell: bash
+      - name: 'Upload test reports'
+        if: success() || failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-reports
+          path: gradle-tests/**/build/reports/androidTests/
diff --git a/.gitignore b/.gitignore
index c5e4416c2..ab0ffd830 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
 # Bazel
 bazel-*
+MODULE.bazel.lock
 
 # Android Studio
 .aswb
+
+# Intellij IDEA
+.idea
+.gradle
+.ijwb
diff --git a/BUILD b/BUILD
new file mode 100644
index 000000000..2b7a74ea8
--- /dev/null
+++ b/BUILD
@@ -0,0 +1,62 @@
+load("@io_bazel_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")
+load("@rules_jvm_external//:defs.bzl", "artifact")
+load("@rules_license//rules:license.bzl", "license")
+load("//build_extensions:axt_deps_versions.bzl", "KOTLIN_LANG_VERSION")
+load("//build_extensions/maven:maven_repo.bzl", "maven_repository")
+
+package(default_visibility = ["//:__subpackages__"])
+
+exports_files([
+    "proguard_binary.cfg",
+    "LICENSE",
+    "repo.bzl",
+])
+
+# Setup kotlin toolchain
+define_kt_toolchain(
+    name = "kotlin_toolchain",
+    api_version = KOTLIN_LANG_VERSION,
+    language_version = KOTLIN_LANG_VERSION,
+)
+
+# Creates maven release repository
+maven_repository(
+    name = "axt_m2repository",
+    testonly = 1,
+    srcs = [
+        "//core/java/androidx/test/core:core_maven_artifact",
+        "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",
+        "//espresso/core/java/androidx/test/espresso:espresso_core_maven_artifact",
+        "//espresso/device/java/androidx/test/espresso/device:device_maven_artifact",
+        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:idling_concurrent_maven_artifact",
+        "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_maven_artifact",
+        "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:idling_net_maven_artifact",
+        "//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact",
+        "//espresso/remote/java/androidx/test/espresso/remote:espresso_remote_maven_artifact",
+        "//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact",
+        "//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
+        "//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact",
+        "//ktx/core/java/androidx/test/core:core_maven_artifact",
+        "//ktx/ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
+        "//runner/android_junit_runner/java/androidx/test:runner_maven_artifact",
+        "//runner/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact",
+        "//runner/monitor/java/androidx/test:monitor_maven_artifact",
+        "//runner/rules/java/androidx/test:rules_maven_artifact",
+        "//services:test_services_maven_artifact",
+        "//services/storage/java/androidx/test/services/storage:test_storage_maven_artifact",
+    ],
+)
+
+java_test(
+    name = "instrumentation_test_runner",
+    testonly = 1,
+    tags = ["manual"],
+    test_class = "com.google.android.apps.common.testing.suite.AndroidDeviceTestSuite",
+    visibility = ["//visibility:public"],
+    runtime_deps = [
+        "//opensource:entry_point_import",
+    ],
+)
+
+license(name = "license")
diff --git a/BUILD.bazel b/BUILD.bazel
deleted file mode 100644
index 4cabcbf83..000000000
--- a/BUILD.bazel
+++ /dev/null
@@ -1,130 +0,0 @@
-package(default_visibility = ["//:__subpackages__"])
-
-load("//build_extensions:maven_repo.bzl", "maven_repository")
-load("@rules_jvm_external//:defs.bzl", "artifact")
-
-exports_files([
-    "proguard_binary.cfg",
-    "LICENSE",
-    "repo.bzl",
-])
-
-# Creates maven release repository
-maven_repository(
-    name = "axt_m2repository",
-    srcs = [
-        "//core/java/androidx/test/core:core_maven_artifact",
-        "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",
-        "//espresso/core/java/androidx/test/espresso:espresso_core_maven_artifact",
-        "//espresso/core/java/androidx/test/espresso/remote:espresso_remote_maven_artifact",
-        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:idling_concurrent_maven_artifact",
-        "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_maven_artifact",
-        "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:idling_net_maven_artifact",
-        "//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact",
-        "//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact",
-        "//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
-        "//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact",
-        "//ktx/core/java/androidx/test/core:core_maven_artifact",
-        "//ktx/ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
-        "//runner/android_junit_runner/java/androidx/test:runner_maven_artifact",
-        "//runner/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact",
-        "//runner/monitor/java/androidx/test:monitor_maven_artifact",
-        "//runner/rules/java/androidx/test:rules_maven_artifact",
-        "//services:test_services_maven_artifact",
-        "//services/storage/java/androidx/test/services/storage:test_storage_maven_artifact",
-    ],
-)
-
-java_test(
-    name = "instrumentation_test_runner",
-    testonly = 1,
-    tags = ["manual"],
-    test_class = "com.google.android.apps.common.testing.suite.AndroidDeviceTestSuite",
-    visibility = ["//visibility:public"],
-    runtime_deps = [
-        "//opensource:entry_point_import",
-    ],
-)
-
-alias(
-    name = "third_party/java/jdk/jar",
-    actual = "@local_jdk//:jar",
-)
-
-# Support library aliases
-
-alias(
-    name = "androidx_appcompat",
-    actual = artifact("androidx.appcompat:appcompat"),
-)
-
-alias(
-    name = "google_android_material",
-    actual = artifact("com.google.android.material:material"),
-)
-
-alias(
-    name = "androidx_multidex",
-    actual = artifact("androidx.multidex:multidex"),
-)
-
-alias(
-    name = "androidx_annotation",
-    actual = artifact("androidx.annotation:annotation"),
-)
-
-alias(
-    name = "androidx_lifecycle_common",
-    actual = artifact("androidx.lifecycle:lifecycle-common"),
-)
-
-alias(
-    name = "androidx_core",
-    actual = artifact("androidx.core:core"),
-)
-
-alias(
-    name = "androidx_legacy_support_core_ui",
-    actual = artifact("androidx.legacy:legacy-support-core-ui"),
-)
-
-alias(
-    name = "androidx_legacy_support_core_utils",
-    actual = artifact("androidx.legacy:legacy-support-core-utils"),
-)
-
-alias(
-    name = "androidx_fragment",
-    actual = artifact("androidx.fragment:fragment"),
-)
-
-alias(
-    name = "androidx_legacy_support_v4",
-    actual = artifact("androidx.legacy:legacy-support-v4"),
-)
-
-alias(
-    name = "androidx_recyclerview",
-    actual = artifact("androidx.recyclerview:recyclerview"),
-)
-
-alias(
-    name = "androidx_viewpager",
-    actual = artifact("androidx.viewpager:viewpager"),
-)
-
-alias(
-    name = "androidx_drawerlayout",
-    actual = artifact("androidx.drawerlayout:drawerlayout"),
-)
-
-alias(
-    name = "androidx_cursoradapter",
-    actual = artifact("androidx.cursoradapter:cursoradapter"),
-)
-
-alias(
-    name = "uiautomator",
-    actual = artifact("androidx.test.uiautomator:uiautomator"),
-)
diff --git a/CHANGELOG_TEMPLATE.md b/CHANGELOG_TEMPLATE.md
new file mode 100644
index 000000000..152e0ff90
--- /dev/null
+++ b/CHANGELOG_TEMPLATE.md
@@ -0,0 +1,11 @@
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 935b7d93b..b50156990 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,45 +17,39 @@ again.
 
 ## Building and Testing
 
-AndroidX Test uses the [bazel](https://bazel.build) build system.
+AndroidX Test uses the [Bazel](https://bazel.build) build system.
 
-Currently only Linux is fully supported. For Mac and windows users, you may be able to build 
-and run the Robolectric tests.
+Currently only Linux is fully supported. Mac may work but is not regularly tested
 
 ### One time setup
 
 *   [Fork](https://help.github.com/articles/fork-a-repo/) and
     [clone](https://help.github.com/articles/cloning-a-repository/) the
     [AndroidX Test repo](https://github.com/android/android-test)
-*   Install [bazel](https://docs.bazel.build/versions/master/install.html).
-    Version 3.5.0 is recommended. For instrumentation testing on Linux make sure your environment 
-    meets the following
-    [prerequisites](https://docs.bazel.build/versions/master/android-instrumentation-test.html#prerequisites)
+*   Install [Bazelisk](https://github.com/bazelbuild/bazelisk/blob/master/README.md)
+    Note that instrumentation test execution support is currently not setup
+    for androidx test libraries.
 *   Install [maven](http://maven.apache.org/install.html) and make it available
     on PATH.
 *   Install the [Android SDK](https://developer.android.com/studio/install) and
     run the following command to ensure you have the necessary components:
-    `./tools/bin/sdkmanager --install 'build-tools;30.0.2'
-    'platforms;android-30' 'emulator' 'platform-tools'
-    'system-images;android-19;default;x86'
-    'system-images;android-21;default;x86'
-    'system-images;android-22;default;x86'
-    'system-images;android-23;default;x86'`
+    `cmdline-tools/latest/bin/sdkmanager  "build-tools;36.0.0" "platforms;android-36"`
 *   Set the `ANDROID_HOME` environment variable to point to the SDK install
     location. For example
-    *   On Linux: export ANDROID_HOME=/home/$USER/Android/Sdk
-    *   On Mac: export ANDROID_HOME=/Users/$USER/Library/Android/sdk
-    You can also add this command to your ~/.bashrc, ~/.zshrc, or ~/.profile file to make it 
+    *   On Linux: `export ANDROID_HOME=/home/$USER/Android/Sdk`
+    *   On Mac: `export ANDROID_HOME=/Users/$USER/Library/Android/sdk`
+    You can also add this command to your ~/.bashrc, ~/.zshrc, or ~/.profile file to make it
     permanent.
+*.  Install Zulu Java 21 and add to PATH
 
 ### IDE setup
 
 Android Studio is recommended.
 
-*   Install the [Bazel Android Studio plugin](https://docs.bazel.build/versions/master/ide.html).
+*   Install the [Bazel Android Studio plugin](https://plugins.jetbrains.com/plugin/9185-bazel-for-android-studio)
 *   Setup Bazel Android Studio plugin:
     *   Navigate to `Settings > Other Settings > Bazel Settings`
-    *   Update `Bazel binary location` to `/path/to/bazel/binary` (on Mac it's usually 
+    *   Update `Bazel binary location` to `/path/to/bazel/binary` (on Mac it's usually
       `/usr/local/bin/bazel`)
 *   Select 'Import Bazel project' and set workspace location to android-test
     github repo
@@ -66,28 +60,35 @@ Check [Troubleshooting](#troubleshooting) for tips on resolving common build iss
 ### Building
 
 ```
-bazel build <target path>
+bazelisk build <target path>
 ```
 
 For example, to build the AndroidX Test maven repository:
 ```
-bazel build :axt_m2repository
+bazelisk build :axt_m2repository
 ```
 
 ### Testing
 
 ```
-bazel test <target path> --spawn_strategy=local
+bazelisk test <target path> 
 ```
 
-eg to run the androidx-test-core tests
+e.g. to run the androidx-test-core tests:
 ```
-bazel test //core/javatests/… --spawn_strategy=local --host_force_python=PY2
+bazelisk test //core/javatests/... 
 ```
 
-To run all the robolectric local tests (and thus replicate the Google Cloud
-Build CI) `bazel test ... --test_tag_filters=robolectric
---build_tag_filters=robolectric`
+To run all the robolectric local tests (and thus replicate the GitHub CI):
+`bazelisk test ... --test_tag_filters=robolectric --build_tag_filters=robolectric`
+
+To run the gradle integration tests:
+```
+bazelisk build :axt_m2repository
+unzip bazel-bin/axt_m2repository.zip -d ~/.m2/
+cd gradle-tests
+./gradlew nexusOneDebugAndroidTest
+```
 
 ### Troubleshooting
 
@@ -102,13 +103,13 @@ If your project fails to build because of unresolved imports two things might be
     ```bazel
     android_sdk_repository(
         ...
-        api_level = 30,
-        build_tools_version = "30.0.2",
+        api_level = 33,
+        build_tools_version = "33.0.2",
         ...
     )
     ```
 
-2. Something might be wrong with `ANDROID_HOME` environment variable setup. Try adding the path of 
+2. Something might be wrong with `ANDROID_HOME` environment variable setup. Try adding the path of
 the android-sdk to the `WORKSPACE` file:
 
     ```bazel
diff --git a/Dockerfile b/Dockerfile
index 2a3f82acd..ae94c81f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,4 +17,4 @@ RUN \
     # download and extract sdk while suppressing the progress bar output
     wget -nv https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip && \
     unzip -q commandlinetools-linux-6609375_latest.zip -d $ANDROID_HOME && \
-    yes | sdkmanager --install 'build-tools;30.0.2' 'platforms;android-30' --sdk_root=$ANDROID_HOME | grep -v = || true
+    yes | sdkmanager --install 'build-tools;30.0.2' 'platforms;android-31' --sdk_root=$ANDROID_HOME | grep -v = || true
diff --git a/MODULE.bazel b/MODULE.bazel
new file mode 100644
index 000000000..c6667d8e9
--- /dev/null
+++ b/MODULE.bazel
@@ -0,0 +1,97 @@
+# These need needs to be consistent with their counterparts in build_extensions/axt_deps_versions.bzl.
+KOTLIN_VERSION = "1.9.21"
+KOTLINX_COROUTINES_VERSION = "1.8.1" 
+GRPC_VERSION = "1.71.0"
+
+bazel_dep(name = "rules_java", version = "8.6.3")
+bazel_dep(name = "rules_jvm_external", version = "6.7")
+bazel_dep(name = "rules_android", version = "0.6.3", repo_name = "build_bazel_rules_android")
+bazel_dep(name = "rules_kotlin", version = "2.1.3", repo_name = "io_bazel_rules_kotlin")
+bazel_dep(name = "protobuf", version = "29.3", repo_name = "com_google_protobuf")
+bazel_dep(name = "grpc-java", version = GRPC_VERSION)
+bazel_dep(name = "rules_robolectric", version = "4.14.1.2", repo_name = "robolectric")
+bazel_dep(name = "rules_python", version = "1.2.0")
+
+# Pin the version of rules_robolectric so that it matches the robolectric version we get from maven.
+single_version_override(
+    module_name = "rules_robolectric",
+    version = "4.14.1.2",
+)
+
+# python setup
+python = use_extension("@rules_python//python/extensions:python.bzl", "python")
+python.toolchain(
+  is_default = True,
+  python_version = "3.12.8",
+  # See https://github.com/bazel-contrib/rules_python/issues/1169#issuecomment-1513804247
+  ignore_root_user_error = True,
+)
+
+# maven dependencies
+maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
+
+maven.artifact(
+    artifact = "accessibility-test-framework",
+    # exclude the org.checkerframework dependency since that require
+    # java8 compatibility. See b/176926990
+    # accessibility-test-framework depends on hamcrest 2.2 which causes 'Using type org.hamcrest.Matcher from an indirect dependency' compile errors
+    exclusions = [
+        "org.checkerframework:checker",
+        "org.hamcrest:hamcrest-core",
+        "org.hamcrest:hamcrest-library",
+    ],
+    group = "com.google.android.apps.common.testing.accessibility.framework",
+    version = "3.1.2",
+)
+
+maven.install(
+    name = "maven",
+    artifacts = [
+        "androidx.annotation:annotation:1.7.0",
+        "androidx.concurrent:concurrent-futures:1.2.0",
+        "androidx.concurrent:concurrent-futures-ktx:1.2.0",
+        "androidx.core:core:1.6.0",
+        "androidx.lifecycle:lifecycle-common:2.3.1",
+        "androidx.tracing:tracing:1.1.0",
+        "androidx.window:window-java:1.1.0",
+        "androidx.window:window-core:1.1.0",
+        "com.google.dagger:dagger-compiler:2.46",
+        "com.google.dagger:dagger-producers:2.46",
+        "com.google.dagger:dagger:2.46",
+        "com.google.googlejavaformat:google-java-format:1.4",
+        "com.squareup:javapoet:1.9.0",
+        "junit:junit:4.13.2",
+        "org.ccil.cowan.tagsoup:tagsoup:1.2.1",
+        "org.hamcrest:hamcrest-library:1.3",
+        "org.pantsbuild:jarjar:1.7.2",
+        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core:%s" % KOTLINX_COROUTINES_VERSION,
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:%s" % KOTLINX_COROUTINES_VERSION,
+        "org.jetbrains.kotlinx:kotlinx-coroutines-android:%s" % KOTLINX_COROUTINES_VERSION,
+        "org.robolectric:robolectric:4.14.1",
+    ],
+    fetch_sources = True,
+    repositories = [
+        "https://maven.google.com",
+        "https://repo1.maven.org/maven2",
+        "https://dl.bintray.com/linkedin/maven",
+    ],
+)
+
+use_repo(maven, "maven")
+
+# need to have a isolated version tree for listenablefuture, because otherwise
+# listenablefuture will get resolved to 9999.0-empty-to-avoid-conflict-with-guava
+maven.install(
+    name = "maven_listenablefuture",
+    artifacts = [
+        "com.google.guava:listenablefuture:1.0",
+    ],
+    repositories = [
+        "https://maven.google.com",
+        "https://repo1.maven.org/maven2",
+        "https://dl.bintray.com/linkedin/maven",
+    ],
+)
+use_repo(maven, "maven_listenablefuture")
+
diff --git a/README.md b/README.md
index 1589ceead..81afc5dad 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,26 @@
-# AndroidX Test Library
+This GitHub project hosts two somewhat distinct projects: 
+1. AndroidX Test libraries
+2. Bazel support for android_instrumentation_test
+
+# AndroidX Test Libraries
 
 The AndroidX Test Library provides an extensive framework for testing Android apps. This library provides a set of APIs that allow you to quickly build and run test code for your apps, including JUnit 4 and functional user interface (UI) tests. You can run tests created using these APIs from the Android Studio IDE or from the command line.
 
 For more details see [developers.android.com/testing](https://developers.android.com/testing)
 
+The following maven libraries are hosted in this repo:
+
+androidx.test:annotation
+androidx.test:core
+androidx.test.espresso*
+androidx.test.ext:junit
+androidx.test:orchestrator
+androidx.test:runner
+androidx.test:rules
+androidx.test:services
+
+androidx.test.uiautomator and androidx.test:ext:junit-gtest are hosted on [AOSP](https://android.googlesource.com/platform/frameworks/support/+/androidx-main/README.md)
+
 ## Contributing
 
 See [CONTRIBUTING.md](https://github.com/android/android-test/blob/master/CONTRIBUTING.md)
@@ -19,7 +36,12 @@ Please see the
 for general questions and discussion, and please direct specific questions to
 [Stack Overflow](https://stackoverflow.com/questions/tagged/androidx-test).
 
-## Bazel integration
+## Releases
+
+https://developer.android.com/jetpack/androidx/releases/test is the canonical source for release notes, and
+https://maven.google.com for release artifacts and source snapshots.
+
+# Bazel android_instrumentation_test support 
 
 To depend on this repository in Bazel, add the following snippet to your
 WORKSPACE file:
@@ -35,3 +57,4 @@ http_archive(
 load("@android_test_support//:repo.bzl", "android_test_repositories")
 android_test_repositories()
 ```
+
diff --git a/WORKSPACE b/WORKSPACE
index 95230da31..1e2a63b2e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,162 +1,12 @@
-# TODO(b/114418172): rename to androidx_test. Requires a bazel change
-workspace(name = "android_test_support")
+# Define project setup not yet supported in MODULE.bzlmod
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-RULES_JVM_EXTERNAL_TAG = "2.1"
-
-RULES_JVM_EXTERNAL_SHA = "515ee5265387b88e4547b34a57393d2bcb1101314bcc5360ec7a482792556f42"
-
-http_archive(
-    name = "rules_jvm_external",
-    sha256 = RULES_JVM_EXTERNAL_SHA,
-    strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % RULES_JVM_EXTERNAL_TAG,
-)
-
-# rules_proto defines proto_library.
-http_archive(
-    name = "rules_proto",
-    sha256 = "2490dca4f249b8a9a3ab07bd1ba6eca085aaf8e45a734af92aad0c42d9dc7aaf",
-    strip_prefix = "rules_proto-218ffa7dfa5408492dc86c01ee637614f8695c45",
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/218ffa7dfa5408492dc86c01ee637614f8695c45.tar.gz",
-        "https://github.com/bazelbuild/rules_proto/archive/218ffa7dfa5408492dc86c01ee637614f8695c45.tar.gz",
-    ],
-)
-
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
-rules_proto_dependencies()
-rules_proto_toolchains()
-
-# The 'com_google_protobuf_javalite' package is required for Bazel 2.x and below.
-http_archive(
-    name = "com_google_protobuf_javalite",
-    sha256 = "832c476bb442ca98a59c2291b8a504648d1c139b74acc15ef667a0e8f5e984e7",
-    strip_prefix = "protobuf-3.11.3",
-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.11.3.zip"],
-)
-
-load("@rules_jvm_external//:defs.bzl", "maven_install")
-load("@rules_jvm_external//:specs.bzl", "maven")
-load(
-    "//build_extensions:axt_versions.bzl",
-    "ANDROIDX_JUNIT_VERSION",
-    "ANDROIDX_LIFECYCLE_VERSION",
-    "ANDROIDX_MULTIDEX_VERSION",
-    "ANDROIDX_VERSION",
-    "CORE_VERSION",
-    "GOOGLE_MATERIAL_VERSION",
-    "RUNNER_VERSION",
-    "UIAUTOMATOR_VERSION",
-)
-
-maven_install(
-    name = "maven",
-    artifacts = [
-        "androidx.annotation:annotation:" + ANDROIDX_VERSION,
-        "androidx.annotation:annotation-experimental:jar:" + ANDROIDX_VERSION,
-        "androidx.appcompat:appcompat:" + ANDROIDX_VERSION,
-        "androidx.core:core:" + ANDROIDX_VERSION,
-        "androidx.cursoradapter:cursoradapter:" + ANDROIDX_VERSION,
-        "androidx.drawerlayout:drawerlayout:" + ANDROIDX_VERSION,
-        "androidx.fragment:fragment:" + ANDROIDX_VERSION,
-        "androidx.legacy:legacy-support-core-ui:" + ANDROIDX_VERSION,
-        "androidx.legacy:legacy-support-core-utils:" + ANDROIDX_VERSION,
-        "androidx.legacy:legacy-support-v4:" + ANDROIDX_VERSION,
-        "androidx.lifecycle:lifecycle-common:" + ANDROIDX_LIFECYCLE_VERSION,
-        "androidx.multidex:multidex:" + ANDROIDX_MULTIDEX_VERSION,
-        "androidx.recyclerview:recyclerview:" + ANDROIDX_VERSION,
-        "androidx.test.uiautomator:uiautomator:" + UIAUTOMATOR_VERSION,
-        "androidx.viewpager:viewpager:" + ANDROIDX_VERSION,
-        "aopalliance:aopalliance:1.0",
-        "com.beust:jcommander:1.72",
-                maven.artifact(
-            group = "com.google.android.apps.common.testing.accessibility.framework",
-            artifact = "accessibility-test-framework",
-            version = "3.1",
-            exclusions = [
-             # exclude the org.checkerframework dependency since that require
-             # java8 compatibility. See b/176926990
-                maven.exclusion(
-                    group = "org.checkerframework",
-                    artifact = "checker"
-                    ),
-                ]
-            ),
-
-        "com.google.android.material:material:" + GOOGLE_MATERIAL_VERSION,
-        "com.google.auto.value:auto-value:1.5.1",
-        "com.google.code.findbugs:jsr305:3.0.2",
-        "com.google.code.gson:gson:2.8.5",
-        "com.google.dagger:dagger-compiler:2.11",
-        "com.google.dagger:dagger-producers:2.11",
-        "com.google.dagger:dagger:2.10",
-        "com.google.errorprone:javac-shaded:9-dev-r4023-3",
-        "com.google.flogger:flogger-system-backend:0.4",
-        "com.google.flogger:flogger:0.4",
-        "com.google.flogger:google-extensions:0.4",
-        "com.google.googlejavaformat:google-java-format:1.4",
-        "com.google.guava:guava:27.1-android",
-        "com.google.guava:guava-testlib:27.1-android",
-        "com.google.inject.extensions:guice-multibindings:4.1.0",
-        "com.google.inject:guice:4.1.0",
-        "com.google.truth:truth:1.0",
-        "com.googlecode.jarjar:jarjar:1.3",
-        "com.linkedin.dexmaker:dexmaker-mockito:jar:2.28.1",
-        "com.linkedin.dexmaker:dexmaker:2.28.1",
-        "com.squareup:javapoet:1.9.0",
-        "javax.annotation:javax.annotation-api:1.3.1",
-        "javax.inject:javax.inject:1",
-        "joda-time:joda-time:2.10.1",
-        "junit:junit:4.12",
-        "net.bytebuddy:byte-buddy-agent:1.9.11",
-        "net.bytebuddy:byte-buddy:1.9.11",
-        "net.sf.kxml:kxml2:jar:2.3.0",
-        "org.ccil/cowan.tagsoup:tagsoup:1.2",
-        "org.checkerframework:checker-compat-qual:2.5.5",
-        "org.hamcrest:hamcrest-all:1.3",
-        "org.mockito:mockito-core:2.25.0",
-        "org.objenesis:objenesis:2.1",
-        "org.pantsbuild:jarjar:1.7.2",
-        "org.robolectric:robolectric:4.4",
-    ],
-    repositories = [
-        "https://maven.google.com",
-        "https://repo1.maven.org/maven2",
-        "https://dl.bintray.com/linkedin/maven",
-    ],
-)
+# Load Android Sdk
 
 android_sdk_repository(
     name = "androidsdk",
-    api_level = 30,
-    build_tools_version = "30.0.2",
+    api_level = 36,
+    build_tools_version = "36.0.0",
 )
 
-load("//:repo.bzl", "android_test_repositories")
-android_test_repositories(with_dev_repositories = True)
-
-load("@robolectric//bazel:robolectric.bzl", "robolectric_repositories")
-robolectric_repositories()
-
-# Kotlin toolchains
-rules_kotlin_version = "686518ffd8e58609a21f258616d154ba2934a8e8"
-http_archive(
-    name = "io_bazel_rules_kotlin",
-    sha256 = "0237910a921ad492aa8520bf88923c42d745d74522d3507a34c9bfd39b4e295c",
-    strip_prefix = "rules_kotlin-%s" % rules_kotlin_version,
-    type = "zip",
-    urls = ["https://github.com/bazelbuild/rules_kotlin/archive/%s.zip" % rules_kotlin_version],
-)
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
-kotlin_repositories()
-kt_register_toolchains()
-
-# Android bazel rules
-http_archive(
-    name = "build_bazel_rules_android",
-    urls = ["https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip"],
-    sha256 = "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806",
-    strip_prefix = "rules_android-0.1.1",
-)
+register_toolchains("//:kotlin_toolchain")
diff --git a/api/README.md b/api/README.md
index 38e36910c..5165dfef3 100644
--- a/api/README.md
+++ b/api/README.md
@@ -1,3 +1,5 @@
-Text output for the androidx.test API.
+Deprecated!
+
+Previous repository for api definitions for androidx.test. 
+API definitions have been moved to per-library directories.
 
-Generated via blaze build //third_party/android/androidx_test:axt_doc
diff --git a/build_extensions/AndroidManifest_instrumentation_test_template.xml b/build_extensions/AndroidManifest_instrumentation_test_template.xml
index 3910b95b2..3379a5a0b 100644
--- a/build_extensions/AndroidManifest_instrumentation_test_template.xml
+++ b/build_extensions/AndroidManifest_instrumentation_test_template.xml
@@ -18,8 +18,8 @@
     package="${applicationId}" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="${minSdkVersion}"
+        android:targetSdkVersion="34" />
 
     <application/>
 
diff --git a/build_extensions/AndroidManifest_robolectric.xml b/build_extensions/AndroidManifest_robolectric.xml
new file mode 100644
index 000000000..4685d5733
--- /dev/null
+++ b/build_extensions/AndroidManifest_robolectric.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2023 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.robolectric" >
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="33" />
+
+</manifest>
diff --git a/build_extensions/AndroidManifest_target_stub.xml b/build_extensions/AndroidManifest_target_stub.xml
index 08bc6fc11..1a520ad8d 100644
--- a/build_extensions/AndroidManifest_target_stub.xml
+++ b/build_extensions/AndroidManifest_target_stub.xml
@@ -18,7 +18,7 @@
     package="${applicationId}" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/build_extensions/BUILD b/build_extensions/BUILD
new file mode 100644
index 000000000..9be9f6ce5
--- /dev/null
+++ b/build_extensions/BUILD
@@ -0,0 +1,17 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+licenses(["notice"])
+
+package(default_visibility = [
+    "//visibility:public",
+])
+
+exports_files([
+    "AndroidManifest_target_stub.xml",
+    "AndroidManifest_instrumentation_test_template.xml",
+    "AndroidManifest_robolectric.xml",
+    "robolectric.properties",
+    "mainDexClasses.rules",
+    "axt_released_versions.bzl",
+    "axt_versions.bzl",
+])
diff --git a/build_extensions/BUILD.bazel b/build_extensions/BUILD.bazel
deleted file mode 100644
index 22eaa94ea..000000000
--- a/build_extensions/BUILD.bazel
+++ /dev/null
@@ -1,47 +0,0 @@
-load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
-
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = [
-    "//visibility:public",
-])
-
-filegroup(
-    name = "bzl",
-    srcs = [
-        "add_or_update_file_in_zip.bzl",
-        "combine_jars.bzl",
-        "maven_repo.bzl",
-        "release.bzl",
-        "remove_from_jar.bzl",
-    ],
-)
-
-# Used to generate a maven repository.
-py_binary(
-    name = "maven_repository",
-    srcs = ["maven_repository.py"],
-    deps = [
-        "@absl_py//absl:app",
-        "@absl_py//absl/flags",
-    ],
-)
-
-# Used to generate a maven artifact.
-sh_binary(
-    name = "maven_artifact",
-    srcs = ["maven_artifact.sh"],
-)
-
-exports_files([
-    "noJarJarRules.txt",
-    "atslToAxtJarJarRules.txt",
-    "AndroidManifest_target_stub.xml",
-    "AndroidManifest_instrumentation_test_template.xml",
-    "robolectric.properties",
-])
-
-bzl_library(
-    name = "remove_from_jar_lib",
-    srcs = ["remove_from_jar.bzl"],
-)
diff --git a/build_extensions/add_or_update_file_in_zip.bzl b/build_extensions/add_or_update_file_in_zip.bzl
deleted file mode 100644
index a0b1e10e6..000000000
--- a/build_extensions/add_or_update_file_in_zip.bzl
+++ /dev/null
@@ -1,43 +0,0 @@
-"""Update a zip file to update or add a particular file within."""
-
-def add_or_update_file_in_zip(
-    name,
-    src,
-    out,
-    update_src,
-    update_path,
-    **kwargs):
-  """Update a zip file to update or add a particular file within.
-
-  Args:
-    name: Rule name
-    src: The zip file to update
-    out: Name of the output zip file
-    update_src: The source for the file to update in the zip
-    update_path: Path for the file to update within the zip.
-    **kwargs: Extra arguments that will be passed to the underlying
-      genrule rule.
-  """
-
-  native.genrule(
-      name = name,
-      srcs = [
-          update_src,
-          src,
-      ],
-      outs = [
-          out,
-      ],
-      cmd = ";".join([
-          "tmp={}_tmp".format(name),
-          "rm -rf $$tmp",
-          "mkdir -p $$tmp",
-          "cp $(location {update_src}) $$tmp/{update_path}".format(
-              update_src = update_src,
-              update_path = update_path),
-          "zip -j -X -q -l "
-          + "$(location {src}) $$tmp/{update_path} -O $@".format(
-              src = src,
-              update_path = update_path)
-      ]),
-      **kwargs)
\ No newline at end of file
diff --git a/build_extensions/android_app_instrumentation_tests.bzl b/build_extensions/android_app_instrumentation_tests.bzl
index 6a544501f..970f5fa84 100644
--- a/build_extensions/android_app_instrumentation_tests.bzl
+++ b/build_extensions/android_app_instrumentation_tests.bzl
@@ -9,12 +9,23 @@ load(
     "infer_java_package_name",
     "infer_java_package_name_from_label",
 )
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions:register_extension_info.bzl", "register_extension_info")
 
+def android_app_instrumentation_tests(
+        name,
+        binary_target,
+        srcs,
+        deps,
+        device_list = [],
+        test_java_package = None,
+        binary_target_package = None,
+        library_args = {},
+        binary_args = {},
+        **kwargs):
+    """DEPRECATED: use axt_android_library_test instead.
 
-def android_app_instrumentation_tests(name, binary_target, srcs, deps, target_devices,
-                                      test_java_package = None, binary_target_package = None,
-                                      library_args = {}, binary_args = {}, **kwargs):
-    """A macro for an instrumentation test whose target under test is an android_binary.
+    A macro for an instrumentation test whose target under test is an android_binary.
 
     The intent of this wrapper is to simplify the build API for creating instrumentation test rules
     for simple cases, while still supporting build_cleaner for automatic dependency management.
@@ -23,7 +34,7 @@ def android_app_instrumentation_tests(name, binary_target, srcs, deps, target_de
       - a test_lib android_library, containing all sources and dependencies
       - a test_binary android_binary (soon to be android_application)
       - the manifest to use for the test library.
-      - for each device:
+      - for each src + device combination:
          - a android_instrumentation_test rule
 
     Args:
@@ -32,8 +43,9 @@ def android_app_instrumentation_tests(name, binary_target, srcs, deps, target_de
       binary_target: the android_binary under test
       srcs: the test sources to generate rules for
       deps: the build dependencies to use for the generated test library
-      target_devices: array of device targets to execute on
-      test_java_package_name: Optional. A custom root package name to use for the tests. If unset
+      device_list: list of device structs to execute on, generated from phone_devices.bzl:devices().
+          By default this method returns a device for each available API level
+      test_java_package: Optional. A custom root package name to use for the tests. If unset
           will be derived based on current path to a java source root
       binary_target_package: Optional: the android package name of binary_target. If unset, will be
           derived from binary target's path to a java source root
@@ -45,7 +57,7 @@ def android_app_instrumentation_tests(name, binary_target, srcs, deps, target_de
     test_java_package_name = test_java_package if test_java_package else infer_java_package_name()
     instrumentation_target_package = binary_target_package if binary_target_package else infer_java_package_name_from_label(binary_target)
 
-    native.android_library(
+    kt_android_library(
         name = library_name,
         srcs = srcs,
         testonly = 1,
@@ -57,7 +69,7 @@ def android_app_instrumentation_tests(name, binary_target, srcs, deps, target_de
         name = name,
         srcs = srcs,
         deps = [library_name],
-        target_devices = target_devices,
+        device_list = device_list,
         test_java_package_name = test_java_package_name,
         # always append .tests at the end to avoid potential conflict with instrumentation_target_package
         test_android_package_name = instrumentation_target_package + ".tests",
@@ -66,3 +78,9 @@ def android_app_instrumentation_tests(name, binary_target, srcs, deps, target_de
         binary_args = binary_args,
         **kwargs
     )
+
+# registers the wrapper with build_cleaner so it can manage dependencies automatically
+register_extension_info(
+    extension = android_app_instrumentation_tests,
+    label_regex_for_dep = "{extension_name}_library",
+)
diff --git a/build_extensions/android_library_instrumentation_tests.bzl b/build_extensions/android_library_instrumentation_tests.bzl
index 36b2ab829..8617ea21f 100644
--- a/build_extensions/android_library_instrumentation_tests.bzl
+++ b/build_extensions/android_library_instrumentation_tests.bzl
@@ -8,11 +8,23 @@ load(
     "//build_extensions:infer_java_package_name.bzl",
     "infer_java_package_name",
 )
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions:register_extension_info.bzl", "register_extension_info")
 
-def android_library_instrumentation_tests(name, srcs, deps, target_devices,
-                                          test_java_package = None, library_args = {},
-                                          binary_args = {}, **kwargs):
-    """A macro for an instrumentation test whose target under test is an android_library.
+def android_library_instrumentation_tests(
+        name,
+        srcs,
+        deps,
+        target_devices = [],
+        device_list = [],
+        test_java_package = None,
+        library_args = {},
+        binary_args = {},
+        **kwargs):
+    """DEPRECATED: use axt_android_library_test instead
+
+
+    A macro for an instrumentation test whose target under test is an android_library.
 
     Will generate a 'self-instrumentating' test binary and other associated rules
 
@@ -20,11 +32,10 @@ def android_library_instrumentation_tests(name, srcs, deps, target_devices,
     for simple cases, while still supporting build_cleaner for automatic dependency management.
 
     This will generate:
-      - an unused stub android_binary under test, to placate bazel
       - a test_lib android_library, containing all sources and dependencies
       - a test_binary android_binary (soon to be android_application)
       - the manifest to use for the test library.
-      - for each device combination:
+      - for each src + device combination:
          - an android_instrumentation_test rule)
 
     Args:
@@ -32,7 +43,8 @@ def android_library_instrumentation_tests(name, srcs, deps, target_devices,
         manage dependencies
       srcs: the test sources to generate rules for
       deps: the build dependencies to use for the generated test binary
-      target_devices: array of device targets to execute on
+      device_list: list of device structs to execute on,  generated from phone_devices.bzl:devices()
+           By default this method returns a device for each available API level
       test_java_package: Optional. A custom root package name to use for the tests. If unset
           will be derived based on current path to a java source root
       library_args: additional arguments to pass to generated android_library
@@ -42,15 +54,7 @@ def android_library_instrumentation_tests(name, srcs, deps, target_devices,
     library_name = "%s_library" % name
     test_java_package_name = test_java_package if test_java_package else infer_java_package_name()
 
-    native.android_binary(
-        name = "target_stub_binary",
-        manifest = "//build_extensions:AndroidManifest_target_stub.xml",
-        # use the same package name as the test package, so it gets overridden
-        manifest_values = {"applicationId": test_java_package_name},
-        testonly = 1,
-    )
-
-    native.android_library(
+    kt_android_library(
         name = library_name,
         srcs = srcs,
         testonly = 1,
@@ -62,11 +66,17 @@ def android_library_instrumentation_tests(name, srcs, deps, target_devices,
         name = name,
         srcs = srcs,
         deps = [library_name],
-        target_devices = target_devices,
+        device_list = device_list,
         test_java_package_name = test_java_package_name,
         test_android_package_name = test_java_package_name,
         instrumentation_target_package = test_java_package_name,
-        instruments = ":target_stub_binary",
+        instruments = None,
         binary_args = binary_args,
         **kwargs
     )
+
+# registers the wrapper with build_cleaner so it can manage dependencies automatically
+register_extension_info(
+    extension = android_library_instrumentation_tests,
+    label_regex_for_dep = "{extension_name}_library",
+)
diff --git a/build_extensions/android_library_local_tests.bzl b/build_extensions/android_library_local_tests.bzl
deleted file mode 100644
index 3e7ad3c08..000000000
--- a/build_extensions/android_library_local_tests.bzl
+++ /dev/null
@@ -1,91 +0,0 @@
-"""A rule wrapper for generating android_local_tests for an android library."""
-
-load(
-    "//build_extensions:infer_java_package_name.bzl",
-    "infer_java_package_name",
-)
-
-_CONFIG_JAR_COMMAND = """
-set -e
-JAR="$(location @local_jdk//:jar)"
-SRC="$<"
-[[ "$$(basename "$${SRC}")" = 'robolectric.properties' ]] || {
-  echo 'Must be named: robolectric.properties';
-  exit 1;
-}
-$${JAR} -cf "$@" -C "$$(dirname "$${SRC}")" "$$(basename "$${SRC}")"
-"""
-
-def android_library_local_tests(name, srcs, deps, test_java_package = None, **kwargs):
-    """A rule for generating android_local_tests whose target under test is an android_library.
-
-    Intended to have similar semantics as android_library_instrumentation_tests
-
-    This will generate:
-      - a test_lib android_library, containing all sources and dependencies
-      - the manifest to use for the test library.
-      - an android_local_test rule for each src
-
-    Args:
-      name: the name to use for the generated android_library rule. This is needed for build_cleaner to
-          manage dependencies
-      srcs: the test sources to generate rules for
-      deps: the build dependencies to use for the generated local test
-      test_java_package_name: Optional. The root java package name of the tests. Inferred based on
-          the current directory if unset
-      **kwargs: arguments to pass to generated android_local_test rules
-    """
-
-    test_java_package_name = test_java_package if test_java_package else infer_java_package_name()
-    library_name = name
-    _robolectric_config(
-        name = "%s_config" % library_name,
-        src = "//build_extensions:robolectric.properties",
-    )
-    native.android_library(
-        name = library_name,
-        srcs = srcs,
-        testonly = 1,
-        deps = deps + [
-        ":%s_config" % library_name,
-        "@maven//:org_robolectric_robolectric",
-        "@robolectric//bazel:android-all",
-        ],
-    )
-    for src in srcs:
-        # assume src has .java suffix
-        name = src.rstrip(".java")
-        native.android_local_test(
-            name = name,
-            tags = ["robolectric"],
-            manifest = "//build_extensions:AndroidManifest_target_stub.xml",
-            manifest_values = {"applicationId": test_java_package_name},
-            deps = [
-                library_name,
-            ],
-            **kwargs
-        )
-
-def _robolectric_config(name, src):
-    """Creates a JAR file containing the given Robolectric properties file at the top level.
-
-    Args:
-      name: a string, the name of the rule
-      src: a label, the properties file to package
-    """
-    native.genrule(
-        name = name + "_gen",
-        srcs = [src],
-        outs = ["%s.jar" % name],
-        message = "Generating Robolectric config...",
-        cmd = _CONFIG_JAR_COMMAND,
-        tools = [
-            "@local_jdk//:jar",
-        ],
-        visibility = ["//visibility:private"],
-    )
-    native.java_import(
-        name = name,
-        constraints = ["android"],
-        jars = [name + "_gen"],
-    )
diff --git a/build_extensions/android_library_test.bzl b/build_extensions/android_library_test.bzl
index e5c471b61..b280be928 100644
--- a/build_extensions/android_library_test.bzl
+++ b/build_extensions/android_library_test.bzl
@@ -1,36 +1,33 @@
-"""Wrappers for android_library_test."""
+"""Wrapper around for android_library_test that adds additionsl features."""
 
-load("//tools/build_defs/android:rules.bzl", "android_library_test")
-load(
-    "//third_party/android/androidx_test/build_extensions:infer_java_package_name.bzl",
-    "infer_java_package_name",
-)
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
 
 def axt_android_library_test(
-        manifest = None,
-        manifest_values = {},
+        name,
+        args = [],
+        srcs = [],
         custom_package = None,
+        data = [],
+        device_list = None,
+        manifest = None,
+        deps = [],
         **kwargs):
-    """A wrapper around android_library_test that auto-generates a manifest if not provided.
+    """Placeholder for future instrumentation test support.
 
-    TODO(b/172615902): look into replacing with a macro that returns a manifest instead. Or remove entirely if
-    this functionality is ever added to android_library_test
+    Currently only generates an android_library
 
-    Args:
-        manifest: the AndroidManifest label to provide to android_library_test. If not specified, a manifest will be auto generated.
-        manifest_values: the dictionary of manifest substitutions to provide to android_library_test
-        custom_package: the custom application id to use. If unspecified, the application id will be derived based on current package name
-        **kwargs: args to pass to android_library_test
     """
+
+    # always define a manifest to work around 'manifest is required when resource_files or assets are defined.' inherent
+    # kt_android_library
     if not manifest:
-        test_application_id = custom_package if custom_package else infer_java_package_name()
-        manifest_values = {
-            "applicationId": test_application_id,
-            "instrumentationTargetPackage": test_application_id,
-        }
-        manifest = "//third_party/android/androidx_test/build_extensions:AndroidManifest_instrumentation_test_template.xml"
-    android_library_test(
+        manifest = "//build_extensions:AndroidManifest_instrumentation_test_template.xml"
+
+    kt_android_library(
+        name = "%s_lib" % name,
+        srcs = srcs,
+        exports_manifest = True,
         manifest = manifest,
-        manifest_values = manifest_values,
-        **kwargs
+        deps = deps,
+        testonly = 1,
     )
diff --git a/build_extensions/android_multidevice_instrumentation_test.bzl b/build_extensions/android_multidevice_instrumentation_test.bzl
index 894beaae8..c252b03bb 100644
--- a/build_extensions/android_multidevice_instrumentation_test.bzl
+++ b/build_extensions/android_multidevice_instrumentation_test.bzl
@@ -1,18 +1,17 @@
 """Utility for running single test on multiple emulator targets."""
 
 def android_multidevice_instrumentation_test(name, target_devices, **kwargs):
-  """Generates a android_instrumentation_test rule for each given device.
-
-  Args:
-    name: Name prefix to use for the rules. The name of the generated rules will follow:
-      name + target_device[-6:] eg name-15_x86
-    target_devices: array of device targets
-    **kwargs: arguments to pass to generated android_test rules
-  """
-  for device in target_devices:
-    native.android_instrumentation_test(
-        name = name + "-" + device[-6:],
-        target_device = device,
-        **kwargs
-    )
+    """Generates a android_instrumentation_test rule for each given device.
 
+    Args:
+      name: Name prefix to use for the rules. The name of the generated rules will follow:
+        name + target_device[-6:] eg name-15_x86
+      target_devices: array of device targets
+      **kwargs: arguments to pass to generated android_test rules
+    """
+    for device in target_devices:
+        native.android_instrumentation_test(
+            name = name + "-" + device[-6:],
+            target_device = device,
+            **kwargs
+        )
diff --git a/build_extensions/api_checks.bzl b/build_extensions/api_checks.bzl
new file mode 100644
index 000000000..aa4f1e927
--- /dev/null
+++ b/build_extensions/api_checks.bzl
@@ -0,0 +1,20 @@
+"""A macro for generating androidx.test api definitions and checks."""
+
+# TODO: implement me
+
+def api_checks(
+        name,
+        runtime_dep,
+        src_jar,
+        testonly = 1):
+    """Generates api definitions and checks for a macro.
+
+    This macro will generate two api definition files, one for public api, one for internal RestrictTo(Scope.LIBRARY_GROUP) apis,
+    and generate diff checks to compare them against api/current-public.txt and api/current-internal.txt respectively.
+
+    Args:
+      name: name of rule
+      runtime_dep: runtime java dependency of the srcs
+      src_jar: contains the source to generate api for
+      testonly: the testonly restriction. Default 1
+   """
diff --git a/build_extensions/atslToAxtJarJarRules.txt b/build_extensions/atslToAxtJarJarRules.txt
deleted file mode 100644
index eca16a381..000000000
--- a/build_extensions/atslToAxtJarJarRules.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-rule android.support.test.InstrumentationRegistry androidx.test.InstrumentationRegistry
-rule android.support.test.annotation.** androidx.test.annotation.@1
-rule android.support.test.espresso.** "androidx.test.espresso.@1
-rule android.support.test.filters.** androidx.test.filters.@1
-rule android.support.test.orchestrator.** androidx.test.orchestrator.@1
-rule android.support.test.rule.** androidx.test.rule.@1
-rule android.support.test.runner.** androidx.test.runner.@1
-rule android.support.test.services.** androidx.test.services.@1
-rule android.support.test.internal.** androidx.test.internal.@1
-rule android.support.test.ui.app.** androidx.test.ui.app.@1
diff --git a/build_extensions/atsl_to_axt_jarjar.bzl b/build_extensions/atsl_to_axt_jarjar.bzl
deleted file mode 100644
index e1c864c0a..000000000
--- a/build_extensions/atsl_to_axt_jarjar.bzl
+++ /dev/null
@@ -1,28 +0,0 @@
-"""Conditionally rewrites android.support.test references to androidx.test.
-
-It is intended for modifying references to android.support.test
-in prebuilt java libraries, to point to their renamed androidx.test equivalent.
-
-This functionality is guarded by a flag, so initially use of this function
-will have no effect.
-
-See go/jetpack-test-lsc
-"""
-
-def atsl_to_axt_jarjar(name, src_jar, out_jar, **kwargs):
-    # this will be swapped to "atslToAxtJarJarRules.txt" in the ATSL -> AXT LSC
-    JARJAR_RULES = "//third_party/android/androidx_test/build_extensions:atslToAxtJarJarRules.txt"
-
-    # TODO(b/78906684): use jetifier instead of jarjar
-    native.genrule(
-        name = name,
-        srcs = [src_jar],
-        outs = [out_jar],
-        cmd = ("$(location //third_party/java/jarjar:jarjar_bin) process " +
-               "$(location %s) '$<' '$@'" % JARJAR_RULES),
-        tools = [
-            JARJAR_RULES,
-            "//third_party/java/jarjar:jarjar_bin",
-        ],
-        **kwargs
-    )
diff --git a/build_extensions/axt_android_application_test.bzl b/build_extensions/axt_android_application_test.bzl
new file mode 100644
index 000000000..451a081f9
--- /dev/null
+++ b/build_extensions/axt_android_application_test.bzl
@@ -0,0 +1,2 @@
+def axt_android_application_test(**kwargs):
+    """Placeholder for future instrumentation test support."""
diff --git a/build_extensions/axt_android_local_test.bzl b/build_extensions/axt_android_local_test.bzl
new file mode 100644
index 000000000..0b8cffdb1
--- /dev/null
+++ b/build_extensions/axt_android_local_test.bzl
@@ -0,0 +1,82 @@
+"""A rule wrapper for generating android_local_test ."""
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library", "android_local_test")
+load("@io_bazel_rules_kotlin//kotlin:android.bzl", "kt_android_library")
+load("//build_extensions:create_jar.bzl", "create_jar")
+
+def axt_android_local_test(name, srcs = [], deps = [], manifest = "//build_extensions:AndroidManifest_robolectric.xml", tags = ["robolectric"], jvm_flags = [], **kwargs):
+    """A wrapper around android_local_test that provides sensible defaults for androidx.test.
+
+
+    Args:
+      name: the name to use for the generated android_local_test rule.
+      srcs: the test sources to generate rules for
+      deps: the build dependencies to use for the generated local test
+      manifest: the android manifest. Default: AndroidManifest_robolectric.xml
+      tags: the tags to pass to android_local_test. Default ["robolectric"].
+        If overridden, it is recommended to pass the "robolectric" tag so
+        the test gets executed on github CI
+      **kwargs: arguments to pass to generated android_local_test rules
+    """
+
+    _robolectric_config(
+        name = "%s_config" % name,
+        src = "//build_extensions:robolectric.properties",
+    )
+    deps = depset(deps + [
+        "%s_config" % name,
+        # the blaze-robolectric target exports these by default, so export them here too for consistency
+        "@robolectric//bazel:android-all",
+        "@maven//:org_robolectric_robolectric",
+        "@maven//:org_robolectric_shadows_framework",
+        "@maven//:org_robolectric_shadowapi",
+        "@maven//:org_robolectric_annotations",
+        "//ext/junit",
+        "//core",
+    ]).to_list()
+
+    if _is_kotlin(srcs):
+        kt_android_library(
+            name = "%s_kt_lib" % name,
+            srcs = srcs,
+            exports_manifest = True,
+            manifest = manifest,
+            deps = deps,
+            testonly = True,
+        )
+        deps = [":%s_kt_lib" % name]
+        srcs = []
+
+    android_local_test(
+        name = name,
+        srcs = srcs,
+        tags = tags,
+        manifest = manifest,
+        # Allow running tests on JDK 21. See https://github.com/bazelbuild/bazel/issues/14502
+        jvm_flags = jvm_flags + ["-Djava.security.manager=allow"],
+        deps = deps,
+        **kwargs
+    )
+
+def _robolectric_config(name, src):
+    """Creates a JAR file containing the given Robolectric properties file at the top level.
+
+    Args:
+      name: a string, the name of the rule
+      src: a label, the properties file to package
+    """
+    create_jar(
+        name = name + "_gen",
+        srcs = [src],
+    )
+    native.java_import(
+        name = name,
+        constraints = ["android"],
+        jars = [name + "_gen.jar"],
+    )
+
+def _is_kotlin(srcs):
+    for s in srcs:
+        if s.endswith(".kt"):
+            return True
+    return False
diff --git a/build_extensions/axt_deps_versions.bzl b/build_extensions/axt_deps_versions.bzl
new file mode 100644
index 000000000..81e8ee03b
--- /dev/null
+++ b/build_extensions/axt_deps_versions.bzl
@@ -0,0 +1,11 @@
+"""Defines versions of androidx.test dependencies."""
+
+# These must match versions specified in MODULE.bazel
+# Unfortunately MODULE.bazel files do not support load
+# so there is no known way to share these constants
+
+# Maven dependency versions
+ANDROIDX_ANNOTATION_VERSION = "1.7.0"
+KOTLIN_VERSION = "1.9.21"
+KOTLIN_LANG_VERSION = "1.9"
+GRPC_VERSION = "1.71.0"
diff --git a/build_extensions/axt_released_versions.bzl b/build_extensions/axt_released_versions.bzl
new file mode 100644
index 000000000..d6d2de156
--- /dev/null
+++ b/build_extensions/axt_released_versions.bzl
@@ -0,0 +1,13 @@
+"""Defines current released AXT versions.
+"""
+
+RUNNER_VERSION = "1.7.0"
+RULES_VERSION = "1.7.0"
+MONITOR_VERSION = "1.8.0"
+ESPRESSO_VERSION = "3.7.0"
+CORE_VERSION = "1.7.0"
+ESPRESSO_DEVICE_VERSION = "1.1.0"
+ANDROIDX_JUNIT_VERSION = "1.3.0"
+ANDROIDX_TRUTH_VERSION = "1.7.0"
+ORCHESTRATOR_VERSION = "1.6.1"
+SERVICES_VERSION = "1.6.0"
diff --git a/build_extensions/axt_stable_versions.bzl b/build_extensions/axt_stable_versions.bzl
new file mode 100644
index 000000000..08f26edb7
--- /dev/null
+++ b/build_extensions/axt_stable_versions.bzl
@@ -0,0 +1,14 @@
+"""Defines currently released stable AXT versions."""
+
+# currently only used for documentation purposes
+
+RUNNER_VERSION = "1.7.0"
+RULES_VERSION = "1.7.0"
+MONITOR_VERSION = "1.8.0"
+ESPRESSO_VERSION = "3.7.0"
+CORE_VERSION = "1.7.0"
+ESPRESSO_DEVICE_VERSION = "1.1.0"
+ANDROIDX_JUNIT_VERSION = "1.3.0"
+ANDROIDX_TRUTH_VERSION = "1.7.0"
+ORCHESTRATOR_VERSION = "1.6.1"
+SERVICES_VERSION = "1.6.0"
diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl
index ca1f820fc..eeb87e7ee 100644
--- a/build_extensions/axt_versions.bzl
+++ b/build_extensions/axt_versions.bzl
@@ -1,33 +1,20 @@
-"""Defines current AXT versions and dependencies.
+"""Defines next to be released AXT versions.
 
-Ensure UsageTrackerRegistry is updated accordingly when incrementing version numbers.
+Use tools/release/validate_and_propagate_versions.sh to propagate these versions to
+//:axt_m2_repository and gradle-tests/settings.gradle
 """
 
-# AXT versions
-RUNNER_VERSION = "1.4.1-alpha01"  # stable 1.4.0
-RULES_VERSION = "1.4.1-alpha01"  # stable 1.4.0
-MONITOR_VERSION = "1.5.0-alpha01"  # stable 1.4.0
-ESPRESSO_VERSION = "3.5.0-alpha01"  # stable 3.4.0
-CORE_VERSION = "1.4.1-alpha01"  # stable 1.4.0
-ANDROIDX_JUNIT_VERSION = "1.1.4-alpha01"  # stable 1.1.3
-ANDROIDX_TRUTH_VERSION = "1.5.0-alpha01"  # stable 1.4.0
-UIAUTOMATOR_VERSION = "2.2.0"
-JANK_VERSION = "1.0.1"
-SERVICES_VERSION = "1.4.1-alpha01"  # stable 1.4.0
-ORCHESTRATOR_VERSION = "1.4.1-alpha01"  # stable 1.4.0
+RUNNER_VERSION = "1.8.0-alpha01"
+RULES_VERSION = "1.8.0-alpha01"
+MONITOR_VERSION = "1.9.0-alpha02"
+ESPRESSO_VERSION = "3.8.0-alpha01"
+CORE_VERSION = "1.8.0-alpha01"
+ESPRESSO_DEVICE_VERSION = "1.2.0-alpha01"
+ANDROIDX_JUNIT_VERSION = "1.4.0-alpha01"
+ANDROIDX_TRUTH_VERSION = "1.8.0-alpha01"
+ORCHESTRATOR_VERSION = "1.7.0-alpha01"
+SERVICES_VERSION = "1.7.0-alpha01"
 
-# Maven dependency versions
-ANDROIDX_VERSION = "1.0.0"
-ANDROIDX_VERSION_PATH = "1.0.0"
-GOOGLE_MATERIAL_VERSION = "1.0.0"
-ANDROIDX_LIFECYCLE_VERSION = "2.0.0"
-ANDROIDX_MULTIDEX_VERSION = "2.0.0"
-KOTLIN_VERSION = "1.4.30"
-
-# accessibilitytestframework
-ATF_VERSION = "3.1.2"
-
-JUNIT_VERSION = "4.12"
-HAMCREST_VERSION = "1.3"
-TRUTH_VERSION = "1.0"
-GUAVA_VERSION = "27.0.1-android"
+# Full maven artifact strings for apks.
+SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION
+ORCHESTRATOR_ARTIFACT = "androidx.test:orchestrator:%s" % ORCHESTRATOR_VERSION
diff --git a/build_extensions/combine_jars.bzl b/build_extensions/combine_jars.bzl
deleted file mode 100644
index 98d065305..000000000
--- a/build_extensions/combine_jars.bzl
+++ /dev/null
@@ -1,36 +0,0 @@
-"""Combines multiple jars into one jar."""
-
-def combine_jars(name, srcs, **genrule_kwargs):
-  '''Combines multiple jars into one jar.
-
-  Args:
-    name: Name to be used for this rule. It produces name.jar
-    srcs: List of jars to be combined.
-    genrule_kwargs: Keyword arguments to pass through to the genrule.
-  '''
-
-  native.genrule(
-        name=name,
-        srcs=srcs,
-        outs=["%s.jar" % name],
-        tools=["@local_jdk//:jar"],
-        message="Combining following jars: %s" % ",".join(srcs),
-        cmd=(
-            # Absolutify $JAR for jdk-in-perforce
-            '{ [[ "$${JAR=$(location @local_jdk//:jar)}" =~ ^/ ]] || ' +
-            'JAR="$$PWD/$$JAR"; } && ' +
-            "cwd=$$PWD && tmp=$$(mktemp -d) && cd $${tmp} && " +
-            # Extract each jar to its own subdirectory so there's no race between
-            # parallel extraction processes trying to write/overwrite same files.
-            "src_jar_num=0 && " +
-            "for src in $(SRCS);" +
-            "  do mkdir $${src_jar_num} && " +
-            "     (cd ./$${src_jar_num} && $$JAR xf $${cwd}/$${src} > /dev/null) & " +
-            "     src_jar_num=$$((src_jar_num + 1));" +
-            "done && wait && " +
-            "i=1 && while ((i < src_jar_num));" +
-            "  do cp -R ./$$i/* ./0/; (rm -rf ./$$i) & i=$$((i+1)); done && " +
-            "if ((src_jar_num == 0)); then mkdir 0; fi && " +
-            "($$JAR cf $${cwd}/$@ -C ./0 . > /dev/null) && wait &&" +
-            "rm -fr $${tmp} > /dev/null"),
-        **genrule_kwargs)
diff --git a/build_extensions/create_jar.bzl b/build_extensions/create_jar.bzl
new file mode 100644
index 000000000..bcb8fe519
--- /dev/null
+++ b/build_extensions/create_jar.bzl
@@ -0,0 +1,38 @@
+"""Build rule to create a single jar from given files of any type."""
+
+def _create_jar_impl(ctx):
+    """
+    Construct a single jar from given files of any type.
+    """
+
+    input_paths = []
+    for target in ctx.attr.srcs:
+        input_paths.extend(target.files.to_list())
+
+    args = ctx.actions.args()
+    args.add(ctx.outputs.output)
+    args.add_all(input_paths)
+
+    ctx.actions.run(
+        inputs = input_paths,
+        outputs = [ctx.outputs.output],
+        executable = ctx.executable._create_jar_java,
+        arguments = [args],
+        mnemonic = "CreateJAR",
+    )
+
+create_jar = rule(
+    attrs = {
+        "srcs": attr.label_list(allow_files = True),
+        "_create_jar_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_creator/java/androidx/test/tools/jarcreator:jarcreator"),
+        ),
+    },
+    outputs = {
+        "output": "%{name}.jar",
+    },
+    implementation = _create_jar_impl,
+)
diff --git a/build_extensions/dackka_test.bzl b/build_extensions/dackka_test.bzl
new file mode 100644
index 000000000..ac61f2a93
--- /dev/null
+++ b/build_extensions/dackka_test.bzl
@@ -0,0 +1,8 @@
+# Simple wrapper macro that generates rules to create a dackka zip and a build_test to verify it
+
+def dackka_test(name, **kwargs):
+    """Placeholder for ref doc using dackka and a test to verify success
+
+    Currently unsupported in bazel
+    """
+    return
diff --git a/build_extensions/generate_instrumentation_tests.bzl b/build_extensions/generate_instrumentation_tests.bzl
index af60370c4..ff7f907ca 100644
--- a/build_extensions/generate_instrumentation_tests.bzl
+++ b/build_extensions/generate_instrumentation_tests.bzl
@@ -1,15 +1,10 @@
 """Internal helper function for generating instrumentation tests ."""
 
-load(
-    "//build_extensions:android_multidevice_instrumentation_test.bzl",
-    "android_multidevice_instrumentation_test",
-)
-
 def generate_instrumentation_tests(
         name,
         srcs,
         deps,
-        target_devices,
+        device_list,
         test_java_package_name,
         test_android_package_name,
         instrumentation_target_package,
@@ -18,6 +13,8 @@ def generate_instrumentation_tests(
         **kwargs):
     """A helper rule to generate instrumentation tests.
 
+    Currently unsupported in bazel
+
 
     This will generate:
       - a test_binary android_binary (soon to be android_application)
@@ -29,7 +26,7 @@ def generate_instrumentation_tests(
       name: unique prefix to use for generated rules
       srcs: the test sources to generate rules for
       deps: the build dependencies to use for the generated test binary
-      target_devices: array of device targets to execute on
+      device_list: list of device structs to execute on, generated from phone_devices.bzl:devices()
       test_java_package_name: the root java package name for the tests.
       test_android_package_name: the android package name to use for the android_binary test app. Typically this is the same as test_java_package_name
       instrumentation_target_package: the android package name to specify as instrumentationTargetPackage in the test_app manifest
@@ -37,26 +34,3 @@ def generate_instrumentation_tests(
       binary_args: Optional additional arguments to pass to generated android_binary
       **kwargs: arguments to pass to generated android_instrumentation_test rules
     """
-
-    _manifest_values = {
-        "applicationId": test_android_package_name,
-        "instrumentationTargetPackage": instrumentation_target_package,
-    }
-    _manifest_values.update(binary_args.pop("manifest_values", {}))
-    native.android_binary(
-        name = "%s_binary" % name,
-        instruments = instruments,
-        manifest = "//build_extensions:AndroidManifest_instrumentation_test_template.xml",
-        manifest_values = _manifest_values,
-        testonly = 1,
-        deps = deps + [
-            "//runner/android_junit_runner",
-        ],
-        **binary_args
-    )
-    android_multidevice_instrumentation_test(
-        name = "%s_tests" % name,
-        target_devices = target_devices,
-        test_app = "%s_binary" % name,
-        **kwargs
-    )
diff --git a/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/BUILD b/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/BUILD
new file mode 100644
index 000000000..20a5bb87e
--- /dev/null
+++ b/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/BUILD
@@ -0,0 +1,23 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+package(
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+kt_jvm_library(
+    name = "jarcombiner_lib",
+    srcs = glob([
+        "*.kt",
+    ]),
+)
+
+java_binary(
+    name = "jarcombiner",
+    srcs = ["Main.java"],
+    main_class = "androidx.test.tools.jarcombiner.Main",
+    deps = [
+        ":jarcombiner_lib",
+    ],
+)
diff --git a/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/JarCombiner.kt b/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/JarCombiner.kt
new file mode 100644
index 000000000..496e9d075
--- /dev/null
+++ b/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/JarCombiner.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcombiner
+
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.util.jar.JarInputStream
+import java.util.jar.JarOutputStream
+import java.util.zip.ZipEntry
+
+fun combineJars(args: Array<String>) {
+  require(args.size >= 2) { "Must provide a least two files: <output> <input...>" }
+
+  val outputFile = args[0]
+  val jarOutputStream = JarOutputStream(FileOutputStream(outputFile, false))
+  jarOutputStream.use {
+    // keep track of what zip each entry belongs to, in order to have a better error
+    // message in case of duplicates
+    val entryToJar: MutableMap<String, String> = HashMap()
+
+    for (i in 1 until args.size) {
+      val inputFile = args[i]
+      val jarInputStream = JarInputStream(FileInputStream(inputFile))
+      jarInputStream.use { addToJar(entryToJar, jarOutputStream, jarInputStream, args[i]) }
+    }
+  }
+}
+
+private fun addToJar(
+  entryToJar: MutableMap<String, String>,
+  jarOutputStream: JarOutputStream,
+  inputJarStream: JarInputStream,
+  inputJarName: String,
+) {
+
+  var entry = inputJarStream.nextEntry
+  while (entry != null) {
+    // JarOutputStream will throw an error if any duplicate entry is added, which is undesirable for
+    // directories and certain classes.
+    // Keep track of the list of directories already added to prevent this
+    if (entryToJar.containsKey(entry.name)) {
+      if (!isAllowedDuplicate(entry)) {
+        throw RuntimeException(
+          "Duplicate entry: ${entry.name} is present in both ${entryToJar.get(entry.name)} and $inputJarName"
+        )
+      }
+    } else if (shouldAddEntry(entry)) {
+      jarOutputStream.putNextEntry(entry)
+      inputJarStream.transferTo(jarOutputStream)
+      entryToJar.put(entry.name, inputJarName)
+    }
+    entry = inputJarStream.nextEntry
+  }
+}
+
+private fun isAllowedDuplicate(entry: ZipEntry): Boolean {
+  if (entry.isDirectory) {
+    // always allow duplicate directories
+    return true
+  } else if (entry.name.startsWith("com/google/protobuf")) {
+    // bazel's new version of rules_proto creates java wrapper libraries around any proto_library
+    // dependencies, which contain classes already present in the main protobuf-javalite-3.21.7.jar
+    return true
+  }
+  return false
+}
+
+private fun shouldAddEntry(entry: ZipEntry): Boolean {
+  if (entry.name.matches(Regex(".*/R[\\.|\\$].*class$"))) {
+    // strip generated R.class from resulting jar
+    return false
+  } else if (entry.name.equals("protobuf.meta")) {
+    return false
+  } else if (entry.name.startsWith("META-INF/maven")) {
+    // strip out files added to META-INF/maven since this can lead to duplicate file errors
+    return false
+  } else if (entry.name.startsWith("META-INF/MANIFEST.MF")) {
+    // strip out files added to META-INF/MANIFEST.MF since this can lead to duplicate file errors
+    return false
+  } else if (entry.name.startsWith("google/protobuf")) {
+    // strip out all the google/protobuf/*.proto files since this can lead to duplicate file errors
+    return false
+  } else if (entry.name.startsWith("META-INF/com.google.dagger_dagger.version")) {
+    // strip out META-INF/com.google.dagger_dagger.version since this can lead to duplicate file
+    // errors
+    return false
+  }
+  return true
+}
diff --git a/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/Main.java b/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/Main.java
new file mode 100644
index 000000000..548b630a2
--- /dev/null
+++ b/build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner/Main.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcombiner;
+
+public class Main {
+  private Main() {}
+
+  public static void main(String[] args) {
+    JarCombinerKt.combineJars(args);
+  }
+}
diff --git a/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/BUILD b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/BUILD
new file mode 100644
index 000000000..ebe2f2346
--- /dev/null
+++ b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/BUILD
@@ -0,0 +1,17 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
+
+kt_jvm_test(
+    name = "JarCombinerTest",
+    srcs = ["JarCombinerTest.kt"],
+    data = [
+        "//build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures:libjar1.jar",
+        "//build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures:libjar2.jar",
+        "//build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures:libjar_with_r.jar",
+    ],
+    deps = [
+        "//build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner:jarcombiner_lib",
+        "//build_extensions/jar_validator/java/androidx/test/tools/jarvalidator:jarvalidator_lib",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/JarCombinerTest.kt b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/JarCombinerTest.kt
new file mode 100644
index 000000000..4ae3ebe2d
--- /dev/null
+++ b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/JarCombinerTest.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.tools.jarcombiner
+
+import androidx.test.tools.jarvalidator.getClassesInJar
+import com.google.common.truth.Truth.assertThat
+import java.io.File
+import java.nio.file.Paths
+import java.util.zip.ZipException
+import kotlin.io.path.exists
+import kotlin.streams.toList
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class JarCombinerTest {
+
+  @Test
+  fun invalidInput() {
+    assertThrows(java.lang.IllegalArgumentException::class.java) { combineJars(emptyArray()) }
+  }
+
+  @Test
+  fun combineJars() {
+    val outFile = File.createTempFile("combineJarsOut", ".jar")
+
+    combineJars(
+      arrayOf(outFile.absolutePath, getDataJarPath("libjar1.jar"), getDataJarPath("libjar2.jar"))
+    )
+    val classes = getClassesInJar(outFile.absolutePath)
+    assertThat(classes.toList())
+      .containsExactly(
+        "androidx.test.tools.jarcombiner.fixtures.Jar1Class",
+        "androidx.test.tools.jarcombiner.fixtures.Jar2Class"
+      )
+  }
+
+  @Test
+  fun rClassesRemoved() {
+    val outFile = File.createTempFile("rClassesRemovedOut", ".jar")
+
+    combineJars(arrayOf(outFile.absolutePath, getDataJarPath("libjar_with_r.jar")))
+    val classes = getClassesInJar(outFile.absolutePath)
+    assertThat(classes.toList())
+      .containsExactly("androidx.test.tools.jarcombiner.fixtures.Jar1Class")
+  }
+
+  @Test
+  fun duplicateClasses() {
+    val outFile = File.createTempFile("duplicateClasses", ".jar")
+
+    assertThrows(
+      ZipException::class.java,
+      {
+        combineJars(
+          arrayOf(
+            outFile.absolutePath,
+            getDataJarPath("libjar1.jar"),
+            getDataJarPath("libjar_with_r.jar")
+          )
+        )
+      }
+    )
+  }
+
+  private fun getDataJarPath(name: String): String {
+    val path =
+      Paths.get(
+        System.getenv("TEST_SRCDIR"),
+        "build_extensions",
+        "jar_combiner",
+        "javatests",
+        "androidx",
+        "test",
+        "tools",
+        "jarcombiner",
+        "fixtures",
+        name
+      )
+    assertThat(path.exists()).isTrue()
+    return path.toAbsolutePath().toString()
+  }
+}
diff --git a/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/BUILD b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/BUILD
new file mode 100644
index 000000000..dd7ffcd93
--- /dev/null
+++ b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/BUILD
@@ -0,0 +1,32 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(default_applicable_licenses = ["//:license"])
+
+java_library(
+    name = "jar1",
+    srcs = ["Jar1Class.java"],
+    visibility = [
+        "//build_extensions/jar_combiner/javatests:__subpackages__",
+    ],
+)
+
+java_library(
+    name = "jar2",
+    srcs = [
+        "Jar2Class.java",
+    ],
+    visibility = [
+        "//build_extensions/jar_combiner/javatests:__subpackages__",
+    ],
+)
+
+java_library(
+    name = "jar_with_r",
+    srcs = [
+        "Jar1Class.java",
+        "R.java",
+    ],
+    visibility = [
+        "//build_extensions/jar_combiner/javatests:__subpackages__",
+    ],
+)
diff --git a/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/Jar1Class.java b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/Jar1Class.java
new file mode 100644
index 000000000..564618743
--- /dev/null
+++ b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/Jar1Class.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcombiner.fixtures;
+
+public class Jar1Class {
+  private Jar1Class() {}
+}
diff --git a/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/Jar2Class.java b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/Jar2Class.java
new file mode 100644
index 000000000..d31256f15
--- /dev/null
+++ b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/Jar2Class.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcombiner.fixtures;
+
+public class Jar2Class {
+  private Jar2Class() {}
+}
diff --git a/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/R.java b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/R.java
new file mode 100644
index 000000000..6bc60df87
--- /dev/null
+++ b/build_extensions/jar_combiner/javatests/androidx/test/tools/jarcombiner/fixtures/R.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcombiner.fixtures;
+
+public class R {
+
+  private R() {}
+
+  public static class Inner {}
+}
diff --git a/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/BUILD b/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/BUILD
new file mode 100644
index 000000000..b685ccf9e
--- /dev/null
+++ b/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/BUILD
@@ -0,0 +1,23 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+package(
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+kt_jvm_library(
+    name = "jarcreator_lib",
+    srcs = glob([
+        "*.kt",
+    ]),
+)
+
+java_binary(
+    name = "jarcreator",
+    srcs = ["Main.java"],
+    main_class = "androidx.test.tools.jarcreator.Main",
+    deps = [
+        ":jarcreator_lib",
+    ],
+)
diff --git a/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/JarCreator.kt b/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/JarCreator.kt
new file mode 100644
index 000000000..246e35a80
--- /dev/null
+++ b/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/JarCreator.kt
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcreator
+
+import java.io.BufferedInputStream
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.InputStream
+import java.util.jar.JarEntry
+import java.util.jar.JarOutputStream
+
+/**
+ * This is a simple utility that creates a jar file of input files.
+ *
+ * Unlike other solutions like invoking jar command directly or using bazel's
+ * java_common.pack_sources, this will create a jar without timestamp and with files in the root
+ * directory of the jar.
+ */
+fun createJar(args: Array<String>) {
+  require(args.size >= 2) { "Must provide at least two files: <output> <input...>" }
+
+  val outputFile = args[0]
+  val jarOutputStream = JarOutputStream(FileOutputStream(outputFile, false))
+  jarOutputStream.use {
+    for (i in 1 until args.size) {
+      val inputFile = File(args[i])
+      val inputStream = BufferedInputStream(FileInputStream(inputFile))
+      inputStream.use { addToJar(jarOutputStream, inputStream, inputFile) }
+    }
+  }
+}
+
+private fun addToJar(jarOutputStream: JarOutputStream, inputStream: InputStream, inputFile: File) {
+  val entry = JarEntry(inputFile.name)
+  jarOutputStream.putNextEntry(entry)
+  inputStream.transferTo(jarOutputStream)
+}
diff --git a/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/Main.java b/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/Main.java
new file mode 100644
index 000000000..0cb0bf699
--- /dev/null
+++ b/build_extensions/jar_creator/java/androidx/test/tools/jarcreator/Main.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarcreator;
+
+public class Main {
+  private Main() {}
+
+  public static void main(String[] args) {
+    JarCreatorKt.createJar(args);
+  }
+}
diff --git a/build_extensions/jar_creator/javatests/androidx/test/tools/jarcreator/BUILD b/build_extensions/jar_creator/javatests/androidx/test/tools/jarcreator/BUILD
new file mode 100644
index 000000000..2225df551
--- /dev/null
+++ b/build_extensions/jar_creator/javatests/androidx/test/tools/jarcreator/BUILD
@@ -0,0 +1,11 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
+
+kt_jvm_test(
+    name = "JarCreatorTest",
+    srcs = ["JarCreatorTest.kt"],
+    deps = [
+        "//build_extensions/jar_creator/java/androidx/test/tools/jarcreator:jarcreator_lib",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/build_extensions/jar_creator/javatests/androidx/test/tools/jarcreator/JarCreatorTest.kt b/build_extensions/jar_creator/javatests/androidx/test/tools/jarcreator/JarCreatorTest.kt
new file mode 100644
index 000000000..4cce604d0
--- /dev/null
+++ b/build_extensions/jar_creator/javatests/androidx/test/tools/jarcreator/JarCreatorTest.kt
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.tools.jarcreator
+
+import com.google.common.truth.Truth.assertThat
+import java.io.File
+import java.util.jar.JarFile
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class JarCreatorTest {
+
+  @Test
+  fun invalidInput() {
+    assertThrows(java.lang.IllegalArgumentException::class.java) { createJar(emptyArray()) }
+  }
+
+  @Test
+  fun combineJars() {
+    val outFile = File.createTempFile("createJarOut", ".jar")
+    val fileToInclude = File.createTempFile("include", ".txt")
+
+    createJar(arrayOf(outFile.absolutePath, fileToInclude.absolutePath))
+
+    val contents = JarFile(outFile.absolutePath).stream().map { it.name }
+    assertThat(contents).containsExactly(fileToInclude.name)
+  }
+}
diff --git a/build_extensions/jar_validator/BUILD b/build_extensions/jar_validator/BUILD
new file mode 100644
index 000000000..327b24cea
--- /dev/null
+++ b/build_extensions/jar_validator/BUILD
@@ -0,0 +1,5 @@
+alias(
+    name = "jar_validator",
+    actual = "//build_extensions/jar_validator/java/androidx/test/tools/jarvalidator",
+    visibility = ["//build_extensions:__subpackages__"],
+)
diff --git a/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/BUILD b/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/BUILD
new file mode 100644
index 000000000..f5517603c
--- /dev/null
+++ b/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/BUILD
@@ -0,0 +1,23 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+kt_jvm_library(
+    name = "jarvalidator_lib",
+    srcs = glob([
+        "*.kt",
+    ]),
+    visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+java_binary(
+    name = "jarvalidator",
+    srcs = ["Main.java"],
+    main_class = "androidx.test.tools.jarvalidator.Main",
+    visibility = [
+        "//:__subpackages__",
+    ],
+    deps = [
+        ":jarvalidator_lib",
+    ],
+)
diff --git a/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/JarValidator.kt b/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/JarValidator.kt
new file mode 100644
index 000000000..97f5b5901
--- /dev/null
+++ b/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/JarValidator.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarvalidator
+
+import java.io.File
+import java.lang.System
+import java.util.jar.JarEntry
+import java.util.jar.JarFile
+import java.util.stream.Stream
+
+/** Validates the classes contained in a given jar file. */
+fun validateJar(args: Array<String>): Boolean {
+  require(args.size >= 3) {
+    "Usage: <output txt> <input jar> <expected prefix 1> <expected prefix 2> ..."
+  }
+
+  val outputFile = File(args[0])
+  val expectedPrefixes = args.asList().drop(2)
+  val nonMatchingEntries = mutableListOf<String>()
+  val jarFilePath = args[1]
+  val classes = getClassesInJar(jarFilePath)
+  for (className in classes) {
+    if (!matchesExpectedPrefixes(expectedPrefixes, className)) {
+      nonMatchingEntries.add(className)
+    }
+  }
+  return if (nonMatchingEntries.size > 0) {
+    nonMatchingEntries.sort()
+    val error =
+      "Error: The following classes in $jarFilePath did not match one of the expected prefixes $expectedPrefixes \n" +
+        nonMatchingEntries.joinToString("\n")
+    System.err.println(error)
+    outputFile.writeText(error)
+    false
+  } else {
+    outputFile.writeText("Success!")
+    true
+  }
+}
+
+fun getClassesInJar(filePath: String): Stream<String> {
+  return JarFile(filePath)
+    .stream()
+    .filter { it.name.endsWith(".class") }
+    .map { classNameFromPath(it) }
+}
+
+private fun matchesExpectedPrefixes(expectedPrefixes: List<String>, className: String): Boolean {
+  for (pkg in expectedPrefixes) {
+    if (className.startsWith(pkg)) {
+      return true
+    }
+  }
+  return false
+}
+
+private fun classNameFromPath(it: JarEntry) = it.name.replace('/', '.').replace(".class", "")
diff --git a/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/Main.java b/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/Main.java
new file mode 100644
index 000000000..c883d01cd
--- /dev/null
+++ b/build_extensions/jar_validator/java/androidx/test/tools/jarvalidator/Main.java
@@ -0,0 +1,11 @@
+package androidx.test.tools.jarvalidator;
+
+public class Main {
+  private Main() {}
+
+  public static void main(String[] args) {
+    if (!JarValidatorKt.validateJar(args)) {
+      System.exit(1);
+    }
+  }
+}
diff --git a/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/BUILD b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/BUILD
new file mode 100644
index 000000000..53a4895cc
--- /dev/null
+++ b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/BUILD
@@ -0,0 +1,15 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
+
+kt_jvm_test(
+    name = "JarValidatorTest",
+    srcs = ["JarValidatorTest.kt"],
+    data = [
+        "//build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures:libmatching.jar",
+        "//build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures:libnotmatching.jar",
+    ],
+    deps = [
+        "//build_extensions/jar_validator/java/androidx/test/tools/jarvalidator:jarvalidator_lib",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/JarValidatorTest.kt b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/JarValidatorTest.kt
new file mode 100644
index 000000000..ade4f3db2
--- /dev/null
+++ b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/JarValidatorTest.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.tools.jarvalidator
+
+import com.google.common.truth.Truth.assertThat
+import java.io.File
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.Arrays
+import kotlin.io.path.Path
+import kotlin.io.path.exists
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.function.ThrowingRunnable
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class JarValidatorTest {
+
+  @Test
+  fun invalidInput() {
+    assertThrows(java.lang.IllegalArgumentException::class.java) { validateJar(emptyArray()) }
+  }
+
+  @Test
+  fun matchingClasses() {
+    val matchingJarPath = getDataJarPath("libmatching.jar")
+    assertThat(matchingJarPath.exists()).isTrue()
+
+    val outFile = File.createTempFile("matchingClasses", ".txt")
+
+    assertThat(validateJar(arrayOf(outFile.absolutePath, matchingJarPath.toAbsolutePath().toString(), "androidx.test.tools.jarvalidator.fixtures.matching" ))).isTrue()
+  }
+
+  @Test
+  fun notMatchingClasses() {
+    val matchingJarPath = getDataJarPath("libnotmatching.jar")
+    assertThat(matchingJarPath.exists()).isTrue()
+
+    val outFile = File.createTempFile("notMatchingClasses", ".txt")
+
+    assertThat(validateJar(arrayOf(outFile.absolutePath, matchingJarPath.toAbsolutePath().toString(), "androidx.test.tools.jarvalidator.fixtures.matching" ))).isFalse()
+    val outFileContents = outFile.readText()
+    // assert not matching class is listed
+    assertThat(outFileContents).contains("androidx.test.tools.jarvalidator.fixtures.notmatching.NotMatching")
+    assertThat(outFileContents).doesNotContain("androidx.test.tools.jarvalidator.fixtures.matching.Matching")
+  }
+
+  private fun getDataJarPath(name: String) =
+    Paths.get(System.getenv("TEST_SRCDIR"), "build_extensions", "jar_validator", "javatests", "androidx", "test", "tools", "jarvalidator", "fixtures" , name)
+}
\ No newline at end of file
diff --git a/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/BUILD b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/BUILD
new file mode 100644
index 000000000..1258b9fc9
--- /dev/null
+++ b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/BUILD
@@ -0,0 +1,22 @@
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(default_applicable_licenses = ["//:license"])
+
+java_library(
+    name = "matching",
+    srcs = ["matching/Matching.java"],
+    visibility = [
+        "//build_extensions/jar_validator/javatests:__subpackages__",
+    ],
+)
+
+java_library(
+    name = "notmatching",
+    srcs = [
+        "matching/Matching.java",
+        "notmatching/NotMatching.java",
+    ],
+    visibility = [
+        "//build_extensions/jar_validator/javatests:__subpackages__",
+    ],
+)
diff --git a/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/matching/Matching.java b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/matching/Matching.java
new file mode 100644
index 000000000..994df2c8a
--- /dev/null
+++ b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/matching/Matching.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarvalidator.fixtures.matching;
+
+public class Matching {}
diff --git a/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/notmatching/NotMatching.java b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/notmatching/NotMatching.java
new file mode 100644
index 000000000..326003f8a
--- /dev/null
+++ b/build_extensions/jar_validator/javatests/androidx/test/tools/jarvalidator/fixtures/notmatching/NotMatching.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.jarvalidator.fixtures.notmatching;
+
+public class NotMatching {}
diff --git a/build_extensions/java_service_map.bzl b/build_extensions/java_service_map.bzl
index 7a42732cc..103642fc7 100644
--- a/build_extensions/java_service_map.bzl
+++ b/build_extensions/java_service_map.bzl
@@ -1,94 +1,99 @@
-
 def java_service_map(
-    name, providers, compatible_with=None, restricted_to=None, visibility=None):
-  """
-  A rule type that generates service provider mappings for use in Java JAR files
+        name,
+        providers,
+        compatible_with = None,
+        restricted_to = None,
+        visibility = None):
+    """
+    A rule type that generates service provider mappings for use in Java JAR files
 
-  Args:
-    name: A unique name. (Name)
-    providers: Mapping of services to service providers.
-      (Dictionary of strings to string lists)
-      A dictionary whose key is the fully-qualified binary name of the service's
-      type. (i.e. The interface or abstract class.) The value should be a list
-      of strings that are the fully-qualified names of the concrete
-      implementations.
+    Args:
+      name: A unique name. (Name)
+      providers: Mapping of services to service providers.
+        (Dictionary of strings to string lists)
+        A dictionary whose key is the fully-qualified binary name of the service's
+        type. (i.e. The interface or abstract class.) The value should be a list
+        of strings that are the fully-qualified names of the concrete
+        implementations.
 
-  To use, specify a map of services (interfaces, abstract classes, etc.) to
-  concrete implementations using a java_service_map rule in your BUILD file.
-  The output of this rule can then be added to the 'deps' of other Java
-  library or binary targets. For example:
+    To use, specify a map of services (interfaces, abstract classes, etc.) to
+    concrete implementations using a java_service_map rule in your BUILD file.
+    The output of this rule can then be added to the 'deps' of other Java
+    library or binary targets. For example:
 
-    load("//build_extensions/java_service_map.bzl", "java_service_map")
+      load("//build_extensions/java_service_map.bzl", "java_service_map")
 
-    java_service_map(
-        name = "my_service_map",
-        providers = {
-            "com.google.myservice.MyInterface": [
-                "com.google.myservice.impl.MyClass",
-                "com.google.myservice.impl.MyOtherClass",
-            ],
-            # ...
-        },
-    )
+      java_service_map(
+          name = "my_service_map",
+          providers = {
+              "com.google.myservice.MyInterface": [
+                  "com.google.myservice.impl.MyClass",
+                  "com.google.myservice.impl.MyOtherClass",
+              ],
+              # ...
+          },
+      )
 
-    java_library(
-        name = "my_service_lib",
-        srcs = [
-            "impl/MyClass.java",
-            "impl/MyOtherClass.java",
-            # ...
-        ],
-        deps = [
-            ":my_service_map",
-            # ...
-        ],
-    )
+      java_library(
+          name = "my_service_lib",
+          srcs = [
+              "impl/MyClass.java",
+              "impl/MyOtherClass.java",
+              # ...
+          ],
+          deps = [
+              ":my_service_map",
+              # ...
+          ],
+      )
 
-  The 'providers' attribute of the build rule is a dictionary that maps service
-  names to a list of providers. The key of the dictionary is a string that is
-  the fully-qualified binary name of the service's type. (i.e. The interface or
-  abstract class.) The value is a list of strings that are the fully-qualified
-  names of the concrete implementations. The output of this rule is a JAR file
-  that contains the appropriate files in META-INF/services.
+    The 'providers' attribute of the build rule is a dictionary that maps service
+    names to a list of providers. The key of the dictionary is a string that is
+    the fully-qualified binary name of the service's type. (i.e. The interface or
+    abstract class.) The value is a list of strings that are the fully-qualified
+    names of the concrete implementations. The output of this rule is a JAR file
+    that contains the appropriate files in META-INF/services.
 
-  This rule generalizes the strategy outlined by kylemarvin:
-  http://wiki/Nonconf/JavaLibraryMetaInf
-  """
+    This rule generalizes the strategy outlined by kylemarvin:
+    http://wiki/Nonconf/JavaLibraryMetaInf
+    """
 
-  # Make sure the directories exist
-  files_dir = "$(@D)/" + name + "_files"
-  services_dir = files_dir + "/META-INF/services"
-  cmd = "rm -rf " + files_dir + ";"
-  cmd += "mkdir -p " + services_dir + ";"
+    # Make sure the directories exist
+    files_dir = "$(@D)/" + name + "_files"
+    services_dir = files_dir + "/META-INF/services"
+    cmd = "rm -rf " + files_dir + ";"
+    cmd += "mkdir -p " + services_dir + ";"
 
-  # Write individual META-INF files
-  for service, provider_list in sorted(providers.items()):
-    file_path = services_dir + "/" + service
-    cmd += ("echo '# Generated by Blaze' > " + file_path + ";")
-    for provider in provider_list:
-      cmd += ("echo '" + provider + "' >> " + file_path + ";")
+    # Write individual META-INF files
+    for service, provider_list in sorted(providers.items()):
+        file_path = services_dir + "/" + service
+        cmd += ("echo '# Generated by Blaze' > " + file_path + ";")
+        for provider in provider_list:
+            cmd += ("echo '" + provider + "' >> " + file_path + ";")
 
-  # Make a JAR file including all the manifest files.
-  # Use the 'zip' command instead of 'jar' to help with bazel's output caching.
-  #cmd += zip_cmd + " -q -jt -X -wd " + files_dir + " -r $@ META-INF"
-  cmd += "cwd=$$(pwd); "
-  cmd += "cd " + files_dir + "; "
-  cmd += "zip -X -r $$cwd/$@ .; "
-  cmd += "cd $$cwd"
+    # Make a JAR file including all the manifest files.
+    # Use the 'zip' command instead of 'jar' to help with bazel's output caching.
+    #cmd += zip_cmd + " -q -jt -X -wd " + files_dir + " -r $@ META-INF"
+    cmd += "cwd=$$(pwd); "
+    cmd += "cd " + files_dir + "; "
+    cmd += "zip -X -r $$cwd/$@ .; "
+    cmd += "cd $$cwd"
 
-  # Go!
-  native.genrule(
-      name = name + "_gen",
-      srcs = [],
-      outs = [name + ".jar"],
-      compatible_with = compatible_with,
-      restricted_to = restricted_to,
-      cmd = cmd,
-      visibility = visibility)
+    # Go!
+    native.genrule(
+        name = name + "_gen",
+        srcs = [],
+        outs = [name + ".jar"],
+        compatible_with = compatible_with,
+        restricted_to = restricted_to,
+        cmd = cmd,
+        visibility = visibility,
+    )
 
-  native.java_import(
-      name = name,
-      jars = [name + ".jar"],
-      compatible_with = compatible_with,
-      restricted_to = restricted_to,
-      visibility = visibility)
+    native.java_import(
+        name = name,
+        jars = [name + ".jar"],
+        compatible_with = compatible_with,
+        restricted_to = restricted_to,
+        visibility = visibility,
+    )
diff --git a/build_extensions/jetify.bzl b/build_extensions/jetify.bzl
new file mode 100644
index 000000000..e1c405669
--- /dev/null
+++ b/build_extensions/jetify.bzl
@@ -0,0 +1,9 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
+
+def jetify_android_library(jetify_sources = False, **kwargs):
+    # ignore, not supported in bazel
+    android_library(**kwargs)
+
+def jetify_android_binary(jetify_sources = False, **kwargs):
+    # ignore, not supported in bazel
+    android_binary(**kwargs)
diff --git a/build_extensions/kt_android_app_instrumentation_tests.bzl b/build_extensions/kt_android_app_instrumentation_tests.bzl
deleted file mode 100644
index 90aa4b852..000000000
--- a/build_extensions/kt_android_app_instrumentation_tests.bzl
+++ /dev/null
@@ -1,75 +0,0 @@
-"""A rule wrapper for a Kotlin instrumentation test for an android binary."""
-
-load(
-    "//build_extensions:generate_instrumentation_tests.bzl",
-    "generate_instrumentation_tests",
-)
-load(
-    "//build_extensions:infer_java_package_name.bzl",
-    "infer_java_package_name",
-    "infer_java_package_name_from_label",
-)
-
-def kt_android_app_instrumentation_tests(
-        name,
-        binary_target,
-        srcs,
-        deps,
-        target_devices,
-        test_java_package = None,
-        binary_target_package = None,
-        library_args = {},
-        binary_args = {},
-        **kwargs):
-    """A macro for a Kotlin instrumentation test whose target under test is an android_binary.
-
-        The intent of this wrapper is to simplify the build API for creating instrumentation test rules
-        for simple cases, while still supporting build_cleaner for automatic dependency management.
-
-        This will generate:
-          - a test_lib android_library, containing all sources and dependencies
-          - a test_binary android_binary (soon to be android_application)
-          - the manifest to use for the test library.
-          - for each src + device combination:
-             - a android_instrumentation_test rule
-
-        Args:
-          name: the name to use for the generated kt_android_library rule. This is needed for build_cleaner to
-            manage dependencies
-          binary_target: the android_binary under test
-          srcs: the test sources to generate rules for
-          deps: the build dependencies to use for the generated test library
-          target_devices: array of device targets to execute on
-          test_java_package_name: Optional. A custom root package name to use for the tests. If unset
-              will be derived based on current path to a java source root
-          binary_target_package: Optional: the android package name of binary_target. If unset, will be
-              derived from binary target's path to a java source root
-          library_args: additional arguments to pass to generated android_library
-          binary_args: additional arguments to pass to generated android_binary
-          **kwargs: arguments to pass to generated android_instrumentation_test rules
-        """
-    library_name = "%s_library" % name
-    test_java_package_name = test_java_package if test_java_package else infer_java_package_name()
-    instrumentation_target_package = binary_target_package if binary_target_package else infer_java_package_name_from_label(binary_target)
-
-    native.kt_android_library(
-        name = library_name,
-        srcs = srcs,
-        testonly = 1,
-        deps = deps,
-        **library_args
-    )
-
-    generate_instrumentation_tests(
-        name = name,
-        srcs = srcs,
-        deps = [library_name],
-        target_devices = target_devices,
-        test_java_package_name = test_java_package_name,
-        # always append .tests at the end to avoid potential conflict with instrumentation_target_package
-        test_android_package_name = instrumentation_target_package + ".tests",
-        instrumentation_target_package = instrumentation_target_package,
-        instruments = binary_target,
-        binary_args = binary_args,
-        **kwargs
-    )
diff --git a/build_extensions/kt_android_library.bzl b/build_extensions/kt_android_library.bzl
new file mode 100644
index 000000000..44bbbc44b
--- /dev/null
+++ b/build_extensions/kt_android_library.bzl
@@ -0,0 +1,8 @@
+"""Wrapper for android_library for bazel.
+"""
+
+load("@io_bazel_rules_kotlin//kotlin:android.bzl", io_kt_android_library = "kt_android_library")
+
+def kt_android_library(testonly = 1, **kwargs):
+    # explicitly set testonly to 1 because io_kt_android_library doesn't seem to respect package(default_testonly = 1)
+    io_kt_android_library(testonly = testonly, **kwargs)
diff --git a/build_extensions/kt_android_library_instrumentation_tests.bzl b/build_extensions/kt_android_library_instrumentation_tests.bzl
deleted file mode 100644
index 99333af07..000000000
--- a/build_extensions/kt_android_library_instrumentation_tests.bzl
+++ /dev/null
@@ -1,72 +0,0 @@
-"""A rule wrapper for an kotlin instrumentation test for an android library."""
-
-load(
-    "//build_extensions:generate_instrumentation_tests.bzl",
-    "generate_instrumentation_tests",
-)
-load(
-    "//build_extensions:infer_java_package_name.bzl",
-    "infer_java_package_name",
-)
-
-def kt_android_library_instrumentation_tests(name, srcs, deps, target_devices,
-                                          test_java_package = None, library_args = {},
-                                          binary_args = {}, **kwargs):
-    """A macro for an kotlin instrumentation test whose target under test is an (kt_)android_library.
-
-    Will generate a 'self-instrumentating' test binary and other associated rules
-
-    The intent of this wrapper is to simplify the build API for creating instrumentation test rules
-    for simple cases, while still supporting build_cleaner for automatic dependency management.
-
-    This will generate:
-      - an unused stub android_binary under test, to placate bazel
-      - a test_lib android_library, containing all sources and dependencies
-      - a test_binary android_binary (soon to be android_application)
-      - the manifest to use for the test library.
-      - for each device combination:
-         - an android_instrumentation_test rule)
-
-    Args:
-      name: the name to use for the generated android_library rule. This is needed for build_cleaner to
-        manage dependencies
-      srcs: the test sources to generate rules for
-      deps: the build dependencies to use for the generated test binary
-      target_devices: array of device targets to execute on
-      test_java_package: Optional. A custom root package name to use for the tests. If unset
-          will be derived based on current path to a java source root
-      library_args: additional arguments to pass to generated android_library
-      binary_args: additional arguments to pass to generated android_binary
-      **kwargs: arguments to pass to generated android_instrumentation_test rules
-    """
-    library_name = "%s_library" % name
-    test_java_package_name = test_java_package if test_java_package else infer_java_package_name()
-
-    native.android_binary(
-        name = "target_stub_binary",
-        manifest = "//build_extensions:AndroidManifest_target_stub.xml",
-        # use the same package name as the test package, so it gets overridden
-        manifest_values = {"applicationId": test_java_package_name},
-        testonly = 1,
-    )
-
-    native.kt_android_library(
-        name = library_name,
-        srcs = srcs,
-        testonly = 1,
-        deps = deps,
-        **library_args
-    )
-
-    generate_instrumentation_tests(
-        name = name,
-        srcs = srcs,
-        deps = [library_name],
-        target_devices = target_devices,
-        test_java_package_name = test_java_package_name,
-        test_android_package_name = test_java_package_name,
-        instrumentation_target_package = test_java_package_name,
-        instruments = ":target_stub_binary",
-        binary_args = binary_args,
-        **kwargs
-    )
diff --git a/build_extensions/maven/BUILD b/build_extensions/maven/BUILD
new file mode 100644
index 000000000..fe16132c5
--- /dev/null
+++ b/build_extensions/maven/BUILD
@@ -0,0 +1,17 @@
+licenses(["notice"])
+
+package(default_visibility = [
+    "//visibility:public",
+])
+
+# Used to generate a maven artifact.
+sh_binary(
+    name = "maven_artifact_sh",
+    srcs = ["maven_artifact.sh"],
+)
+
+java_binary(
+    name = "jarjar_bin",
+    main_class = "org.pantsbuild.jarjar.Main",
+    runtime_deps = ["@maven//:org_pantsbuild_jarjar"],
+)
diff --git a/build_extensions/maven/add_or_update_file_in_zip.bzl b/build_extensions/maven/add_or_update_file_in_zip.bzl
new file mode 100644
index 000000000..00d923ce7
--- /dev/null
+++ b/build_extensions/maven/add_or_update_file_in_zip.bzl
@@ -0,0 +1,26 @@
+"""Update a zip file to update or add a particular file within."""
+
+def add_or_update_file_in_zip(ctx, name, src, out, update_src, update_path):
+    """Update a zip file to update or add a particular file within.
+
+    """
+    ctx.actions.run_shell(
+        inputs = [src, update_src],
+        outputs = [out],
+        mnemonic = "AndroidxTestZipUpdate",
+        command = ";".join([
+            "tmp={}_tmp".format(name),
+            "rm -rf $$tmp",
+            "mkdir -p $$tmp",
+            "cp {update_src} $$tmp/{update_path}".format(
+                update_src = update_src.path,
+                update_path = update_path,
+            ),
+            "zip -j -X -q -l " +
+            "{src} $$tmp/{update_path} -O {out}".format(
+                src = src.path,
+                update_path = update_path,
+                out = out.path,
+            ),
+        ]),
+    )
diff --git a/build_extensions/maven/axt_android_aar.bzl b/build_extensions/maven/axt_android_aar.bzl
new file mode 100644
index 000000000..a8a4b3603
--- /dev/null
+++ b/build_extensions/maven/axt_android_aar.bzl
@@ -0,0 +1,129 @@
+"""Generate AXT android archive (aar)."""
+
+load("@build_bazel_rules_android//providers:providers.bzl", "AndroidLibraryAarInfo")
+load("@rules_java//java:defs.bzl", "JavaInfo", "java_common")
+load("//build_extensions/maven:add_or_update_file_in_zip.bzl", "add_or_update_file_in_zip")
+load("//build_extensions/maven:combine_jars.bzl", "combine_jars")
+load("//build_extensions/maven:jarjar.bzl", "jarjar_rule")
+load("//build_extensions/maven:maven_info.bzl", "MavenFilesInfo", "MavenInfo", "collect_maven_info")
+
+def _android_aar_impl(ctx):
+    # current_aar will include almost everything needed: an AndroidManifest.xml, compiled resources,
+    # and a proguard.txt. However, its classes.jar will only include direct compiled srcs. Missing
+    # will be any sources from transitive dependencies that also need to be bundled in the aar
+    current_aar = ctx.attr.included_dep[AndroidLibraryAarInfo].aar
+    if not current_aar:
+        fail("included_dep %s does not produce an aar. Is it an android_library rule with an AndroidManifest.xml?" % ctx.attr.included_dep.label)
+
+    if not ctx.attr.included_dep[MavenInfo].artifact:
+        fail("Could not find maven artifact for included_dep %s. Is it listed in maven_registry?" % ctx.attr.included_dep.label)
+
+    # build a combined classes jar from all dependencies that are part of this maven artifact
+    classes_jar = ctx.actions.declare_file(ctx.attr.name + "_combined_classes.jar")
+    combine_jars(
+        ctx = ctx,
+        input_jars_deps = ctx.attr.included_dep[MavenInfo].transitive_included_runtime_jars,
+        output = classes_jar,
+    )
+
+    # optionally use jarjar to rename shaded dependencies
+    if (ctx.attr.jarjar_rule):
+        jarjar_classes_jar = ctx.actions.declare_file(ctx.attr.name + "_jarjar_classes.jar")
+        jarjar_rule(ctx, rule = ctx.file.jarjar_rule, src = classes_jar, out = jarjar_classes_jar)
+        classes_jar = jarjar_classes_jar
+
+    # TODO: tying validation to an output was the only way to get this to run, but
+    # according to docs it shouldn't be necessary
+    #validation_output = ctx.actions.declare_file(ctx.attr.name + ".validation")
+    validation_output = ctx.outputs.validation
+    ctx.actions.run(
+        inputs = [classes_jar],
+        outputs = [validation_output],
+        mnemonic = "AxtAndroidAarValidateJar",
+        executable = ctx.executable._validate_jar_java,
+        arguments = [validation_output.path, classes_jar.path] + ctx.attr.expected_class_prefixes,
+    )
+    _validate_maven_deps(sorted(ctx.attr.included_dep[MavenInfo].transitive_maven_direct_deps.to_list()), ctx.attr.banned_maven_deps)
+
+    # update the aar with the new classes.jar
+    add_or_update_file_in_zip(
+        ctx,
+        ctx.attr.name + "_classes",
+        src = current_aar,
+        out = ctx.outputs.aar,
+        update_src = classes_jar,
+        update_path = "classes.jar",
+    )
+
+    # produce src jar
+    combine_jars(
+        ctx = ctx,
+        input_jars_deps = ctx.attr.included_dep[MavenInfo].transitive_included_src_jars,
+        output = ctx.outputs.src_jar,
+    )
+
+    return [
+        ctx.attr.included_dep[MavenInfo],
+        MavenFilesInfo(runtime = ctx.outputs.aar, src_jar = ctx.outputs.src_jar, validation = validation_output),
+        OutputGroupInfo(_validation = depset([validation_output])),
+    ]
+
+def _validate_maven_deps(maven_deps, banned_dep_patterns):
+    for banned_dep_pattern in banned_dep_patterns:
+        for dep in maven_deps:
+            if banned_dep_pattern in dep:
+                fail("%s is not an allowed dependency" % dep)
+
+axt_android_aar = rule(
+    implementation = _android_aar_impl,
+    attrs = {
+        "included_dep": attr.label(
+            doc = "The android_library target to use as a basis for the android archive. " +
+                  "This must include an AndroidManifest.xml, and optionally resources, proguard_specs",
+            mandatory = True,
+            providers = [JavaInfo, AndroidLibraryAarInfo],
+            aspects = [collect_maven_info],
+        ),
+        "expected_class_prefixes": attr.string_list(
+            doc = "The list of class prefixes expected to be containing in resulting .aar. All classes in aar must match at least one of the given prefixes.",
+            mandatory = True,
+        ),
+        "jarjar_rule": attr.label(
+            doc = "Optional file containing jarjar rules to be applied to the classes.",
+            mandatory = False,
+            allow_single_file = [".txt"],
+        ),
+        "banned_maven_deps": attr.string_list(
+            doc = ("List of strings that specify the set of disallowed maven dependencies. The " +
+                   "rule will fail if any maven dependency contains one or more of these strings."),
+            default = ["com.google.guava:guava", "com.google.dagger"],
+        ),
+        "_jdk": attr.label(
+            default = Label("@bazel_tools//tools/jdk"),
+            providers = [java_common.JavaRuntimeInfo],
+        ),
+        "_combine_jars_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner"),
+        ),
+        "_validate_jar_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_validator/java/androidx/test/tools/jarvalidator"),
+        ),
+        "_jarjar": attr.label(
+            default = Label("//build_extensions/maven:jarjar_bin"),
+            executable = True,
+            cfg = "exec",
+        ),
+    },
+    outputs = {
+        "aar": "%{name}.aar",
+        "src_jar": "%{name}-src.jar",
+        # TODO: remove, this shouldn't be necessary
+        "validation": "%{name}.validation",
+    },
+)
diff --git a/build_extensions/maven/axt_maven_apk.bzl b/build_extensions/maven/axt_maven_apk.bzl
new file mode 100644
index 000000000..4232539d5
--- /dev/null
+++ b/build_extensions/maven/axt_maven_apk.bzl
@@ -0,0 +1,40 @@
+"""Generate AXT android archive (aar)."""
+
+load("@build_bazel_rules_android//providers:providers.bzl", "ApkInfo")
+load("@rules_java//java:defs.bzl", "JavaInfo")
+load("//build_extensions/maven:combine_jars.bzl", "combine_jars")
+load("//build_extensions/maven:maven_info.bzl", "MavenFilesInfo", "MavenInfo", "collect_maven_apk_info")
+
+def _axt_maven_apk_impl(ctx):
+    # produce src jar
+    combine_jars(
+        ctx = ctx,
+        input_jars_deps = ctx.attr.included_dep[MavenInfo].transitive_included_src_jars,
+        output = ctx.outputs.src_jar,
+    )
+
+    return [
+        ctx.attr.included_dep[MavenInfo],
+        MavenFilesInfo(runtime = ctx.attr.included_dep[ApkInfo].signed_apk, src_jar = ctx.outputs.src_jar, validation = None),
+    ]
+
+axt_maven_apk = rule(
+    implementation = _axt_maven_apk_impl,
+    attrs = {
+        "included_dep": attr.label(
+            doc = "The android_binary to publish",
+            mandatory = True,
+            providers = [JavaInfo, ApkInfo],
+            aspects = [collect_maven_apk_info],
+        ),
+        "_combine_jars_java": attr.label(
+            executable = True,
+            cfg = "exec",
+            allow_files = True,
+            default = Label("//build_extensions/jar_combiner/java/androidx/test/tools/jarcombiner"),
+        ),
+    },
+    outputs = {
+        "src_jar": "%{name}-src.jar",
+    },
+)
diff --git a/build_extensions/maven/combine_jars.bzl b/build_extensions/maven/combine_jars.bzl
new file mode 100644
index 000000000..00b934f94
--- /dev/null
+++ b/build_extensions/maven/combine_jars.bzl
@@ -0,0 +1,28 @@
+"""Combines multiple jars into one jar."""
+
+def combine_jars(ctx, input_jars_deps, output):
+    """Combine several jars into a single jar.
+
+    Bazel wrapper for build_extensions/jar_combiner.
+
+    Args:
+      ctx: the rule context
+      input_jars_deps: depset of input jars
+      output: the output file path to use
+    """
+    if not input_jars_deps:
+        fail("must provide at least one input_jar")
+    if not output:
+        fail("must provide output file")
+
+    args = ctx.actions.args()
+    args.add(output)
+    args.add_all(input_jars_deps)
+
+    ctx.actions.run(
+        executable = ctx.executable._combine_jars_java,
+        mnemonic = "AndroidxTestCombineJars",
+        inputs = input_jars_deps,
+        arguments = [args],
+        outputs = [output],
+    )
diff --git a/build_extensions/maven/jarjar.bzl b/build_extensions/maven/jarjar.bzl
new file mode 100644
index 000000000..3adeb565a
--- /dev/null
+++ b/build_extensions/maven/jarjar.bzl
@@ -0,0 +1,58 @@
+"""Runs jarjar over a jar file."""
+
+load("@rules_java//java:defs.bzl", "java_common")
+
+def jarjar_rule(ctx, rule, src, out):
+    """API to run jarjar from a rule.
+
+    See https://github.com/pantsbuild/jarjar.
+
+    Args:
+      ctx: the context
+      rule: a text file containing the list of jarjar transforms to apply
+      src: The input jar
+      out: The output jar.
+
+    """
+    args = ctx.actions.args()
+    args.add("process")
+    args.add(rule)
+    args.add(src)
+    args.add(out)
+
+    ctx.actions.run(
+        executable = ctx.executable._jarjar,
+        inputs = [rule, src],
+        outputs = [out],
+        arguments = [args],
+        mnemonic = "JarJar",
+    )
+
+def _jarjar_impl(ctx):
+    jarjar_rule(ctx, ctx.file.rule, ctx.file.src, ctx.outputs.jar)
+
+jarjar = rule(
+    implementation = _jarjar_impl,
+    attrs = {
+        "src": attr.label(
+            doc = "Jar file to transform",
+            allow_single_file = [".jar"],
+        ),
+        "rule": attr.label(
+            doc = "File containing jarjar rules to be applied to the classes.",
+            allow_single_file = [".txt"],
+        ),
+        "_jdk": attr.label(
+            default = Label("@bazel_tools//tools/jdk"),
+            providers = [java_common.JavaRuntimeInfo],
+        ),
+        "_jarjar": attr.label(
+            default = Label("//build_extensions/maven:jarjar_bin"),
+            executable = True,
+            cfg = "exec",
+        ),
+    },
+    outputs = {
+        "jar": "%{name}.jar",
+    },
+)
diff --git a/build_extensions/maven/kotlin_info.bzl b/build_extensions/maven/kotlin_info.bzl
new file mode 100644
index 000000000..f7e0a4141
--- /dev/null
+++ b/build_extensions/maven/kotlin_info.bzl
@@ -0,0 +1,6 @@
+"""Utility for determing if given target is a kotlin target"""
+
+load("@io_bazel_rules_kotlin//kotlin/internal:defs.bzl", "KtJvmInfo")
+
+def is_kotlin(target):
+    return KtJvmInfo in target
diff --git a/build_extensions/maven/maven_artifact.bzl b/build_extensions/maven/maven_artifact.bzl
new file mode 100644
index 000000000..8a55f9f96
--- /dev/null
+++ b/build_extensions/maven/maven_artifact.bzl
@@ -0,0 +1,272 @@
+"""Skylark rule to create a maven repository from a single artifact."""
+
+load("//build_extensions/maven:maven_info.bzl", "MavenFilesInfo", "MavenInfo")
+
+_pom_tmpl = "\n".join([
+    '<?xml version="1.0" encoding="UTF-8"?>',
+    '<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"',
+    '    xmlns="http://maven.apache.org/POM/4.0.0"',
+    '    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">',
+    "  <modelVersion>4.0.0</modelVersion>",
+    "  <groupId>{group_id}</groupId>",
+    "  <artifactId>{artifact_id}</artifactId>",
+    "  <version>{version}</version>",
+    "  <packaging>{packaging}</packaging>",
+    "  <name>AndroidX Test Library</name>",
+    "  <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>",
+    "  <url>https://developer.android.com/testing</url>",
+    "  <inceptionYear>2015</inceptionYear>",
+    "  <licenses>",
+    "{licenses}",
+    "  </licenses>",
+    "  <developers>",
+    "    <developer>",
+    "      <name>The Android Open Source Project</name>",
+    "    </developer>",
+    "  </developers>",
+    "  <dependencies>",
+    "{dependencies}",
+    "  </dependencies>",
+    "</project>",
+    "",
+])
+
+_dependency_tmpl = "\n".join([
+    "    <dependency>",
+    "      <groupId>{group_id}</groupId>",
+    "      <artifactId>{artifact_id}</artifactId>",
+    "      <version>{version}</version>",
+    "      <scope>compile</scope>",
+    "{exclusions}",
+    "    </dependency>",
+])
+
+_exclusions_tmpl = "\n".join([
+    "      <exclusions>",
+    "{exclusion}",
+    "      </exclusions>",
+])
+
+_exclusion_tmpl = "\n".join([
+    "          <exclusion>",
+    "              <groupId>{groupId}</groupId>",
+    "              <artifactId>{artifactId}</artifactId>",
+    "          </exclusion>",
+    "",
+])
+
+_metadata_tmpl = "\n".join([
+    '<?xml version="1.0" encoding="UTF-8"?>',
+    "<metadata>",
+    "  <groupId>{group_id}</groupId>",
+    "  <artifactId>{artifact_id}</artifactId>",
+    "  <version>{version}</version>",
+    "  <versioning>",
+    "    <release>{version}</release>",
+    "    <versions>",
+    "      <version>{version}</version>",
+    "    </versions>",
+    "  <lastUpdated>{last_updated}</lastUpdated>",
+    "  </versioning>",
+    "</metadata>",
+    "",
+])
+
+_license_impl = "\n".join([
+    "    <license>",
+    "      <name>{name}</name>",
+    "      <url>{url}</url>",
+    "      <distribution>repo</distribution>",
+    "    </license>",
+])
+
+def _packaging_type(f):
+    """Returns the packaging type used by the file f."""
+    if f.basename.endswith(".aar"):
+        return "aar"
+    elif f.basename.endswith(".apk"):
+        return "apk"
+    elif f.basename.endswith(".jar"):
+        return "jar"
+    fail("Artifact has unknown packaging type: %s" % f.short_path)
+
+def _create_pom_string(
+        ctx,
+        group_id,
+        artifact_id,
+        version,
+        packaging_type,
+        maven_dependencies,
+        maven_dependencies_exclusions = {}):
+    """Returns the contents of the pom file as a string."""
+    dependencies = []
+    for dep in maven_dependencies:
+        dep_group_id, dep_artifact_id, dep_version = _parse_artifact_versioning(dep)
+        exclusions_string = _create_exclusions_string(dep_group_id, dep_artifact_id, maven_dependencies_exclusions)
+        dependencies.append(_dependency_tmpl.format(
+            group_id = dep_group_id,
+            artifact_id = dep_artifact_id,
+            version = dep_version,
+            exclusions = exclusions_string,
+        ))
+
+    licenses = []
+    if ctx.attr.license_name and ctx.attr.license_url:
+        licenses.append(_license_impl.format(
+            name = ctx.attr.license_name,
+            url = ctx.attr.license_url,
+        ))
+    else:
+        licenses.append(_license_impl.format(
+            name = "The Apache Software License, Version 2.0",
+            url = "http://www.apache.org/licenses/LICENSE-2.0.txt",
+        ))
+
+    return _pom_tmpl.format(
+        group_id = group_id,
+        artifact_id = artifact_id,
+        version = version,
+        packaging = packaging_type,
+        dependencies = "\n".join(dependencies),
+        licenses = "\n".join(licenses),
+    )
+
+def _create_metadata_string(ctx, group_id, artifact_id, version):
+    """Returns the string contents of maven-metadata.xml for the group."""
+    return _metadata_tmpl.format(
+        group_id = group_id,
+        artifact_id = artifact_id,
+        version = version,
+        last_updated = ctx.attr.last_updated,
+    )
+
+def _create_exclusions_string(group_id, artifact_id, excluded_dependencies_map):
+    """Returns the string contents of excluded dependencies for the dependency."""
+    excluded_dependencies_csv = excluded_dependencies_map.get("%s:%s" % (group_id, artifact_id))
+    if not excluded_dependencies_csv:
+        return ""
+    excluded_dependencies = excluded_dependencies_csv.split(",")
+    excluded_dependencies_string = ""
+    for excluded_dependency in excluded_dependencies:
+        excluded_group, excluded_artifact = _parse_group_artifact(excluded_dependency)
+        excluded_dependencies_string += _exclusion_tmpl.format(
+            groupId = excluded_group,
+            artifactId = excluded_artifact,
+        )
+    return _exclusions_tmpl.format(exclusion = excluded_dependencies_string)
+
+def _parse_artifact_versioning(artifact_coordinates):
+    """Parse out artifact_id, version and group info from a full coordinate strings.
+
+    Expected format groupId:artifactId:[type:]version
+    """
+    segments = artifact_coordinates.split(":")
+    if len(segments) == 3:
+        return segments
+    elif len(segments) == 4:
+        return segments[0], segments[1], segments[3]
+
+    fail("artifact_deps values must be of form: groupId:artifactId:[type:]version. Found %s" % artifact_coordinates)
+
+def _parse_group_artifact(artifact_coordinates):
+    """Parse out artifact_id, and group info from a  coordinate string"""
+    if artifact_coordinates.count(":") != 1:
+        fail("artifact_deps values must be of form: groupId:artifactId. Found %s" % artifact_coordinates)
+
+    return artifact_coordinates.split(":")
+
+def _rename_artifact(ctx, tpl_string, src_file, packaging_type, artifact_id, version):
+    """Rename the artifact to match maven naming conventions."""
+    artifact = ctx.actions.declare_file(tpl_string % (artifact_id, version, packaging_type))
+    ctx.actions.run_shell(
+        inputs = [src_file],
+        outputs = [artifact],
+        command = "cp %s %s" % (src_file.path, artifact.path),
+        mnemonic = "AndroidxMavenArtifactRename",
+    )
+    return artifact
+
+def _maven_artifact_impl(ctx):
+    """Generates maven repository for a single artifact."""
+
+    group_id, artifact_id, version = _parse_artifact_versioning(ctx.attr.target[MavenInfo].artifact)
+    pom = ctx.actions.declare_file(
+        "%s-%s.pom" % (artifact_id, version),
+    )
+
+    maven_deps = sorted(ctx.attr.target[MavenInfo].transitive_maven_direct_deps.to_list())
+
+    packaging_type = _packaging_type(ctx.attr.target[MavenFilesInfo].runtime)
+    pom_content = _create_pom_string(ctx, group_id, artifact_id, version, packaging_type, maven_deps, ctx.attr.excluded_dependencies)
+    ctx.actions.write(output = pom, content = pom_content)
+
+    metadata = ctx.actions.declare_file("%s_maven-metadata.xml" % (ctx.label.name))
+    ctx.actions.write(output = metadata, content = _create_metadata_string(ctx, group_id, artifact_id, version))
+
+    # Rename binary artifact to artifact_id-version.packaging_type
+    artifact = _rename_artifact(ctx, "%s-%s.%s", ctx.attr.target[MavenFilesInfo].runtime, packaging_type, artifact_id, version)
+
+    arguments = [
+        "--group_path=%s" % group_id.replace(".", "/"),
+        "--artifact_id=%s" % artifact_id,
+        "--version=%s" % version,
+        "--artifact=%s" % artifact.path,
+        "--pom=%s" % pom.path,
+        "--metadata=%s" % metadata.path,
+        "--output=%s" % ctx.outputs.m2repository.path,
+    ]
+    inputs = [pom, metadata, artifact]
+
+    if ctx.attr.target[MavenFilesInfo].src_jar:
+        # Rename sources jar artifact to artifact_id-version-sources.jar
+        source = _rename_artifact(ctx, "%s-%s-sources.%s", ctx.attr.target[MavenFilesInfo].src_jar, "jar", artifact_id, version)
+        arguments.append("--source=%s" % source.path)
+        inputs.append(source)
+
+    # TODO: remove, shouldn't be necessary
+    # add validation to inputs so it runs on rebuild
+    if ctx.attr.target[MavenFilesInfo].validation:
+        inputs.append(ctx.attr.target[MavenFilesInfo].validation)
+
+    ctx.actions.run(
+        inputs = inputs,
+        outputs = [ctx.outputs.m2repository],
+        arguments = arguments,
+        executable = ctx.executable._maven_artifact_sh,
+        progress_message = (
+            "Packaging repository: %s" % ctx.outputs.m2repository.short_path
+        ),
+        mnemonic = "AndroidxMavenRepositoryGen",
+    )
+
+maven_artifact = rule(
+    implementation = _maven_artifact_impl,
+    attrs = {
+        "target": attr.label(
+            doc = "The target to be published to maven. Must be a axt_android_aar or axt_android_apk",
+            mandatory = True,
+            providers = [MavenInfo, MavenFilesInfo],
+        ),
+        # TODO: derive this?
+        "last_updated": attr.string(mandatory = True),
+        "license_file": attr.label(
+            mandatory = False,
+            allow_single_file = ["LICENSE"],
+        ),
+        "license_name": attr.string(mandatory = False),
+        "license_url": attr.string(mandatory = False),
+        "excluded_dependencies": attr.string_dict(
+            mandatory = False,
+            doc = "Map of maven dependency to a csv list of excluded dependencies. eg {\"com.google.foo:foo\":\"com.google.bar:bar,com.google.bar:bar-none\"}",
+        ),
+        "_maven_artifact_sh": attr.label(
+            default = Label("//build_extensions/maven:maven_artifact_sh"),
+            executable = True,
+            allow_files = True,
+            cfg = "exec",
+        ),
+    },
+    outputs = {
+        "m2repository": "%{name}.zip",
+    },
+)
diff --git a/build_extensions/maven_artifact.sh b/build_extensions/maven/maven_artifact.sh
similarity index 92%
rename from build_extensions/maven_artifact.sh
rename to build_extensions/maven/maven_artifact.sh
index 33342ce20..a024120d0 100755
--- a/build_extensions/maven_artifact.sh
+++ b/build_extensions/maven/maven_artifact.sh
@@ -63,8 +63,8 @@ do
 done
 set -- "${POSITIONAL[@]}" # restore positional parameters in case we need that
 
-out_tmp="$(mktemp -d --suffix=_repo)"
-dirname="m2repository"
+out_tmp="$(mktemp -d )"
+dirname="repository"
 repo="$out_tmp/$dirname"
 
 
@@ -74,8 +74,10 @@ cp "$FLAGS_metadata" "$repo/$FLAGS_group_path/$FLAGS_artifact_id/"
 cp "$FLAGS_pom" "$repo/$FLAGS_group_path/$FLAGS_artifact_id/$FLAGS_version/"
 cp "$FLAGS_artifact" \
     "$repo/$FLAGS_group_path/$FLAGS_artifact_id/$FLAGS_version/"
-cp "$FLAGS_source" \
-    "$repo/$FLAGS_group_path/$FLAGS_artifact_id/$FLAGS_version/"
+if [ ! -z "$FLAGS_source" ]; then
+  cp "$FLAGS_source" \
+      "$repo/$FLAGS_group_path/$FLAGS_artifact_id/$FLAGS_version/"
+fi
 
 for file in $(find "$repo" -type f); do
   echo -n "$(sha1sum "$file" | cut -f 1 -d ' ')" > "$file.sha1"
diff --git a/build_extensions/maven/maven_info.bzl b/build_extensions/maven/maven_info.bzl
new file mode 100644
index 000000000..f26849306
--- /dev/null
+++ b/build_extensions/maven/maven_info.bzl
@@ -0,0 +1,210 @@
+# Copyright 2023 The Android Open Source Project. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+"""Starlark rules to collect Maven artifacts information.
+"""
+
+load("@rules_java//java:defs.bzl", "JavaInfo")
+load("//build_extensions:axt_deps_versions.bzl", "KOTLIN_VERSION")
+load("//build_extensions/maven:kotlin_info.bzl", "is_kotlin")
+load("//build_extensions/maven:maven_registry.bzl", "get_artifact_from_label", "get_maven_apk_deps", "is_axt_label", "is_shaded_from_label")
+
+# logic here largely inspired from https://github.com/google/dagger/blob/master/tools/maven_info.bzl
+
+# provider for the built maven files to be published
+MavenFilesInfo = provider(
+    fields = {
+        "runtime": """
+        The runtime artifact. Either a .jar, .aar or .apk
+        """,
+        "src_jar": """
+        The jar of source files
+        """,
+        "validation": """
+        The validation output file
+        """,
+    },
+)
+
+# provider for info on building the maven artifacts and its related dependency info
+MavenInfo = provider(
+    fields = {
+        "artifact": """
+        The Maven coordinate for the artifact that is exported by this target. Can only be null if is_compileonly or is_shaded are True.
+        """,
+        "is_compileOnly": """
+        True if this target is a compile only dependency, and should not be included in final combined artifact.
+        """,
+        "is_shaded": """
+        True if this is a shaded dependency and it should be directly bundled inside the final artifact.
+        """,
+        "transitive_included_runtime_jars": """
+        depset of jars to bundle into same artifact.
+        """,
+        "transitive_included_src_jars": """
+        depset of src jars to bundle into same artifact.
+        """,
+        "transitive_maven_direct_deps": """
+        depset of external maven artifacts that are a direct dependency of this artifact.
+        """,
+    },
+)
+
+MAVEN_COORDINATES_PREFIX = "maven_coordinates="
+
+def _collect_maven_info_impl(target, ctx):
+    tags = getattr(ctx.rule.attr, "tags", [])
+    neverlink = getattr(ctx.rule.attr, "neverlink", False)
+    deps = getattr(ctx.rule.attr, "deps", [])
+    exports = getattr(ctx.rule.attr, "exports", [])
+
+    # ignore non-runtime or non-java dependencies eg proto_library
+    if neverlink or JavaInfo not in target:
+        return MavenInfo(
+            artifact = None,
+            is_compileOnly = True,
+            is_shaded = False,
+            transitive_included_runtime_jars = depset(),
+            transitive_included_src_jars = depset(),
+            transitive_maven_direct_deps = depset(),
+        )
+
+    artifact = get_artifact_from_label(target.label)
+    is_shaded = is_shaded_from_label(target.label)
+
+    if not artifact and not is_shaded:
+        for tag in tags:
+            if tag.startswith(MAVEN_COORDINATES_PREFIX):
+                if artifact:
+                    fail("%s: Each target must belong to one and only one maven artifact: Does target have multiple '%s' tags?" % (target.label, MAVEN_COORDINATES_PREFIX))
+                artifact = tag[len(MAVEN_COORDINATES_PREFIX):]
+
+    included_runtime_jars = []
+    included_runtime_jars += target[JavaInfo].runtime_output_jars
+
+    # shaded source won't be correct, so just exclude it
+    included_src_jars = [] if is_shaded else target[JavaInfo].source_jars
+    transitive_included_runtime_jars = []
+    transitive_included_src_jars = []
+    maven_direct_deps = []
+    transitive_maven_direct_deps = []
+
+    # add implicit runtime dependencies needed by certain rules
+    if is_kotlin(target):
+        maven_direct_deps.append("org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION)
+
+    grpc_protobuf_jar = _findGrpcJavaProtoJar(target)
+    if grpc_protobuf_jar:
+        # java_grpc_library rule's generated code implicitly depends on this artifact
+        # which needs to be shaded
+        included_runtime_jars.append(grpc_protobuf_jar)
+
+    # this is a bit of a hack, but java_lite_proto_library have empty runtime_output_jars!
+    # So add in all transitive_runtime_jars instead, because we know for protos all dependencies must
+    # be embedded in resulting aar
+    if _isJavaProtoTarget((deps + exports)):
+        included_runtime_jars = target[JavaInfo].transitive_runtime_jars.to_list()
+
+    for dep in (deps + exports):
+        if is_shaded:
+            transitive_included_runtime_jars.append(dep[MavenInfo].transitive_included_runtime_jars)
+        if dep[MavenInfo].artifact == artifact:
+            transitive_included_runtime_jars.append(dep[MavenInfo].transitive_included_runtime_jars)
+            transitive_included_src_jars.append(dep[MavenInfo].transitive_included_src_jars)
+
+            # also need to pick up any external maven deps from this included dep
+            transitive_maven_direct_deps.append(dep[MavenInfo].transitive_maven_direct_deps)
+        elif dep[MavenInfo].is_shaded:
+            transitive_included_runtime_jars.append(dep[MavenInfo].transitive_included_runtime_jars)
+        elif dep[MavenInfo].artifact:
+            # this dependency is an external maven artifact, just need to add it to direct deps
+            maven_direct_deps.append(dep[MavenInfo].artifact)
+        elif not dep[MavenInfo].is_compileOnly and not dep[MavenInfo].is_shaded:
+            fail("%s: Each target must belong to one and only one maven artifact: Did not find maven info for dep %s" % (target.label, dep.label))
+
+    return [MavenInfo(
+        artifact = artifact,
+        is_compileOnly = False,
+        is_shaded = is_shaded,
+        transitive_included_runtime_jars = depset(included_runtime_jars, transitive = transitive_included_runtime_jars),
+        transitive_included_src_jars = depset(included_src_jars, transitive = transitive_included_src_jars),
+        transitive_maven_direct_deps = depset(maven_direct_deps, transitive = transitive_maven_direct_deps),
+    )]
+
+def _isJavaProtoTarget(all_deps):
+    for dep in all_deps:
+        if ProtoInfo in dep:
+            return True
+    return False
+
+def _findGrpcJavaProtoJar(target):
+    for jar in target[JavaInfo].transitive_runtime_jars.to_list():
+        if "grpc-java/protobuf-lite" in jar.path:
+            return jar
+    return None
+
+collect_maven_info = aspect(
+    attr_aspects = [
+        "deps",
+        "exports",
+    ],
+    doc = """
+    Collects the Maven information for targets, their dependencies, and their transitive exports.
+    """,
+    implementation = _collect_maven_info_impl,
+)
+
+def _collect_maven_apk_info_impl(target, ctx):
+    neverlink = getattr(ctx.rule.attr, "neverlink", False)
+    deps = getattr(ctx.rule.attr, "deps", [])
+    exports = getattr(ctx.rule.attr, "exports", [])
+
+    # ignore non-runtime or non-java dependencies eg proto_library or non-axt-labels
+    if neverlink or JavaInfo not in target or not is_axt_label(target.label):
+        return MavenInfo(
+            artifact = None,
+            is_compileOnly = True,
+            is_shaded = False,
+            transitive_included_runtime_jars = depset(),
+            transitive_included_src_jars = depset(),
+            transitive_maven_direct_deps = depset(),
+        )
+
+    artifact = get_artifact_from_label(target.label)
+    included_src_jars = target[JavaInfo].source_jars
+    transitive_included_src_jars = []
+
+    for dep in (deps + exports):
+        transitive_included_src_jars.append(dep[MavenInfo].transitive_included_src_jars)
+
+    maven_deps = get_maven_apk_deps(artifact)
+    return [MavenInfo(
+        artifact = artifact,
+        is_compileOnly = False,
+        is_shaded = False,
+        transitive_included_runtime_jars = depset(),
+        transitive_included_src_jars = depset(included_src_jars, transitive = transitive_included_src_jars),
+        transitive_maven_direct_deps = depset(maven_deps),
+    )]
+
+collect_maven_apk_info = aspect(
+    attr_aspects = [
+        "deps",
+        "exports",
+    ],
+    doc = """
+    Collects the Maven apk information for targets, their dependencies, and their transitive exports.
+    """,
+    implementation = _collect_maven_apk_info_impl,
+)
diff --git a/build_extensions/maven/maven_registry.bzl b/build_extensions/maven/maven_registry.bzl
new file mode 100644
index 000000000..01c7d5f27
--- /dev/null
+++ b/build_extensions/maven/maven_registry.bzl
@@ -0,0 +1,127 @@
+"""Defines maven artifact definitions"""
+
+load(
+    "//build_extensions:axt_deps_versions.bzl",
+    "GRPC_VERSION",
+)
+load(
+    "//build_extensions:axt_versions.bzl",
+    "ANDROIDX_JUNIT_VERSION",
+    "ANDROIDX_TRUTH_VERSION",
+    "CORE_VERSION",
+    "ESPRESSO_DEVICE_VERSION",
+    "ESPRESSO_VERSION",
+    "MONITOR_VERSION",
+    "ORCHESTRATOR_VERSION",
+    "RULES_VERSION",
+    "RUNNER_VERSION",
+    "SERVICES_VERSION",
+)
+
+# map of target path prefixes to maven artifact.
+# This map is based on the androidx.test architecture principle that there is one and only one maven artifact for all targets
+# under a given directory. Or in other words, that code in this repo is organized according to which
+# maven artifact it belongs to.
+_TARGET_TO_MAVEN_ARTIFACT = {
+    "//runner/android_junit_runner/java/": "androidx.test:runner:%s" % RUNNER_VERSION,
+    "//runner/rules/java/": "androidx.test:rules:%s" % RULES_VERSION,
+    "//runner/rules:rules": "androidx.test:rules:%s" % RULES_VERSION,
+    "//runner/monitor/java/": "androidx.test:monitor:%s" % MONITOR_VERSION,
+    "//runner/monitor:monitor": "androidx.test:monitor:%s" % MONITOR_VERSION,
+    "//core/java/": "androidx.test:core:%s" % CORE_VERSION,
+    "//ktx/core/java/": "androidx.test:core-ktx:%s" % CORE_VERSION,
+    "//espresso/accessibility/java/": "androidx.test.espresso:espresso-accessibility:%s" % ESPRESSO_VERSION,
+    "//espresso/contrib/java/": "androidx.test.espresso:espresso-contrib:%s" % ESPRESSO_VERSION,
+    "//espresso/core/java/": "androidx.test.espresso:espresso-core:%s" % ESPRESSO_VERSION,
+    "//espresso/device/java/": "androidx.test.espresso:espresso-device:%s" % ESPRESSO_DEVICE_VERSION,
+    "//espresso/idling_resource/java/": "androidx.test.espresso:espresso-idling-resource:%s" % ESPRESSO_VERSION,
+    "//espresso/idling_resource/concurrent/java/": "androidx.test.espresso.idling:idling-concurrent:%s" % ESPRESSO_VERSION,
+    "//espresso/idling_resource/net/java/": "androidx.test.espresso.idling:idling-net:%s" % ESPRESSO_VERSION,
+    "//espresso/intents/java/": "androidx.test.espresso:espresso-intents:%s" % ESPRESSO_VERSION,
+    "//espresso/remote/java/": "androidx.test.espresso:espresso-remote:%s" % ESPRESSO_VERSION,
+    "//espresso/web/java/": "androidx.test.espresso:espresso-web:%s" % ESPRESSO_VERSION,
+    "//ext/junit/java/": "androidx.test.ext:junit:%s" % ANDROIDX_JUNIT_VERSION,
+    "//ktx/ext/junit/java/": "androidx.test.ext:junit-ktx:%s" % ANDROIDX_JUNIT_VERSION,
+    "//ext/truth/java/": "androidx.test.ext:truth:%s" % ANDROIDX_TRUTH_VERSION,
+    "//services/storage/java/": "androidx.test.services:storage:%s" % SERVICES_VERSION,
+
+    # services/events/java gets built into both androidx.test.runner as well as orchestrator v2
+    "//services/events/java/": "androidx.test:runner:%s" % RUNNER_VERSION,
+    "//services:test_services": "androidx.test.services:test-services:%s" % SERVICES_VERSION,
+    "//runner/android_test_orchestrator/stubapp:stubapp": "androidx.test:orchestrator:%s" % ORCHESTRATOR_VERSION,
+
+    # map gRPC deps introduced by bazel grpc rules
+    "@@grpc-java~//okhttp:okhttp": "io.grpc:grpc-okhttp:%s" % GRPC_VERSION,
+    "@@grpc-java~//api": "io.grpc:grpc-api:%s" % GRPC_VERSION,
+    "@@grpc-java~//core": "io.grpc:grpc-core:%s" % GRPC_VERSION,
+    "@@grpc-java~//context": "io.grpc:grpc-context:%s" % GRPC_VERSION,
+    "@@grpc-java~//util": "io.grpc:grpc-util:%s" % GRPC_VERSION,
+    "@@grpc-java~//stub": "io.grpc:grpc-stub:%s" % GRPC_VERSION,
+}
+
+_SHADED_TARGETS = [
+    "@com_google_protobuf//:protobuf_javalite",
+    "@@protobuf~//java/core:lite",
+    "//opensource/proto:any_java_proto_lite",
+    "@com_google_protobuf//:any_proto",
+    "//opensource/dagger:dagger",
+    "@com_google_protobuf_protobuf_javalite//:com_google_protobuf_protobuf_javalite",
+    # emulator controller proto for bazel gets embedded inside espresso-device
+    "//opensource/emulator/proto:emulator_controller_java_grpc",
+    "//opensource/emulator/proto:emulator_controller_java_proto_lite",
+]
+
+# maven apk definitions
+SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION
+ORCHESTRATOR_ARTIFACT = "androidx.test:orchestrator:%s" % ORCHESTRATOR_VERSION
+
+def get_artifact_from_label(label):
+    """Retrieve the maven artifact (if known) from the build label."""
+    label_string = str(label)
+    result = None
+    for path, artifact in _TARGET_TO_MAVEN_ARTIFACT.items():
+        if path in label_string:
+            if result:
+                fail("Found multiple maven artifacts for %s path." % label_string)
+            result = artifact
+
+    return result
+
+def is_axt_label(label):
+    """Determine if given target label is from androidx_test.
+
+    Args:
+      label: the target label
+
+    Returns:
+      True if the label is in a recognized androidx_test maven artifact
+    """
+    label_string = str(label)
+    for path in _TARGET_TO_MAVEN_ARTIFACT.keys():
+        if path in label_string:
+            return True
+
+    # special case the apk source dirs
+    if "//services" in label_string:
+        return True
+    if "//runner/android_test_orchestrator" in label_string:
+        return True
+    return False
+
+def get_maven_apk_deps(artifact):
+    # TODO: don't hardcode this, instead try to obtain from build rule
+    if artifact == ORCHESTRATOR_ARTIFACT:
+        return [SERVICES_APK_ARTIFACT]
+    else:
+        return []
+
+def is_shaded_from_label(label):
+    """Returns true if given target should be shaded.
+
+    A shaded target is one whose classes should be embedded in resulting aar and
+    renamed via jarjar.
+    """
+
+    # bazel mysteriously prefixes a '@' onto //opensource/dagger, sometimes two, so just remove it
+    string_label = str(label).replace("@//", "//").replace("@//", "//")
+    return string_label in _SHADED_TARGETS
diff --git a/build_extensions/maven/maven_repo.bzl b/build_extensions/maven/maven_repo.bzl
new file mode 100644
index 000000000..4c39be9cb
--- /dev/null
+++ b/build_extensions/maven/maven_repo.bzl
@@ -0,0 +1,39 @@
+"""Starlark rule to create a single maven repository zip from a set of zips of each artifact."""
+
+def _maven_repository_impl(ctx):
+    """Merges several maven artifacts into combined zip."""
+
+    source_files = []
+    for src in ctx.attr.srcs:
+        source_files.extend(src.files.to_list())
+
+    args = ctx.actions.args()
+    args.add(ctx.outputs.m2repository.path)
+    args.add_all([f.path for f in source_files])
+
+    ctx.actions.run(
+        inputs = source_files,
+        outputs = [ctx.outputs.m2repository],
+        mnemonic = "MavenRepository",
+        arguments = [args],
+        executable = ctx.executable._zip_combiner,
+        progress_message = (
+            "Packaging repository: %s" % ctx.outputs.m2repository.short_path
+        ),
+    )
+
+maven_repository = rule(
+    implementation = _maven_repository_impl,
+    attrs = {
+        "srcs": attr.label_list(allow_rules = ["maven_artifact"]),
+        "_zip_combiner": attr.label(
+            default = Label("//build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner"),
+            executable = True,
+            allow_files = True,
+            cfg = "exec",
+        ),
+    },
+    outputs = {
+        "m2repository": "%{name}.zip",
+    },
+)
diff --git a/build_extensions/maven/reduce_jar.bzl b/build_extensions/maven/reduce_jar.bzl
new file mode 100644
index 000000000..13b92118d
--- /dev/null
+++ b/build_extensions/maven/reduce_jar.bzl
@@ -0,0 +1,32 @@
+"""Remove entries from a jar that exist in another jar."""
+
+def reduce_jar(ctx, input_jar, overlapping_jar, output_jar):
+    """Remove entries from jar that exist in another jar.
+
+    Bazel wrapper for build_extensions/jar_reducer.
+
+    Args:
+      ctx: the rule context
+      input_jar: the input jar to reduce
+      overlapping_jar: the baseline jar that contains entries to remove
+      output_jar: the produced output
+    """
+    if not input_jar:
+        fail("must provide input_jar")
+    if not output_jar:
+        fail("must provide output file")
+    if not reduce_jar:
+        fail("must provide reduce jar file")
+
+    args = ctx.actions.args()
+    args.add(input_jar)
+    args.add(overlapping_jar)
+    args.add(output_jar)
+
+    ctx.actions.run(
+        executable = ctx.executable._reduce_jar_java,
+        inputs = [input_jar, overlapping_jar],
+        arguments = [args],
+        outputs = [output_jar],
+        mnemonic = "ReduceJar",
+    )
diff --git a/build_extensions/maven_repo.bzl b/build_extensions/maven_repo.bzl
deleted file mode 100644
index 4f79782bb..000000000
--- a/build_extensions/maven_repo.bzl
+++ /dev/null
@@ -1,222 +0,0 @@
-"""Skylark rule to create a maven repository from a single artifact."""
-
-_pom_tmpl = "\n".join([
-    '<?xml version="1.0" encoding="UTF-8"?>',
-    '<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"',
-    '    xmlns="http://maven.apache.org/POM/4.0.0"',
-    '    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">',
-    "  <modelVersion>4.0.0</modelVersion>",
-    "  <groupId>{group_id}</groupId>",
-    "  <artifactId>{artifact_id}</artifactId>",
-    "  <version>{version}</version>",
-    "  <packaging>{packaging}</packaging>",
-    "  <name>AndroidX Test Library</name>",
-    "  <description>The AndroidX Test Library provides an extensive framework for testing Android apps</description>",
-    "  <url>https://developer.android.com/testing</url>",
-    "  <inceptionYear>2015</inceptionYear>",
-    "  <licenses>",
-    "    <license>",
-    "      <name>The Apache Software License, Version 2.0</name>",
-    "      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>",
-    "      <distribution>repo</distribution>",
-    "    </license>",
-    "  </licenses>",
-    "  <developers>",
-    "    <developer>",
-    "      <name>The Android Open Source Project</name>",
-    "    </developer>",
-    "  </developers>",
-    "  <dependencies>",
-    "{dependencies}",
-    "  </dependencies>",
-    "</project>",
-    "",
-])
-
-_dependency_tmpl = "\n".join([
-    "    <dependency>",
-    "      <groupId>{group_id}</groupId>",
-    "      <artifactId>{artifact_id}</artifactId>",
-    "      <version>{version}</version>",
-    "      <scope>compile</scope>",
-    "    </dependency>",
-])
-
-_metadata_tmpl = "\n".join([
-    '<?xml version="1.0" encoding="UTF-8"?>',
-    "<metadata>",
-    "  <groupId>{group_id}</groupId>",
-    "  <artifactId>{artifact_id}</artifactId>",
-    "  <version>{version}</version>",
-    "  <versioning>",
-    "    <release>{version}</release>",
-    "    <versions>",
-    "      <version>{version}</version>",
-    "    </versions>",
-    "  <lastUpdated>{last_updated}</lastUpdated>",
-    "  </versioning>",
-    "</metadata>",
-    "",
-])
-
-def _packaging_type(f):
-    """Returns the packaging type used by the file f."""
-    if f.basename.endswith(".aar"):
-        return "aar"
-    elif f.basename.endswith(".apk"):
-        return "apk"
-    elif f.basename.endswith(".jar"):
-        return "jar"
-    fail("Artifact has unknown packaging type: %s" % f.short_path)
-
-def _create_pom_string(ctx):
-    """Returns the contents of the pom file as a string."""
-    dependencies = []
-    for dep in ctx.attr.artifact_deps:
-        if dep.count(":") != 2:
-            fail("artifact_deps values must be of form: groupId:artifactId:version")
-
-        group_id, artifact_id, version = dep.split(":")
-        dependencies.append(_dependency_tmpl.format(
-            group_id = group_id,
-            artifact_id = artifact_id,
-            version = version,
-        ))
-
-    return _pom_tmpl.format(
-        group_id = ctx.attr.group_id,
-        artifact_id = ctx.attr.artifact_id,
-        version = ctx.attr.version,
-        packaging = _packaging_type(ctx.file.src),
-        dependencies = "\n".join(dependencies),
-    )
-
-def _create_metadata_string(ctx):
-    """Returns the string contents of maven-metadata.xml for the group."""
-    return _metadata_tmpl.format(
-        group_id = ctx.attr.group_id,
-        artifact_id = ctx.attr.artifact_id,
-        version = ctx.attr.version,
-        last_updated = ctx.attr.last_updated,
-    )
-
-def _rename_artifact(ctx, tpl_string, src_file, packaging_type):
-    """Rename the artifact to match maven naming conventions."""
-    artifact = ctx.actions.declare_file(tpl_string % (ctx.attr.artifact_id, ctx.attr.version, packaging_type))
-    ctx.actions.run_shell(
-        inputs = [src_file],
-        outputs = [artifact],
-        command = "cp %s %s" % (src_file.path, artifact.path),
-    )
-    return artifact
-
-def _maven_artifact_impl(ctx):
-    """Generates maven repository for a single artifact."""
-    pom = ctx.actions.declare_file(
-        "%s-%s.pom" % (ctx.attr.artifact_id, ctx.attr.version)
-    )
-    ctx.actions.write(output = pom, content = _create_pom_string(ctx))
-
-    metadata = ctx.actions.declare_file("maven-metadata.xml")
-    ctx.actions.write(output = metadata, content = _create_metadata_string(ctx))
-
-    # Rename binary artifact to artifact_id-version.packaging_type
-    artifact = _rename_artifact(ctx, "%s-%s.%s", ctx.file.src, _packaging_type(ctx.file.src))
-
-    # Rename sources jar artifact to artifact_id-version-sources.jar
-    source = _rename_artifact(ctx, "%s-%s-sources.%s", ctx.file.src_jar, "jar")
-
-    arguments = [
-        "--group_path=%s" % ctx.attr.group_id.replace(".", "/"),
-        "--artifact_id=%s" % ctx.attr.artifact_id,
-        "--version=%s" % ctx.attr.version,
-        "--artifact=%s" % artifact.path,
-        "--source=%s" % source.path,
-        "--pom=%s" % pom.path,
-        "--metadata=%s" % metadata.path,
-        "--output=%s" % ctx.outputs.m2repository.path,
-    ]
-
-    inputs = [pom, metadata, artifact, source]
-
-    if ctx.file.javadoc_jar != None:
-        # Rename javadoc jar artifact to artifact_id-version-javadoc.jar
-        javadoc = _rename_artifact(ctx, "%s-%s-javadoc.%s", ctx.file.javadoc_jar, "jar")
-        arguments.append("--javadoc=%s" % javadoc.path)
-        inputs.append(javadoc)
-
-    ctx.actions.run(
-        inputs = inputs,
-        outputs = [ctx.outputs.m2repository],
-        arguments = arguments,
-        executable = ctx.executable._maven_artifact,
-        progress_message = (
-            "Packaging repository: %s" % ctx.outputs.m2repository.short_path
-        ),
-    )
-
-def _maven_repository_impl(ctx):
-    """Generates maven repository for multiple artifacts."""
-    source_files = []
-    for src in ctx.attr.srcs:
-        source_files.extend(src.files.to_list())
-    ctx.actions.run(
-        inputs = source_files,
-        outputs = [ctx.outputs.m2repository],
-        arguments = [
-            "--sources=%s" % ",".join([f.path for f in source_files]),
-            "--output=%s" % ctx.outputs.m2repository.path,
-        ],
-        executable = ctx.executable._maven_repository,
-        progress_message = (
-            "Packaging repository: %s" % ctx.outputs.m2repository.short_path
-        ),
-    )
-
-maven_artifact = rule(
-    implementation = _maven_artifact_impl,
-    attrs = {
-        "src": attr.label(
-            mandatory = True,
-            allow_single_file = [".aar", ".jar", ".apk"],
-        ),
-        "src_jar": attr.label(
-            mandatory = True,
-            allow_single_file = [".jar"],
-        ),
-        "javadoc_jar": attr.label(
-            mandatory = False,
-            allow_single_file = [".jar", ".zip"],
-        ),
-        "group_id": attr.string(mandatory = True),
-        "artifact_id": attr.string(mandatory = True),
-        "version": attr.string(mandatory = True),
-        "last_updated": attr.string(mandatory = True),
-        "artifact_deps": attr.string_list(),
-        "_maven_artifact": attr.label(
-            default = Label("//build_extensions:maven_artifact"),
-            executable = True,
-            allow_files = True,
-            cfg = "host",
-        ),
-    },
-    outputs = {
-        "m2repository": "%{name}.zip",
-    },
-)
-
-maven_repository = rule(
-    implementation = _maven_repository_impl,
-    attrs = {
-        "srcs": attr.label_list(allow_rules = ["maven_artifact"]),
-        "_maven_repository": attr.label(
-            default = Label("//build_extensions:maven_repository"),
-            executable = True,
-            allow_files = True,
-            cfg = "host",
-        ),
-    },
-    outputs = {
-        "m2repository": "%{name}.zip",
-    },
-)
\ No newline at end of file
diff --git a/build_extensions/maven_repository.py b/build_extensions/maven_repository.py
deleted file mode 100644
index ad16c9c27..000000000
--- a/build_extensions/maven_repository.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2018 The Android Open Source Project. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Script to package up multiple maven artifacts into a repository."""
-
-import zipfile
-
-from absl import app
-from absl import flags
-
-FLAGS = flags.FLAGS
-
-flags.DEFINE_list('sources', None, 'List of source m2repository files')
-flags.mark_flag_as_required('sources')
-
-flags.DEFINE_string('output', None, 'Output zip file')
-flags.mark_flag_as_required('output')
-
-
-def main(_):
-  output_zip = zipfile.ZipFile(FLAGS.output, 'w', zipfile.ZIP_STORED)
-  for source in FLAGS.sources:
-    source_zip = zipfile.ZipFile(source, 'r')
-    for zip_info in source_zip.infolist():
-      output_zip.writestr(zip_info, source_zip.read(zip_info))
-    source_zip.close()
-  output_zip.close()
-
-
-if __name__ == '__main__':
-  app.run(main)()
diff --git a/build_extensions/phone_devices.bzl b/build_extensions/phone_devices.bzl
new file mode 100644
index 000000000..713a6a415
--- /dev/null
+++ b/build_extensions/phone_devices.bzl
@@ -0,0 +1,28 @@
+"""Defines common device targets for unit tests."""
+
+gmscore_channel = struct(
+    NONE = struct(id = 0, suffix = ""),
+    PREBUILT = struct(id = 1, suffix = ""),
+)
+
+def devices(api_list = None, device_type = "generic_phone", gms_channel = gmscore_channel.NONE, use_slim = False):
+    """Returns target_devices for android_instrumentation_tests.
+
+    Currently unsupported in bazel
+    """
+    return []
+
+def apis(min_api = 15, max_api = 10000, exclude_apis = []):
+    """Returns a list of api level ints filtered by input parameters.
+
+    Currently unsupported in bazel
+
+    Args:
+      min_api: int: the minimum android api level to return. Default 15
+      max_api: int: the maximum android api level to return. Default 10000
+      exclude_apis: int list: list of api levels to exclude. Default: empty
+
+    Returns:
+      the list of api ints
+    """
+    return []
diff --git a/build_extensions/register_extension_info.bzl b/build_extensions/register_extension_info.bzl
new file mode 100644
index 000000000..6171ebf8c
--- /dev/null
+++ b/build_extensions/register_extension_info.bzl
@@ -0,0 +1,2 @@
+def register_extension_info(extension, label_regex_for_dep = None):
+    """Stub definition for unsupported in bazel register_extension_info feature."""
diff --git a/build_extensions/release.bzl b/build_extensions/release.bzl
deleted file mode 100644
index 622d75132..000000000
--- a/build_extensions/release.bzl
+++ /dev/null
@@ -1,134 +0,0 @@
-"""Generate AXT release artifacts."""
-
-load("//build_extensions:remove_from_jar.bzl", "remove_from_jar")
-load("//build_extensions:add_or_update_file_in_zip.bzl", "add_or_update_file_in_zip")
-
-def axt_release_lib(
-    name,
-    deps,
-    custom_package = None,
-    proguard_specs = None,
-    proguard_library = None,
-    multidex = "off",
-    jarjar_rules = "//build_extensions:noJarJarRules.txt",
-    keep_spec = None,
-    remove_spec = None,
-    overlapping_jars = [],
-    resource_files = None,
-    visibility = None):
-  """Generates release artifacts for a AXT library.
-
-  Resulting output will be two files:
-  name_no_deps.jar and name.aar
-
-  Args:
-    name: The target name
-    deps: The dependencies that make up the library
-    custom_package: Option custom android package to use
-    proguard_specs: Proguard to apply when building the jar
-    proguard_library: Proguard to bundle with the jar
-    jarjar_rules: Optional file containing jarjar rules to be applied
-    keep_spec: A regex to match items to retain in the jar. This is typically the
-      root java namespace of the library.
-    remove_spec: A regex to match items to remove from the jar.
-    overlapping_jars: jars containing entries to be removed from the main jar.
-      This is useful when the library has dependencies whose java package namespaces
-      overlap with this jar. See remove_from_jar docs for more details.
-    resource_files: res files to include in library
-    visibility: optional visibility to use for generated rules
-  """
-
-  # The rules here produce a final .aar artifact and jar for external release.
-
-  # It is a 5 stage pipeline:
-  # 1. Produce a placeholder .aar
-  # 2. Produce a .jar including all classes and all its dependencies, and optionally proguard it via
-  #    proguard_specs
-  # 3. Rename classes if necessary via jarjar
-  # 4. Strip out external dependencies from .jar
-  # 5. Optionally, add in the proguard_library files to be bundled in the .aar
-  # 6. Update the classes.jar inside the .aar from step 1 with the .jar from step 3
-
-  # Step 1. Generate initial shell aar. The generated classes.jar will be empty.
-  # See
-  # https://bazel.build/versions/master/docs/be/android.html#android_library,
-  # name.aar
-  native.android_library(
-      name = "%s_initial" % name,
-      manifest = "AndroidManifest.xml",
-      resource_files = resource_files,
-      visibility = ["//visibility:private"],
-      custom_package = custom_package,
-      testonly = 1,
-      exports = deps,
-  )
-
-  # Step 2. Generate jar containing all classes including dependencies.
-  native.android_binary(
-      name = "%s_all" % name,
-      testonly = 1,
-      manifest = "AndroidManifest.xml",
-      multidex = multidex,
-      custom_package = custom_package,
-      proguard_specs = proguard_specs,
-      deps = [
-          ":%s_initial" % name,
-      ],
-      visibility = visibility,
-  )
-
-  expected_output = ":%s_all_deploy.jar" % name
-  if proguard_specs:
-    expected_output = ":%s_all_proguard.jar" % name
-
-  # Step 3. Rename classes via jarjar
-  native.java_binary(
-    name = "jarjar_bin",
-    main_class = "org.pantsbuild.jarjar.Main",
-    runtime_deps = ["@maven//:org_pantsbuild_jarjar"],
-    visibility = visibility,
-  )
-  native.genrule(
-      name = "%s_jarjared" % name,
-      srcs = [expected_output],
-      outs = ["%s_jarjared.jar" % name],
-      cmd = ("$(location :jarjar_bin) process " +
-               "$(location %s) '$<' '$@'") % jarjar_rules,
-      tools = [
-          jarjar_rules,
-	        ":jarjar_bin",
-      ],
-      visibility = visibility,
-  )
-
-  # Step 4. Strip out external dependencies. This produces the final name_no_deps.jar.
-  remove_from_jar(
-      name = "%s_no_deps" % name,
-      jar = ":%s_jarjared.jar" % name,
-      keep_spec = keep_spec,
-      remove_spec = remove_spec,
-      overlapping_jars = overlapping_jars,
-      visibility = visibility,
-  )
-
-  expected_output = ":%s_initial.aar" % name
-  if proguard_library:
-    expected_output = "%s_with_proguard.aar" % name
-
-    # Step 5. Add the proguard library file to the aar from the first step
-    add_or_update_file_in_zip(
-        name = "%s_add_proguard" % name,
-        src = ":%s_initial.aar" % name,
-        out = expected_output,
-        update_path = "proguard.txt",
-        update_src = proguard_library,
-    )
-
-  # Step 6. Update the .aar produced in the first step with the final .jar
-  add_or_update_file_in_zip(
-      name = name,
-      src = expected_output,
-      out = "%s.aar" % name,
-      update_path = "classes.jar",
-      update_src = ":%s_no_deps.jar" % name,
-  )
diff --git a/build_extensions/remove_from_jar.bzl b/build_extensions/remove_from_jar.bzl
deleted file mode 100644
index 794f7c3e9..000000000
--- a/build_extensions/remove_from_jar.bzl
+++ /dev/null
@@ -1,145 +0,0 @@
-"""Removes files / directories from jar (or any zip) file.
-
-If overlapping_jars is present, then it also removes entries in the
-primary jar that exists in any of the overlapping_jars.
-"""
-
-def remove_from_jar(
-        name,
-        jar,
-        keep_spec,
-        remove_spec = None,
-        overlapping_jars = [],
-        visibility = None,
-        constraints = None,
-        **kwargs):
-    """Removes specified entries from a jar file.
-
-    The entries to remove can be specified with with any combination of 'removes'
-    and 'overlapping_jars'.
-    It generates two relevant targets: <name> and lib<name>,
-    where <name> target is pure genrule output, that has 'concrete' jar, while
-    lib<name> is a java_library rule that contains <name> in its srcs.
-
-    Args:
-      name: Name of the remove jars target, String.
-      jar: jar from which to remove files, label.
-      keep_spec: Regex to match items to be retained in jar file.
-      remove_spec: Regex of items to be removed from a jar file.
-      overlapping_jars: jars containing entries to be removed from the main jar.
-      visibility: (Optional) visibility of the rules generated by this macro.
-      constraints: (Optional) constraints imposed on this rule as a Java library.
-        Currently defaults to ["android"] for compatibility reasons, but this will
-        be removed in the future.
-      **kwargs: Args to be passed to genrule and java_library, so valid args are
-        common set between those two:
-          deprecation, distribs, licenses, obsolete, tags, testonly, visibility
-
-    Usage:
-      remove_from_jar(
-        name = "jar_cleaned",
-        keep_spec = "foo/bar/,*|bar/foo/,*",
-        overlapping_jars = [":fooapp_deploy.jar"])
-      Explanation:
-        Removes all items not matching foo/bar/.* or bar/foo/.* from the jar file.
-        Uses fooapp_deploy.jar overlapping jar, to remove entries in main
-        jar that are also present in the overlapping jar.
-
-      remove_from_jar(
-        name = "jar_cleaned",
-        keep_spec = "foo/bar.*"
-        removes = [ "foo/bar/RemoveMe" ])
-      Explanation:
-        This will retain everything from foo/bar/.* except foo/bar/RemoveMe.
-    """
-    if not jar or jar == "":
-        fail('"jar" attribute cannot be null or empty')
-
-    if constraints == None:
-        constraints = ["android"]
-
-    srcs = [jar]
-    message = ('Keeping %s from "%s." ' % (keep_spec, jar))
-    message += ('Removing %s from "%s." ' % (remove_spec, jar)) if remove_spec else ""
-
-    # Add overlapping_jars to sources if specified.
-    for overlapping_jar in overlapping_jars:
-        srcs += [overlapping_jar]
-        message += (
-            'Removing elements in "%s" that are present in overlapping jar "%s."' %
-            (jar, overlapping_jar)
-        )
-
-    cmd = [
-        "set +o pipefail;",
-        "tmpdir=$$(mktemp -d);",
-        "cp $(location %s) $@;" % jar,
-        "chmod +w $@;",
-        "$(location @local_jdk//:jar) tf $@ > $$tmpdir/file_list.txt;",
-        "cat $$tmpdir/file_list.txt | ",
-        'egrep -v "%s" | ' % keep_spec,
-        "xargs --no-run-if-empty zip -d $@ >",
-        "$$tmpdir/keep_from_jar_result.txt 2>&1 || {",
-        "  RESULT=$$?;",
-        "  cat $$tmpdir/keep_from_jar_result.txt;",
-        "  exit $${RESULT};",
-        " };",
-    ]
-
-    if remove_spec:
-        cmd += [
-            "$(location @local_jdk//:jar) tf $@ >",
-            "$$tmpdir/remove_file_list.txt;",
-            "cat $$tmpdir/remove_file_list.txt | ",
-            'egrep "%s" | ' % remove_spec,
-            "xargs --no-run-if-empty zip -d $@ >",
-            "$$tmpdir/remove_from_jar_result.txt 2>&1 || {",
-            "  RESULT=$$?;",
-            "  cat $$tmpdir/remove_from_jar_result.txt;",
-            "  exit $${RESULT};",
-            " };",
-        ]
-
-    if overlapping_jars:
-        for overlapping_jar in overlapping_jars:
-            cmd += [
-                ("$(location @local_jdk//:jar) tf $(location %s) >> " +
-                 "$$tmpdir/overlapping_jar.txt;") %
-                overlapping_jar,
-            ]
-        cmd += [
-            "$(location @local_jdk//:jar) tf $@ >",
-            "$$tmpdir/original_jar.txt;",
-            "grep -F -x -f $$tmpdir/overlapping_jar.txt",
-            "$$tmpdir/original_jar.txt",
-            "| xargs --no-run-if-empty zip -d $@ >",
-            "$$tmpdir/remove_from_overlapping_jar_result.txt 2>&1 || {",
-            "  RESULT=$$?;",
-            "  cat $$tmpdir/remove_from_overlapping_jar_result.txt;",
-            "  exit $${RESULT};",
-            " };",
-        ]
-
-    cmd += ["rm -rf $$tmpdir;"]
-
-    native.genrule(
-        name = name,
-        srcs = srcs,
-        outs = ["%s.jar" % name],
-        tools = [
-            "@local_jdk//:jar",
-
-        ],
-        message = message,
-        visibility = visibility,
-        cmd = " ".join(cmd),
-        **kwargs
-    )
-
-    native.java_import(
-        name = "lib%s" % name,
-        jars = [name],
-        constraints = constraints,
-        visibility = visibility,
-        **kwargs
-    )
diff --git a/build_extensions/robolectric.properties b/build_extensions/robolectric.properties
index b67e91d12..b3a33a53f 100644
--- a/build_extensions/robolectric.properties
+++ b/build_extensions/robolectric.properties
@@ -1,4 +1,4 @@
-# Use SDK 28 by default
-sdk=28
+# Use SDK 34 by default
+sdk=34
 # make Robolectric match the emulator used
-qualifiers=w480dp-h800dp
\ No newline at end of file
+qualifiers=w480dp-h800dp
diff --git a/build_extensions/test_devices.bzl b/build_extensions/test_devices.bzl
deleted file mode 100644
index b6b9ad40c..000000000
--- a/build_extensions/test_devices.bzl
+++ /dev/null
@@ -1,24 +0,0 @@
-"""Defines common device targets for unit tests."""
-
-# TODO: consider expanding set of devices. for now just use API 19 only
-# since it seems most stable
-_ALL_DEVICES = [
-    struct(sdk = 19, target = "//tools/android/emulated_devices/generic_phone:android_19_x86"),
-]
-
-def devices(min_sdk = 15, max_sdk = 10000):
-    """Returns target_devices for android_instrumentation_tests.
-
-    Args:
-      min_sdk: the minimum android api level to return. Default 15
-      max_sdk: the maximum android api level to return. Default 10000
-
-    Returns:
-      list of device targets
-    """
-    devices = []
-    for device in _ALL_DEVICES:
-        if (device.sdk >= min_sdk and device.sdk <= max_sdk):
-            devices.append(device.target)
-
-    return devices
\ No newline at end of file
diff --git a/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/BUILD b/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/BUILD
new file mode 100644
index 000000000..ba3024598
--- /dev/null
+++ b/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/BUILD
@@ -0,0 +1,23 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+package(
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+kt_jvm_library(
+    name = "zipcombiner_lib",
+    srcs = glob([
+        "*.kt",
+    ]),
+)
+
+java_binary(
+    name = "zipcombiner",
+    srcs = ["Main.java"],
+    main_class = "androidx.test.tools.zipcombiner.Main",
+    deps = [
+        ":zipcombiner_lib",
+    ],
+)
diff --git a/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/Main.java b/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/Main.java
new file mode 100644
index 000000000..43620b1db
--- /dev/null
+++ b/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/Main.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.zipcombiner;
+
+public class Main {
+  private Main() {}
+
+  public static void main(String[] args) {
+    ZipCombinerKt.combineZips(args);
+  }
+}
diff --git a/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/ZipCombiner.kt b/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/ZipCombiner.kt
new file mode 100644
index 000000000..8f0267821
--- /dev/null
+++ b/build_extensions/zip_combiner/java/androidx/test/tools/zipcombiner/ZipCombiner.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.tools.zipcombiner
+
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+fun combineZips(args: Array<String>) {
+  require(args.size >= 2) { "Must provide a least two files: <output> <input...>" }
+
+  val outputFile = args[0]
+  val zipOutputStream = ZipOutputStream(FileOutputStream(outputFile, false))
+  zipOutputStream.use {
+    // keep track of what zip each entry belongs to, in order to have a better error
+    // message in case of duplicates
+    val entryToZip: MutableMap<String, String> = HashMap()
+
+    for (i in 1 until args.size) {
+      val inputFile = args[i]
+      val zipInputStream = ZipInputStream(FileInputStream(inputFile))
+      zipInputStream.use { addToZip(entryToZip, zipOutputStream, zipInputStream, args[i]) }
+    }
+  }
+}
+
+private fun addToZip(
+  entryToZip: MutableMap<String, String>,
+  zipOutputStream: ZipOutputStream,
+  inputZipStream: ZipInputStream,
+  inputZipName: String,
+) {
+  var entry = inputZipStream.nextEntry
+  while (entry != null) {
+    // ZipOutputStream will throw an obscure error if any duplicate entry is added, which is
+    // undesirable for
+    // directories and certain classes.
+    // Add our own handling to allow certain duplicates, and throw a more descriptive error in
+    // case there are unexpected duplicates
+    if (entryToZip.containsKey(entry.name)) {
+      if (!isAllowedDuplicate(entry)) {
+        throw RuntimeException(
+          "Duplicate entry: ${entry.name} is present in both ${entryToZip.get(entry.name)} and $inputZipName"
+        )
+      }
+    } else {
+      zipOutputStream.putNextEntry(entry)
+      inputZipStream.transferTo(zipOutputStream)
+      entryToZip.put(entry.name, inputZipName)
+    }
+    entry = inputZipStream.nextEntry
+  }
+}
+
+private fun isAllowedDuplicate(entry: ZipEntry): Boolean {
+  // always allow duplicate directories
+  return entry.isDirectory
+}
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
deleted file mode 100644
index b9e32bd18..000000000
--- a/cloudbuild.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-steps:
-# pull the latest docker image contains bazel + android SDK
-- name: gcr.io/cloud-builders/docker
-  args: ['pull', 'gcr.io/$PROJECT_ID/bazel-android:latest']
-# build the docker image, caching from the latest image
-- name: gcr.io/cloud-builders/docker
-  args: [
-          'build',
-          '--tag', 'gcr.io/$PROJECT_ID/bazel-android:latest',
-          '--cache-from',  'gcr.io/$PROJECT_ID/bazel-android:latest',
-          '.'
-        ]
-# build the maven repository using bazel
-- name: gcr.io/$PROJECT_ID/bazel-android
-  args: ['build', '//:axt_m2repository']
-# run the robolectric tests
-- name: gcr.io/$PROJECT_ID/bazel-android
-  args: ['test', '...', '--test_tag_filters=robolectric,-gcb_ignore', '--build_tag_filters=robolectric', '--test_output=all']
-
-timeout: '1200s'
-
-# use a 32 vCPU 28.8GB memory machine.
-options:
-  machineType: "N1_HIGHCPU_32"
-
-# push the built docker image to google cloud storage
-images: ['gcr.io/$PROJECT_ID/bazel-android:latest']
diff --git a/core/BUILD b/core/BUILD
new file mode 100644
index 000000000..aed3d6546
--- /dev/null
+++ b/core/BUILD
@@ -0,0 +1,23 @@
+# Publicly visible androidx.test.core API library
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "core",
+    actual = "//core/java/androidx/test/core",
+    visibility = ["//visibility:public"],
+)
+
+# The manifest entries for ActivityScenario's bootstrap activities.
+# Add this to to your application under test to avoid a separate test process getting launched
+# for the bootstrap activities
+alias(
+    name = "manifest",
+    actual = "//core/java/androidx/test/core:manifest",
+    visibility = ["//visibility:public"],
+)
diff --git a/core/BUILD.bazel b/core/BUILD.bazel
deleted file mode 100644
index e30368815..000000000
--- a/core/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-# Publicly visible truth extensions for Android
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "core",
-    visibility = ["//visibility:public"],
-    exports = ["//core/java/androidx/test/core"],
-)
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
new file mode 100644
index 000000000..e5c230db6
--- /dev/null
+++ b/core/CHANGELOG.md
@@ -0,0 +1,19 @@
+### Core Core-ktx {version} {:#core-{version}}
+
+{{date}}
+
+`androidx.test:core:{version}` and `androidx.test:core-ktx:{version}` are released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/core/java/androidx/test/core/AndroidManifest.xml b/core/java/androidx/test/core/AndroidManifest.xml
index 5882076fc..692342834 100644
--- a/core/java/androidx/test/core/AndroidManifest.xml
+++ b/core/java/androidx/test/core/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.core" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="23"
         android:targetSdkVersion="28" />
 
     <uses-permission android:name="android.permission.REORDER_TASKS" />
@@ -28,24 +28,24 @@
             android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
             android:exported="true"
             android:theme="@style/WhiteBackgroundTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="-100">
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
             android:exported="true"
             android:theme="@style/WhiteBackgroundTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="-100">
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
             android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
             android:exported="true"
             android:theme="@style/WhiteBackgroundDialogTheme">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+            <intent-filter android:priority="-100">
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
diff --git a/core/java/androidx/test/core/BUILD b/core/java/androidx/test/core/BUILD
new file mode 100644
index 000000000..5f0a5a67f
--- /dev/null
+++ b/core/java/androidx/test/core/BUILD
@@ -0,0 +1,101 @@
+# Description: Build rules for building androidx.test.truth from source
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# all users should reference the equivalent targets in //core
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        ":allowlist",
+    ],
+)
+
+package_group(
+    name = "allowlist",
+    packages = [
+        "//...",
+    ],
+)
+
+licenses(["notice"])
+
+# target containing bootstrap activity manifest entries
+# Add this to your application under test to avoid a separate test process getting launched
+# for the bootstrap activities
+android_library(
+    name = "manifest",
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+)
+
+kt_android_library(
+    name = "core",
+    srcs = glob(
+        [
+            "**/*.java",
+            "**/*.kt",
+        ],
+    ),
+    tags = ["alt_dep=//core"],
+    deps = [
+        ":manifest",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:androidx_concurrent_concurrent_futures_ktx",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:androidx_tracing_tracing",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+# kt_android_library does not produce an aar, so wrap in a android_library for release
+android_library(
+    name = "core_aar_lib",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    visibility = ["//visibility:private"],
+    exports = [
+        ":core",
+    ],
+)
+
+alias(
+    name = "core-src",
+    actual = ":core_aar-src.jar",
+    visibility = ["//visibility:private"],
+)
+
+# Generate rules for the release artifacts.
+axt_android_aar(
+    name = "core_aar",
+    expected_class_prefixes = [
+        "androidx.test.core",
+    ],
+    included_dep = ":core_aar_lib",
+)
+
+maven_artifact(
+    name = "core_maven_artifact",
+    last_updated = "20180403000000",
+    target = ":core_aar",
+)
+
+dackka_test(
+    name = "core_doc",
+    runtime_dep = ":core_aar_lib",
+    src_jar = ":core_aar-src.jar",
+)
+
+api_checks(
+    name = "core_api",
+    runtime_dep = ":core_aar_lib",
+    src_jar = ":core_aar-src.jar",
+)
diff --git a/core/java/androidx/test/core/BUILD.bazel b/core/java/androidx/test/core/BUILD.bazel
deleted file mode 100644
index c1a715d20..000000000
--- a/core/java/androidx/test/core/BUILD.bazel
+++ /dev/null
@@ -1,67 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "KOTLIN_VERSION", "MONITOR_VERSION")
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
-
-# Description: Build rules for building androidx.test.core from source
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-kt_android_library(
-    name = "core",
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    exports_manifest = 1,
-    manifest = ":AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    deps = [
-        "//:androidx_annotation",
-        "//:androidx_lifecycle_common",
-        "//runner/monitor",
-    ],
-)
-
-# group of targets to use to produce release binary + docs
-android_library(
-    name = "core_release_lib",
-    exports = [
-        ":core",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: core_release_no_deps.jar and core_release.aar
-# a java_library target libcore_release_no_deps
-axt_release_lib(
-    name = "core_release",
-    # keep all androidx.test.core classes except androidx.test.core.R, since that will be
-    # auto-generated by consuming build system
-    keep_spec = "androidx/test/core/.*",
-    remove_spec = "androidx/test/core/R[$$\\.]",
-    resource_files = glob(["res/**"]),
-    deps = [
-        ":core_release_lib",
-    ],
-)
-
-maven_artifact(
-    name = "core_maven_artifact",
-    src = ":core_release.aar",
-    artifact_deps = [
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-        "androidx.test:monitor:%s" % MONITOR_VERSION,
-        "androidx.lifecycle:lifecycle-common:%s" % ANDROIDX_LIFECYCLE_VERSION,
-        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
-    ],
-    artifact_id = "core",
-    group_id = "androidx.test",
-    last_updated = "20180403000000",
-    src_jar = ":libcore-src.jar",
-    version = "%s" % CORE_VERSION,
-)
diff --git a/core/java/androidx/test/core/api/1.4.0_public.txt b/core/java/androidx/test/core/api/1.4.0_public.txt
new file mode 100644
index 000000000..b9da37a06
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.4.0_public.txt
@@ -0,0 +1,93 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenario<A extends android.app.Activity> implements java.lang.AutoCloseable java.io.Closeable {
+    method public void close();
+    method public android.app.Instrumentation.ActivityResult! getResult();
+    method public android.arch.lifecycle.Lifecycle.State! getState();
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! moveToState(android.arch.lifecycle.Lifecycle.State!);
+    method public androidx.test.core.app.ActivityScenario<A!>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A!>!);
+    method public androidx.test.core.app.ActivityScenario<A!>! recreate();
+  }
+
+  public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
+    method public void perform(A!);
+  }
+
+  public final class ApplicationProvider {
+    method public static <T extends android.content.Context> T! getApplicationContext();
+  }
+
+}
+
+package androidx.test.core.content.pm {
+
+  public final class ApplicationInfoBuilder {
+    method public android.content.pm.ApplicationInfo! build();
+    method public static androidx.test.core.content.pm.ApplicationInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setName(String?);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setPackageName(String!);
+  }
+
+  public final class PackageInfoBuilder {
+    method public android.content.pm.PackageInfo! build();
+    method public static androidx.test.core.content.pm.PackageInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setApplicationInfo(android.content.pm.ApplicationInfo!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setPackageName(String!);
+  }
+
+}
+
+package androidx.test.core.os {
+
+  public final class Parcelables {
+    method public static <T extends android.os.Parcelable> T! forceParcel(T!, android.os.Parcelable.Creator<T!>!);
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public class MotionEventBuilder {
+    method public android.view.MotionEvent! build();
+    method public static androidx.test.core.view.MotionEventBuilder! newBuilder();
+    method public androidx.test.core.view.MotionEventBuilder! setAction(int);
+    method public androidx.test.core.view.MotionEventBuilder! setActionIndex(int);
+    method public androidx.test.core.view.MotionEventBuilder! setButtonState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDeviceId(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDownTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setEdgeFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setEventTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setMetaState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(float, float);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(android.view.MotionEvent.PointerProperties!, android.view.MotionEvent.PointerCoords!);
+    method public androidx.test.core.view.MotionEventBuilder! setSource(int);
+    method public androidx.test.core.view.MotionEventBuilder! setXPrecision(float);
+    method public androidx.test.core.view.MotionEventBuilder! setYPrecision(float);
+  }
+
+  public class PointerCoordsBuilder {
+    method public android.view.MotionEvent.PointerCoords! build();
+    method public static androidx.test.core.view.PointerCoordsBuilder! newBuilder();
+    method public androidx.test.core.view.PointerCoordsBuilder! setCoords(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setOrientation(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setPressure(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setSize(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTool(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTouch(float, float);
+  }
+
+  public class PointerPropertiesBuilder {
+    method public android.view.MotionEvent.PointerProperties! build();
+    method public static androidx.test.core.view.PointerPropertiesBuilder! newBuilder();
+    method public androidx.test.core.view.PointerPropertiesBuilder! setId(int);
+    method public androidx.test.core.view.PointerPropertiesBuilder! setToolType(int);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/1.5.0_internal.txt b/core/java/androidx/test/core/api/1.5.0_internal.txt
new file mode 100644
index 000000000..364571b06
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.5.0_internal.txt
@@ -0,0 +1,9 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class DeviceCapture {
+    method @RequiresApi(android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @androidx.test.annotation.ExperimentalTestApi public static android.graphics.Bitmap takeScreenshotNoSync() throws java.lang.RuntimeException;
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/1.5.0_public.txt b/core/java/androidx/test/core/api/1.5.0_public.txt
new file mode 100644
index 000000000..d80883783
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.5.0_public.txt
@@ -0,0 +1,113 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenario<A extends android.app.Activity> implements java.lang.AutoCloseable java.io.Closeable {
+    method public void close();
+    method public android.app.Instrumentation.ActivityResult! getResult();
+    method public androidx.lifecycle.Lifecycle.State! getState();
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! moveToState(androidx.lifecycle.Lifecycle.State!);
+    method public androidx.test.core.app.ActivityScenario<A!>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A!>!);
+    method public androidx.test.core.app.ActivityScenario<A!>! recreate();
+  }
+
+  public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
+    method public void perform(A!);
+  }
+
+  public final class ApplicationProvider {
+    method public static <T extends android.content.Context> T! getApplicationContext();
+  }
+
+  public final class DeviceCapture {
+  }
+
+}
+
+package androidx.test.core.content.pm {
+
+  public final class ApplicationInfoBuilder {
+    method public android.content.pm.ApplicationInfo! build();
+    method public static androidx.test.core.content.pm.ApplicationInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setName(String?);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setPackageName(String!);
+  }
+
+  public final class PackageInfoBuilder {
+    method public android.content.pm.PackageInfo! build();
+    method public static androidx.test.core.content.pm.PackageInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setApplicationInfo(android.content.pm.ApplicationInfo!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setPackageName(String!);
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+  }
+
+}
+
+package androidx.test.core.os {
+
+  public final class Parcelables {
+    method public static <T extends android.os.Parcelable> T! forceParcel(T!, android.os.Parcelable.Creator<T!>!);
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public class MotionEventBuilder {
+    method public android.view.MotionEvent! build();
+    method public static androidx.test.core.view.MotionEventBuilder! newBuilder();
+    method public androidx.test.core.view.MotionEventBuilder! setAction(int);
+    method public androidx.test.core.view.MotionEventBuilder! setActionIndex(int);
+    method public androidx.test.core.view.MotionEventBuilder! setButtonState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDeviceId(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDownTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setEdgeFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setEventTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setMetaState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(float, float);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(android.view.MotionEvent.PointerProperties!, android.view.MotionEvent.PointerCoords!);
+    method public androidx.test.core.view.MotionEventBuilder! setSource(int);
+    method public androidx.test.core.view.MotionEventBuilder! setXPrecision(float);
+    method public androidx.test.core.view.MotionEventBuilder! setYPrecision(float);
+  }
+
+  public class PointerCoordsBuilder {
+    method public android.view.MotionEvent.PointerCoords! build();
+    method public static androidx.test.core.view.PointerCoordsBuilder! newBuilder();
+    method public androidx.test.core.view.PointerCoordsBuilder! setCoords(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setOrientation(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setPressure(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setSize(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTool(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTouch(float, float);
+  }
+
+  public class PointerPropertiesBuilder {
+    method public android.view.MotionEvent.PointerProperties! build();
+    method public static androidx.test.core.view.PointerPropertiesBuilder! newBuilder();
+    method public androidx.test.core.view.PointerPropertiesBuilder! setId(int);
+    method public androidx.test.core.view.PointerPropertiesBuilder! setToolType(int);
+  }
+
+  public final class ViewCapture {
+  }
+
+  public final class WindowCapture {
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/1.6.0_internal.txt b/core/java/androidx/test/core/api/1.6.0_internal.txt
new file mode 100644
index 000000000..c6d1ac143
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.6.0_internal.txt
@@ -0,0 +1,26 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class DeviceCapture {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static boolean canTakeScreenshot();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static android.graphics.Bitmap takeScreenshotNoSync() throws java.lang.RuntimeException;
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+    method @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static void writeToTestStorage(android.graphics.Bitmap, androidx.test.platform.io.PlatformTestStorage testStorage, String name) throws java.io.IOException;
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public final class ViewCapture {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static suspend Object? forceRedraw(android.view.View, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/1.6.0_public.txt b/core/java/androidx/test/core/api/1.6.0_public.txt
new file mode 100644
index 000000000..62dfd9a6e
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.6.0_public.txt
@@ -0,0 +1,123 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenario<A extends android.app.Activity> implements java.lang.AutoCloseable java.io.Closeable {
+    method public void close();
+    method public android.app.Instrumentation.ActivityResult! getResult();
+    method public androidx.lifecycle.Lifecycle.State! getState();
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! moveToState(androidx.lifecycle.Lifecycle.State!);
+    method public androidx.test.core.app.ActivityScenario<A!>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A!>!);
+    method public androidx.test.core.app.ActivityScenario<A!>! recreate();
+  }
+
+  public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
+    method public void perform(A!);
+  }
+
+  public final class ApplicationProvider {
+    method public static <T extends android.content.Context> T! getApplicationContext();
+  }
+
+  public final class DeviceCapture {
+    method @kotlin.jvm.Throws(exceptionClasses=RuntimeException::class) public static android.graphics.Bitmap takeScreenshot() throws java.lang.RuntimeException;
+  }
+
+}
+
+package androidx.test.core.content.pm {
+
+  public final class ApplicationInfoBuilder {
+    method public android.content.pm.ApplicationInfo! build();
+    method public static androidx.test.core.content.pm.ApplicationInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setFlags(int);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setName(String?);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setPackageName(String!);
+  }
+
+  public final class PackageInfoBuilder {
+    method public androidx.test.core.content.pm.PackageInfoBuilder! addRequestedPermission(String!, int);
+    method public android.content.pm.PackageInfo! build();
+    method public static androidx.test.core.content.pm.PackageInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setApplicationInfo(android.content.pm.ApplicationInfo!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setPackageName(String!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setVersionCode(long);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setVersionName(String!);
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public static void writeToTestStorage(android.graphics.Bitmap, String name) throws java.io.IOException;
+  }
+
+}
+
+package androidx.test.core.os {
+
+  public final class Parcelables {
+    method public static <T extends android.os.Parcelable> T! forceParcel(T!, android.os.Parcelable.Creator<T!>!);
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public class MotionEventBuilder {
+    method public android.view.MotionEvent! build();
+    method public static androidx.test.core.view.MotionEventBuilder! newBuilder();
+    method public androidx.test.core.view.MotionEventBuilder! setAction(int);
+    method public androidx.test.core.view.MotionEventBuilder! setActionIndex(int);
+    method public androidx.test.core.view.MotionEventBuilder! setButtonState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDeviceId(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDownTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setEdgeFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setEventTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setMetaState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(android.view.MotionEvent.PointerProperties!, android.view.MotionEvent.PointerCoords!);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(float, float);
+    method public androidx.test.core.view.MotionEventBuilder! setSource(int);
+    method public androidx.test.core.view.MotionEventBuilder! setXPrecision(float);
+    method public androidx.test.core.view.MotionEventBuilder! setYPrecision(float);
+  }
+
+  public class PointerCoordsBuilder {
+    method public android.view.MotionEvent.PointerCoords! build();
+    method public static androidx.test.core.view.PointerCoordsBuilder! newBuilder();
+    method public androidx.test.core.view.PointerCoordsBuilder! setCoords(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setOrientation(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setPressure(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setSize(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTool(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTouch(float, float);
+  }
+
+  public class PointerPropertiesBuilder {
+    method public android.view.MotionEvent.PointerProperties! build();
+    method public static androidx.test.core.view.PointerPropertiesBuilder! newBuilder();
+    method public androidx.test.core.view.PointerPropertiesBuilder! setId(int);
+    method public androidx.test.core.view.PointerPropertiesBuilder! setToolType(int);
+  }
+
+  public final class ViewCapture {
+    method public static suspend Object? captureToBitmap(android.view.View, android.graphics.Rect? rect = null, kotlin.coroutines.Continuation<? super android.graphics.Bitmap>);
+    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> captureToBitmapAsync(android.view.View, android.graphics.Rect? rect = null);
+  }
+
+  public final class WindowCapture {
+    method public static suspend Object? captureRegionToBitmap(android.view.Window, android.graphics.Rect? boundsInWindow = null, kotlin.coroutines.Continuation<? super android.graphics.Bitmap>);
+    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> captureRegionToBitmapAsync(android.view.Window, android.graphics.Rect? boundsInWindow = null);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/1.7.0_internal.txt b/core/java/androidx/test/core/api/1.7.0_internal.txt
new file mode 100644
index 000000000..c6d1ac143
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.7.0_internal.txt
@@ -0,0 +1,26 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class DeviceCapture {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static boolean canTakeScreenshot();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static android.graphics.Bitmap takeScreenshotNoSync() throws java.lang.RuntimeException;
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+    method @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static void writeToTestStorage(android.graphics.Bitmap, androidx.test.platform.io.PlatformTestStorage testStorage, String name) throws java.io.IOException;
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public final class ViewCapture {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static suspend Object? forceRedraw(android.view.View, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/1.7.0_public.txt b/core/java/androidx/test/core/api/1.7.0_public.txt
new file mode 100644
index 000000000..62dfd9a6e
--- /dev/null
+++ b/core/java/androidx/test/core/api/1.7.0_public.txt
@@ -0,0 +1,123 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenario<A extends android.app.Activity> implements java.lang.AutoCloseable java.io.Closeable {
+    method public void close();
+    method public android.app.Instrumentation.ActivityResult! getResult();
+    method public androidx.lifecycle.Lifecycle.State! getState();
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(android.content.Intent, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!> launchActivityForResult(Class<A!>, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! moveToState(androidx.lifecycle.Lifecycle.State!);
+    method public androidx.test.core.app.ActivityScenario<A!>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A!>!);
+    method public androidx.test.core.app.ActivityScenario<A!>! recreate();
+  }
+
+  public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
+    method public void perform(A!);
+  }
+
+  public final class ApplicationProvider {
+    method public static <T extends android.content.Context> T! getApplicationContext();
+  }
+
+  public final class DeviceCapture {
+    method @kotlin.jvm.Throws(exceptionClasses=RuntimeException::class) public static android.graphics.Bitmap takeScreenshot() throws java.lang.RuntimeException;
+  }
+
+}
+
+package androidx.test.core.content.pm {
+
+  public final class ApplicationInfoBuilder {
+    method public android.content.pm.ApplicationInfo! build();
+    method public static androidx.test.core.content.pm.ApplicationInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setFlags(int);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setName(String?);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setPackageName(String!);
+  }
+
+  public final class PackageInfoBuilder {
+    method public androidx.test.core.content.pm.PackageInfoBuilder! addRequestedPermission(String!, int);
+    method public android.content.pm.PackageInfo! build();
+    method public static androidx.test.core.content.pm.PackageInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setApplicationInfo(android.content.pm.ApplicationInfo!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setPackageName(String!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setVersionCode(long);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setVersionName(String!);
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public static void writeToTestStorage(android.graphics.Bitmap, String name) throws java.io.IOException;
+  }
+
+}
+
+package androidx.test.core.os {
+
+  public final class Parcelables {
+    method public static <T extends android.os.Parcelable> T! forceParcel(T!, android.os.Parcelable.Creator<T!>!);
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public class MotionEventBuilder {
+    method public android.view.MotionEvent! build();
+    method public static androidx.test.core.view.MotionEventBuilder! newBuilder();
+    method public androidx.test.core.view.MotionEventBuilder! setAction(int);
+    method public androidx.test.core.view.MotionEventBuilder! setActionIndex(int);
+    method public androidx.test.core.view.MotionEventBuilder! setButtonState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDeviceId(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDownTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setEdgeFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setEventTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setMetaState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(android.view.MotionEvent.PointerProperties!, android.view.MotionEvent.PointerCoords!);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(float, float);
+    method public androidx.test.core.view.MotionEventBuilder! setSource(int);
+    method public androidx.test.core.view.MotionEventBuilder! setXPrecision(float);
+    method public androidx.test.core.view.MotionEventBuilder! setYPrecision(float);
+  }
+
+  public class PointerCoordsBuilder {
+    method public android.view.MotionEvent.PointerCoords! build();
+    method public static androidx.test.core.view.PointerCoordsBuilder! newBuilder();
+    method public androidx.test.core.view.PointerCoordsBuilder! setCoords(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setOrientation(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setPressure(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setSize(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTool(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTouch(float, float);
+  }
+
+  public class PointerPropertiesBuilder {
+    method public android.view.MotionEvent.PointerProperties! build();
+    method public static androidx.test.core.view.PointerPropertiesBuilder! newBuilder();
+    method public androidx.test.core.view.PointerPropertiesBuilder! setId(int);
+    method public androidx.test.core.view.PointerPropertiesBuilder! setToolType(int);
+  }
+
+  public final class ViewCapture {
+    method public static suspend Object? captureToBitmap(android.view.View, android.graphics.Rect? rect = null, kotlin.coroutines.Continuation<? super android.graphics.Bitmap>);
+    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> captureToBitmapAsync(android.view.View, android.graphics.Rect? rect = null);
+  }
+
+  public final class WindowCapture {
+    method public static suspend Object? captureRegionToBitmap(android.view.Window, android.graphics.Rect? boundsInWindow = null, kotlin.coroutines.Continuation<? super android.graphics.Bitmap>);
+    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> captureRegionToBitmapAsync(android.view.Window, android.graphics.Rect? boundsInWindow = null);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/current.txt b/core/java/androidx/test/core/api/current.txt
deleted file mode 100644
index 1b60de3da..000000000
--- a/core/java/androidx/test/core/api/current.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-// Signature format: 3.0
-package androidx.test.core.app {
-
-  public final class ActivityScenario<A extends android.app.Activity> implements java.lang.AutoCloseable java.io.Closeable {
-    method public void close();
-    method public android.app.Instrumentation.ActivityResult! getResult();
-    method public androidx.lifecycle.Lifecycle.State! getState();
-    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!);
-    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(Class<A!>!, android.os.Bundle?);
-    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!);
-    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A!>! launch(android.content.Intent!, android.os.Bundle?);
-    method public androidx.test.core.app.ActivityScenario<A!>! moveToState(androidx.lifecycle.Lifecycle.State!);
-    method public androidx.test.core.app.ActivityScenario<A!>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A!>!);
-    method public androidx.test.core.app.ActivityScenario<A!>! recreate();
-  }
-
-  public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
-    method public void perform(A!);
-  }
-
-  public final class ApplicationProvider {
-    method public static <T extends android.content.Context> T! getApplicationContext();
-  }
-
-}
-
-package androidx.test.core.content.pm {
-
-  public final class ApplicationInfoBuilder {
-    method public android.content.pm.ApplicationInfo! build();
-    method public static androidx.test.core.content.pm.ApplicationInfoBuilder! newBuilder();
-    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setName(String?);
-    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setPackageName(String!);
-  }
-
-  public final class PackageInfoBuilder {
-    method public android.content.pm.PackageInfo! build();
-    method public static androidx.test.core.content.pm.PackageInfoBuilder! newBuilder();
-    method public androidx.test.core.content.pm.PackageInfoBuilder! setApplicationInfo(android.content.pm.ApplicationInfo!);
-    method public androidx.test.core.content.pm.PackageInfoBuilder! setPackageName(String!);
-  }
-
-}
-
-package androidx.test.core.os {
-
-  public final class Parcelables {
-    method public static <T extends android.os.Parcelable> T! forceParcel(T!, android.os.Parcelable.Creator<T!>!);
-  }
-
-}
-
-package androidx.test.core.view {
-
-  public class MotionEventBuilder {
-    method public android.view.MotionEvent! build();
-    method public static androidx.test.core.view.MotionEventBuilder! newBuilder();
-    method public androidx.test.core.view.MotionEventBuilder! setAction(int);
-    method public androidx.test.core.view.MotionEventBuilder! setActionIndex(int);
-    method public androidx.test.core.view.MotionEventBuilder! setButtonState(int);
-    method public androidx.test.core.view.MotionEventBuilder! setDeviceId(int);
-    method public androidx.test.core.view.MotionEventBuilder! setDownTime(long);
-    method public androidx.test.core.view.MotionEventBuilder! setEdgeFlags(int);
-    method public androidx.test.core.view.MotionEventBuilder! setEventTime(long);
-    method public androidx.test.core.view.MotionEventBuilder! setFlags(int);
-    method public androidx.test.core.view.MotionEventBuilder! setMetaState(int);
-    method public androidx.test.core.view.MotionEventBuilder! setPointer(float, float);
-    method public androidx.test.core.view.MotionEventBuilder! setPointer(android.view.MotionEvent.PointerProperties!, android.view.MotionEvent.PointerCoords!);
-    method public androidx.test.core.view.MotionEventBuilder! setSource(int);
-    method public androidx.test.core.view.MotionEventBuilder! setXPrecision(float);
-    method public androidx.test.core.view.MotionEventBuilder! setYPrecision(float);
-  }
-
-  public class PointerCoordsBuilder {
-    method public android.view.MotionEvent.PointerCoords! build();
-    method public static androidx.test.core.view.PointerCoordsBuilder! newBuilder();
-    method public androidx.test.core.view.PointerCoordsBuilder! setCoords(float, float);
-    method public androidx.test.core.view.PointerCoordsBuilder! setOrientation(float);
-    method public androidx.test.core.view.PointerCoordsBuilder! setPressure(float);
-    method public androidx.test.core.view.PointerCoordsBuilder! setSize(float);
-    method public androidx.test.core.view.PointerCoordsBuilder! setTool(float, float);
-    method public androidx.test.core.view.PointerCoordsBuilder! setTouch(float, float);
-  }
-
-  public class PointerPropertiesBuilder {
-    method public android.view.MotionEvent.PointerProperties! build();
-    method public static androidx.test.core.view.PointerPropertiesBuilder! newBuilder();
-    method public androidx.test.core.view.PointerPropertiesBuilder! setId(int);
-    method public androidx.test.core.view.PointerPropertiesBuilder! setToolType(int);
-  }
-
-}
-
diff --git a/core/java/androidx/test/core/api/current_internal.txt b/core/java/androidx/test/core/api/current_internal.txt
new file mode 100644
index 000000000..ad1479406
--- /dev/null
+++ b/core/java/androidx/test/core/api/current_internal.txt
@@ -0,0 +1,26 @@
+// Signature format: 5.0
+package androidx.test.core.app {
+
+  public final class DeviceCapture {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static boolean canTakeScreenshot();
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static android.graphics.Bitmap takeScreenshotNoSync() throws java.lang.RuntimeException;
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+    method @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static void writeToTestStorage(android.graphics.Bitmap, androidx.test.platform.io.PlatformTestStorage testStorage, String name) throws java.io.IOException;
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public final class ViewCapture {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static suspend Object? forceRedraw(android.view.View, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/api/current_public.txt b/core/java/androidx/test/core/api/current_public.txt
new file mode 100644
index 000000000..8eee5532a
--- /dev/null
+++ b/core/java/androidx/test/core/api/current_public.txt
@@ -0,0 +1,123 @@
+// Signature format: 5.0
+package androidx.test.core.app {
+
+  public final class ActivityScenario<A extends android.app.Activity> implements java.lang.AutoCloseable java.io.Closeable {
+    method public void close();
+    method public android.app.Instrumentation.ActivityResult! getResult();
+    method public androidx.lifecycle.Lifecycle.State! getState();
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(android.content.Intent!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(android.content.Intent!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(Class<A>!);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launch(Class<A>!, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(android.content.Intent);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(android.content.Intent, android.os.Bundle?);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(Class<A>);
+    method public static <A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(Class<A>, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A>! moveToState(androidx.lifecycle.Lifecycle.State!);
+    method public androidx.test.core.app.ActivityScenario<A>! onActivity(androidx.test.core.app.ActivityScenario.ActivityAction<A>!);
+    method public androidx.test.core.app.ActivityScenario<A>! recreate();
+  }
+
+  public static interface ActivityScenario.ActivityAction<A extends android.app.Activity> {
+    method public void perform(A);
+  }
+
+  public final class ApplicationProvider {
+    method public static <T extends android.content.Context> T getApplicationContext();
+  }
+
+  public final class DeviceCapture {
+    method @kotlin.jvm.Throws(exceptionClasses=RuntimeException::class) public static android.graphics.Bitmap takeScreenshot() throws java.lang.RuntimeException;
+  }
+
+}
+
+package androidx.test.core.content.pm {
+
+  public final class ApplicationInfoBuilder {
+    method public android.content.pm.ApplicationInfo! build();
+    method public static androidx.test.core.content.pm.ApplicationInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setFlags(int);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setName(String?);
+    method public androidx.test.core.content.pm.ApplicationInfoBuilder! setPackageName(String!);
+  }
+
+  public final class PackageInfoBuilder {
+    method public androidx.test.core.content.pm.PackageInfoBuilder! addRequestedPermission(String!, int);
+    method public android.content.pm.PackageInfo! build();
+    method public static androidx.test.core.content.pm.PackageInfoBuilder! newBuilder();
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setApplicationInfo(android.content.pm.ApplicationInfo!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setPackageName(String!);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setVersionCode(long);
+    method public androidx.test.core.content.pm.PackageInfoBuilder! setVersionName(String!);
+  }
+
+}
+
+package androidx.test.core.graphics {
+
+  public final class BitmapStorage {
+    method @kotlin.jvm.Throws(exceptionClasses=IOException::class) public static void writeToTestStorage(android.graphics.Bitmap, String name) throws java.io.IOException;
+  }
+
+}
+
+package androidx.test.core.os {
+
+  public final class Parcelables {
+    method public static <T extends android.os.Parcelable> T forceParcel(T, android.os.Parcelable.Creator<T>!);
+  }
+
+}
+
+package androidx.test.core.view {
+
+  public class MotionEventBuilder {
+    method public android.view.MotionEvent! build();
+    method public static androidx.test.core.view.MotionEventBuilder! newBuilder();
+    method public androidx.test.core.view.MotionEventBuilder! setAction(int);
+    method public androidx.test.core.view.MotionEventBuilder! setActionIndex(int);
+    method public androidx.test.core.view.MotionEventBuilder! setButtonState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDeviceId(int);
+    method public androidx.test.core.view.MotionEventBuilder! setDownTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setEdgeFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setEventTime(long);
+    method public androidx.test.core.view.MotionEventBuilder! setFlags(int);
+    method public androidx.test.core.view.MotionEventBuilder! setMetaState(int);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(android.view.MotionEvent.PointerProperties!, android.view.MotionEvent.PointerCoords!);
+    method public androidx.test.core.view.MotionEventBuilder! setPointer(float, float);
+    method public androidx.test.core.view.MotionEventBuilder! setSource(int);
+    method public androidx.test.core.view.MotionEventBuilder! setXPrecision(float);
+    method public androidx.test.core.view.MotionEventBuilder! setYPrecision(float);
+  }
+
+  public class PointerCoordsBuilder {
+    method public android.view.MotionEvent.PointerCoords! build();
+    method public static androidx.test.core.view.PointerCoordsBuilder! newBuilder();
+    method public androidx.test.core.view.PointerCoordsBuilder! setCoords(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setOrientation(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setPressure(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setSize(float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTool(float, float);
+    method public androidx.test.core.view.PointerCoordsBuilder! setTouch(float, float);
+  }
+
+  public class PointerPropertiesBuilder {
+    method public android.view.MotionEvent.PointerProperties! build();
+    method public static androidx.test.core.view.PointerPropertiesBuilder! newBuilder();
+    method public androidx.test.core.view.PointerPropertiesBuilder! setId(int);
+    method public androidx.test.core.view.PointerPropertiesBuilder! setToolType(int);
+  }
+
+  public final class ViewCapture {
+    method public static suspend Object? captureToBitmap(android.view.View, optional android.graphics.Rect? rect, kotlin.coroutines.Continuation<? super android.graphics.Bitmap>);
+    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> captureToBitmapAsync(android.view.View, optional android.graphics.Rect? rect);
+  }
+
+  public final class WindowCapture {
+    method public static suspend Object? captureRegionToBitmap(android.view.Window, optional android.graphics.Rect? boundsInWindow, kotlin.coroutines.Continuation<? super android.graphics.Bitmap>);
+    method public static com.google.common.util.concurrent.ListenableFuture<android.graphics.Bitmap> captureRegionToBitmapAsync(android.view.Window, optional android.graphics.Rect? boundsInWindow);
+  }
+
+}
+
diff --git a/core/java/androidx/test/core/app/ActivityScenario.java b/core/java/androidx/test/core/app/ActivityScenario.java
index 31d59bf36..e82c603b1 100644
--- a/core/java/androidx/test/core/app/ActivityScenario.java
+++ b/core/java/androidx/test/core/app/ActivityScenario.java
@@ -23,14 +23,17 @@
 
 import android.app.Activity;
 import android.app.Instrumentation.ActivityResult;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Build.VERSION;
 import android.os.Bundle;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.provider.Settings;
-import androidx.annotation.Nullable;
 import android.util.Log;
 import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle.Event;
 import androidx.lifecycle.Lifecycle.State;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
@@ -40,6 +43,7 @@
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
 import androidx.test.runner.lifecycle.Stage;
+import androidx.tracing.Trace;
 import java.io.Closeable;
 import java.util.Arrays;
 import java.util.EnumMap;
@@ -58,8 +62,9 @@
  * <p>The ActivityScenario API uses {@link State} extensively. If you are unfamiliar with {@link
  * androidx.lifecycle} components, please read <a
  * href="https://developer.android.com/topic/libraries/architecture/lifecycle#lc">lifecycle</a>
- * before starting. It is crucial to understand the difference between {@link State} and {@link
- * Event}.
+ * before starting.
+ *
+ * <p>It is crucial to understand the difference between {@link State} and {@link Event}.
  *
  * <p>{@link ActivityScenario#moveToState(State)} allows you to transition your Activity's state to
  * {@link State#CREATED}, {@link State#STARTED}, {@link State#RESUMED}, or {@link State#DESTROYED}.
@@ -109,6 +114,7 @@
  *   }
  * }</pre>
  */
+@SuppressWarnings("NewApi") // suppress AutoCloseable usage error
 public final class ActivityScenario<A extends Activity> implements AutoCloseable, Closeable {
   private static final String TAG = ActivityScenario.class.getSimpleName();
 
@@ -184,6 +190,8 @@ private ActivityScenario(Class<A> activityClass) {
    *
    * <p>If you need to supply parameters to the start activity intent, use {@link #launch(Intent)}.
    *
+   * <p>If you need to get the activity result, use {@link #launchActivityForResult(Class)}.
+   *
    * <p>This method cannot be called from the main thread except in Robolectric tests.
    *
    * @param activityClass an activity class to launch
@@ -192,19 +200,20 @@ private ActivityScenario(Class<A> activityClass) {
    */
   public static <A extends Activity> ActivityScenario<A> launch(Class<A> activityClass) {
     ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(activityClass));
-    scenario.launchInternal(/*activityOptions=*/ null);
+    scenario.launchInternal(/*activityOptions=*/ null, /*launchActivityForResult=*/ false);
     return scenario;
   }
 
   /**
    * @see #launch(Class)
+   * @param activityClass an activity class to launch
    * @param activityOptions an activity options bundle to be passed along with the intent to start
    *     activity.
    */
   public static <A extends Activity> ActivityScenario<A> launch(
       Class<A> activityClass, @Nullable Bundle activityOptions) {
     ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(activityClass));
-    scenario.launchInternal(activityOptions);
+    scenario.launchInternal(activityOptions, /*launchActivityForResult=*/ false);
     return scenario;
   }
 
@@ -215,6 +224,8 @@ public static <A extends Activity> ActivityScenario<A> launch(
    * {@link Activity#finish} from your {@link Activity#onCreate}, the state is {@link
    * State#DESTROYED} when this method returns.
    *
+   * <p>If you need to get the activity result, use {@link #launchActivityForResult(Intent)}.
+   *
    * <p>This method cannot be called from the main thread except in Robolectric tests.
    *
    * @param startActivityIntent an intent to start the activity
@@ -223,19 +234,102 @@ public static <A extends Activity> ActivityScenario<A> launch(
    */
   public static <A extends Activity> ActivityScenario<A> launch(Intent startActivityIntent) {
     ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(startActivityIntent));
-    scenario.launchInternal(/*activityOptions=*/ null);
+    scenario.launchInternal(/*activityOptions=*/ null, /*launchActivityForResult=*/ false);
     return scenario;
   }
 
   /**
-   * @see #launch(Intent)
+   * Launches an activity by a given intent and activity options and constructs ActivityScenario
+   * with the activity. @see #launch(Intent)
+   *
+   * @param startActivityIntent an intent to start the activity
    * @param activityOptions an activity options bundle to be passed along with the intent to start
    *     activity.
    */
   public static <A extends Activity> ActivityScenario<A> launch(
       Intent startActivityIntent, @Nullable Bundle activityOptions) {
     ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(startActivityIntent));
-    scenario.launchInternal(activityOptions);
+    scenario.launchInternal(activityOptions, /*launchActivityForResult=*/ false);
+    return scenario;
+  }
+
+  /**
+   * Launches an activity of a given class and constructs ActivityScenario with the activity. Waits
+   * for the lifecycle state transitions to be complete. Typically the initial state of the activity
+   * is {@link State#RESUMED} but can be in another state. For instance, if your activity calls
+   * {@link Activity#finish} from your {@link Activity#onCreate}, the state is {@link
+   * State#DESTROYED} when this method returns. Broadcasts activity result.
+   *
+   * <p>If you need to supply parameters to the start activity intent, use {@link
+   * #launchActivityForResult(Intent)}.
+   *
+   * <p>This method cannot be called from the main thread except in Robolectric tests.
+   *
+   * @param activityClass an activity class to launch
+   * @throws AssertionError if the lifecycle state transition never completes within the timeout
+   * @return ActivityScenario which you can use to make further state transitions
+   */
+  @NonNull
+  public static <A extends Activity> ActivityScenario<A> launchActivityForResult(
+      @NonNull Class<A> activityClass) {
+    ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(activityClass));
+    scenario.launchInternal(/*activityOptions=*/ null, /*launchActivityForResult=*/ true);
+    return scenario;
+  }
+
+  /**
+   * Launches an activity of a given class and activity options and constructs ActivityScenario with
+   * the activity. @see #launchActivityForResult(Class)
+   *
+   * @param activityClass an activity class to launch
+   * @param activityOptions an activity options bundle to be passed along with the intent to start
+   *     activity.
+   */
+  @NonNull
+  public static <A extends Activity> ActivityScenario<A> launchActivityForResult(
+      @NonNull Class<A> activityClass, @Nullable Bundle activityOptions) {
+    ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(activityClass));
+    scenario.launchInternal(activityOptions, /*launchActivityForResult=*/ true);
+    return scenario;
+  }
+
+  /**
+   * Launches an activity by a given intent and constructs ActivityScenario with the activity. Waits
+   * for the lifecycle state transitions to be complete. Typically the initial state of the activity
+   * is {@link State#RESUMED} but can be in another state. For instance, if your activity calls
+   * {@link Activity#finish} from your {@link Activity#onCreate}, the state is {@link
+   * State#DESTROYED} when this method returns. Broadcasts activity result.
+   *
+   * <p>This method cannot be called from the main thread except in Robolectric tests.
+   *
+   * <p>If you are using AndroidX based activities, use androidx.activity.result.ActivityResult
+   * instead of this method. See https://developer.android.com/training/basics/intents/result#test
+   *
+   * @param startActivityIntent an intent to start the activity
+   * @throws AssertionError if the lifecycle state transition never completes within the timeout
+   * @return ActivityScenario which you can use to make further state transitions
+   */
+  @NonNull
+  public static <A extends Activity> ActivityScenario<A> launchActivityForResult(
+      @NonNull Intent startActivityIntent) {
+    ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(startActivityIntent));
+    scenario.launchInternal(/*activityOptions=*/ null, /*launchActivityForResult=*/ true);
+    return scenario;
+  }
+
+  /**
+   * Launches an activity by a given intent and constructs ActivityScenario with the activity. @see
+   * #launchActivityForResult(Intent)
+   *
+   * @param startActivityIntent an intent to start the activity
+   * @param activityOptions an activity options bundle to be passed along with the intent to start
+   *     activity.
+   */
+  @NonNull
+  public static <A extends Activity> ActivityScenario<A> launchActivityForResult(
+      @NonNull Intent startActivityIntent, @Nullable Bundle activityOptions) {
+    ActivityScenario<A> scenario = new ActivityScenario<>(checkNotNull(startActivityIntent));
+    scenario.launchInternal(activityOptions, /*launchActivityForResult=*/ true);
     return scenario;
   }
 
@@ -244,8 +338,9 @@ public static <A extends Activity> ActivityScenario<A> launch(
    * along with preconditions checks around device's configuration.
    *
    * @param activityOptions activity options bundle to be passed when launching this activity
+   * @param launchActivityForResult whether or not activity result code and data is needed
    */
-  private void launchInternal(@Nullable Bundle activityOptions) {
+  private void launchInternal(@Nullable Bundle activityOptions, boolean launchActivityForResult) {
     checkState(
         Settings.System.getInt(
                 getInstrumentation().getTargetContext().getContentResolver(),
@@ -255,21 +350,37 @@ private void launchInternal(@Nullable Bundle activityOptions) {
         "\"Don't keep activities\" developer options must be disabled for ActivityScenario");
 
     checkNotMainThread();
-    getInstrumentation().waitForIdleSync();
 
-    ActivityLifecycleMonitorRegistry.getInstance().addLifecycleCallback(activityLifecycleObserver);
+    Trace.beginSection("ActivityScenario launch");
+    try {
+      getInstrumentation().waitForIdleSync();
 
-    // prefer the single argument variant for startActivity for backwards compatibility with older
-    // Robolectric versions
-    if (activityOptions == null) {
-      activityInvoker.startActivity(startActivityIntent);
-    } else {
-      activityInvoker.startActivity(startActivityIntent, activityOptions);
-    }
+      ActivityLifecycleMonitorRegistry.getInstance()
+          .addLifecycleCallback(activityLifecycleObserver);
 
-    // Accept any steady states. An activity may start another activity in its onCreate method. Such
-    // an activity goes back to created or started state immediately after it is resumed.
-    waitForActivityToBecomeAnyOf(STEADY_STATES.values().toArray(new State[0]));
+      // prefer the single argument variant for startActivity for backwards compatibility with older
+      // Robolectric versions
+      if (activityOptions == null) {
+        if (launchActivityForResult) {
+          activityInvoker.startActivityForResult(startActivityIntent);
+        } else {
+          activityInvoker.startActivity(startActivityIntent);
+        }
+      } else {
+        if (launchActivityForResult) {
+          activityInvoker.startActivityForResult(startActivityIntent, activityOptions);
+        } else {
+          activityInvoker.startActivity(startActivityIntent, activityOptions);
+        }
+      }
+
+      // Accept any steady states. An activity may start another activity in its onCreate method.
+      // Such
+      // an activity goes back to created or started state immediately after it is resumed.
+      waitForActivityToBecomeAnyOf(STEADY_STATES.values().toArray(new State[0]));
+    } finally {
+      Trace.endSection();
+    }
   }
 
   /**
@@ -305,9 +416,14 @@ private void launchInternal(@Nullable Bundle activityOptions) {
    */
   @Override
   public void close() {
-    moveToState(State.DESTROYED);
-    ActivityLifecycleMonitorRegistry.getInstance()
-        .removeLifecycleCallback(activityLifecycleObserver);
+    Trace.beginSection("ActivityScenario close");
+    try {
+      moveToState(State.DESTROYED);
+      ActivityLifecycleMonitorRegistry.getInstance()
+          .removeLifecycleCallback(activityLifecycleObserver);
+    } finally {
+      Trace.endSection();
+    }
   }
 
   /**
@@ -325,12 +441,12 @@ private void waitForActivityToBecomeAnyOf(State... expectedStates) {
         return;
       }
 
-      long now = System.currentTimeMillis();
+      long now = SystemClock.elapsedRealtime();
       long deadline = now + TIMEOUT_MILLISECONDS;
       while (now < deadline
           && !expectedStateSet.contains(STEADY_STATES.get(currentActivityStage))) {
         stateChangedCondition.await(deadline - now, TimeUnit.MILLISECONDS);
-        now = System.currentTimeMillis();
+        now = SystemClock.elapsedRealtime();
       }
 
       if (!expectedStateSet.contains(STEADY_STATES.get(currentActivityStage))) {
@@ -443,7 +559,11 @@ private static boolean activityMatchesIntent(
     if (!equals(startActivityIntent.getType(), activityIntent.getType())) {
       return false;
     }
-    if (!equals(startActivityIntent.getPackage(), activityIntent.getPackage())) {
+    boolean isActivityInSamePackage =
+        hasPackageEquivalentComponent(startActivityIntent)
+            && hasPackageEquivalentComponent(activityIntent);
+    if (!isActivityInSamePackage
+        && !equals(startActivityIntent.getPackage(), activityIntent.getPackage())) {
       return false;
     }
     if (startActivityIntent.getComponent() != null) {
@@ -463,6 +583,20 @@ private static boolean activityMatchesIntent(
     return true;
   }
 
+  /**
+   * Return {@code true} if the component name is not null and is in the same package that this
+   * intent limited to. otherwise return {@code false}. Note: this code is copied from {@code
+   * Intent#hasPackageEquivalentComponent}.
+   */
+  private static boolean hasPackageEquivalentComponent(Intent intent) {
+    ComponentName componentName = intent.getComponent();
+    String packageName = intent.getPackage();
+    // packageName may be null when the resolved Activity is in the same package to this
+    // running process.
+    return componentName != null
+        && (packageName == null || packageName.equals(componentName.getPackageName()));
+  }
+
   // reimplementation of Objects.equals since it is only available on APIs >= 19
   private static boolean equals(Object a, Object b) {
     return (a == b) || (a != null && a.equals(b));
@@ -585,11 +719,11 @@ public ActivityScenario<A> recreate() {
     activityInvoker.recreateActivity(prevActivityState.activity);
 
     ActivityState<A> activityState;
-    long now = System.currentTimeMillis();
+    long now = SystemClock.elapsedRealtime();
     long deadline = now + TIMEOUT_MILLISECONDS;
     do {
       waitForActivityToBecomeAnyOf(State.RESUMED);
-      now = System.currentTimeMillis();
+      now = SystemClock.elapsedRealtime();
       activityState = getCurrentActivityState();
     } while (now < deadline && activityState.activity == prevActivityState.activity);
     if (activityState.activity == prevActivityState.activity) {
@@ -679,18 +813,24 @@ public ActivityScenario<A> onActivity(final ActivityAction<A> action) {
   /**
    * Waits for the activity to be finished and returns the activity result.
    *
+   * <p>ActivityScenario.launchActivityForResult() must be used to launch an Activity before this
+   * method is called.
+   *
    * <p>Note: This method doesn't call {@link Activity#finish()}. The activity must be finishing or
    * finished otherwise this method will throws runtime exception after the timeout.
    *
    * <pre>{@code
    * Example:
-   *   ActivityScenario<MyActivity> scenario = ActivityScenario.launch(MyActivity.class);
+   *   ActivityScenario<MyActivity> scenario =
+   *      ActivityScenario.launchActivityForResult(MyActivity.class);
    *   // Let's say MyActivity has a button that finishes itself.
    *   onView(withId(R.id.finish_button)).perform(click());
    *   assertThat(scenario.getResult().getResultCode()).isEqualTo(Activity.RESULT_OK);
    * }</pre>
    *
    * @return activity result of the activity that managed by this scenario class.
+   * @throws IllegalStateException when you call this method with an Activity that was not started
+   *     by {@link #launchActivityForResult}
    */
   public ActivityResult getResult() {
     return activityInvoker.getActivityResult();
diff --git a/core/java/androidx/test/core/app/ApplicationProvider.java b/core/java/androidx/test/core/app/ApplicationProvider.java
index eaa8f311e..28587a08a 100644
--- a/core/java/androidx/test/core/app/ApplicationProvider.java
+++ b/core/java/androidx/test/core/app/ApplicationProvider.java
@@ -31,9 +31,9 @@ public final class ApplicationProvider {
   private ApplicationProvider() {}
 
   /**
-   * Returns the application {@link Context} for the application under test.
+   * Returns the application {@link android.content.Context} for the application under test.
    *
-   * @see {@link Context#getApplicationContext()}
+   * @see Context#getApplicationContext()
    */
   @SuppressWarnings("unchecked")
   public static <T extends Context> T getApplicationContext() {
diff --git a/core/java/androidx/test/core/app/DeviceCapture.kt b/core/java/androidx/test/core/app/DeviceCapture.kt
new file mode 100644
index 000000000..033efcdad
--- /dev/null
+++ b/core/java/androidx/test/core/app/DeviceCapture.kt
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("DeviceCapture")
+
+package androidx.test.core.app
+
+import android.app.UiAutomation
+import android.graphics.Bitmap
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.view.Choreographer
+import androidx.annotation.RestrictTo
+import androidx.test.core.internal.os.HandlerExecutor
+import androidx.test.core.view.forceRedraw
+import androidx.test.internal.util.Checks
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.platform.graphics.HardwareRendererCompat
+import androidx.test.platform.view.inspector.WindowInspectorCompat
+import java.lang.RuntimeException
+import kotlin.coroutines.resumeWithException
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.coroutines.withTimeout
+
+/**
+ * Returns false if calling [takeScreenshot] will fail.
+ *
+ * Taking a screenshot requires [UiAutomation] and can only be called off of the main thread. If
+ * this method returns false then attempting to take a screenshot will fail. Note that taking a
+ * screenshot may still fail if this method returns true, for example if the call to [UiAutomation]
+ * fails.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+fun canTakeScreenshot(): Boolean =
+  getInstrumentation().uiAutomation != null && Looper.myLooper() != Looper.getMainLooper()
+
+/**
+ * Captures an image of the device's screen into a [Bitmap].
+ *
+ * This is essentially a wrapper for [UIAutomation#takeScreenshot()] that attempts to get a stable
+ * screenshot by forcing all the current application's root window views to redraw, and also handles
+ * cases where hardware renderer drawing is disabled.
+ *
+ * This API is intended for use cases like debugging where an image of the entire screen is needed.
+ * For use cases where the image will be used for validation, its recommended to take a more
+ * isolated, targeted screenshot of a specific view or compose node. See
+ * [androidx.test.core.view.captureToBitmap], [androidx.test.espresso.screenshot.captureToBitmap]
+ * and [androidx.compose.ui.test.captureToImage].
+ *
+ * This API does not support concurrent usage.
+ *
+ * This API is currently experimental and subject to change or removal.
+ *
+ * @return a [Bitmap] that contains the image
+ * @throws [IllegalStateException] if called on the main thread. This is a limitation of connecting
+ *   to UiAutomation, [RuntimeException] if UiAutomation fails to take the screenshot
+ */
+@Suppress("FutureReturnValueIgnored")
+@Throws(RuntimeException::class)
+fun takeScreenshot(): Bitmap {
+  getInstrumentation().waitForIdleSync()
+  return takeScreenshotNoSync()
+}
+
+/**
+ * An internal variant of [takeScreenshot] that skips an idle sync call.
+ *
+ * This intended for failure handling cases where caller does not want to wait for main thread to be
+ * idle.
+ *
+ * @return a [Bitmap]
+ * @throws [IllegalStateException] if called on the main thread. This is a limitation of connecting
+ *   to UiAutomation, [RuntimeException] if UiAutomation fails to take the screenshot
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@Suppress("FutureReturnValueIgnored")
+@Throws(RuntimeException::class)
+fun takeScreenshotNoSync(): Bitmap {
+  Checks.checkState(canTakeScreenshot())
+
+  var bitmap: Bitmap? = null
+  var exception: Exception? = null
+  val mainHandlerDispatcher =
+    HandlerExecutor(Handler(Looper.getMainLooper())).asCoroutineDispatcher()
+  val uiAutomation = getInstrumentation().uiAutomation
+  if (uiAutomation == null) {
+    throw RuntimeException("uiautomation is null")
+  }
+
+  val hardwareDrawingEnabled = HardwareRendererCompat.isDrawingEnabled()
+  HardwareRendererCompat.setDrawingEnabled(true)
+
+  return runBlocking(mainHandlerDispatcher) {
+    withTimeout(5.seconds) {
+      forceRedrawGlobalWindowViews()
+      bitmap = takeScreenshotOnNextFrame(uiAutomation, hardwareDrawingEnabled)
+      exception?.let { throw it }
+      bitmap!!
+    }
+  }
+}
+
+private suspend fun forceRedrawGlobalWindowViews() {
+  val views = WindowInspectorCompat.getGlobalWindowViews()
+  Log.d("DeviceCapture", "Found ${views.size} global views to redraw")
+  for (view in views) {
+    view.forceRedraw()
+  }
+}
+
+private suspend fun takeScreenshotOnNextFrame(
+  uiAutomation: UiAutomation,
+  hardwareDrawingEnabled: Boolean,
+): Bitmap {
+  // wait on the next frame to increase probability the draw from previous step is
+  // committed
+  // TODO(b/289244795): use a transaction callback instead
+
+  return suspendCancellableCoroutine<Bitmap> { cont ->
+    Choreographer.getInstance().postFrameCallback {
+      // do multiple retries of uiAutomation.takeScreenshot because it is known to return null
+      // on API 31+ b/257274080
+      var bitmap: Bitmap? = null
+      for (i in 1..3) {
+        bitmap = uiAutomation.takeScreenshot()
+        if (bitmap != null) {
+          Log.i("DeviceCapture", "got bitmap, returning")
+          break
+        }
+      }
+      HardwareRendererCompat.setDrawingEnabled(hardwareDrawingEnabled)
+      if (bitmap == null) {
+        Log.w("DeviceCapture", "failed to get bitmap, returning exception")
+        cont.resumeWithException(RuntimeException("uiAutomation.takeScreenshot returned null"))
+      } else {
+        cont.resume(bitmap, {})
+      }
+    }
+  }
+}
diff --git a/core/java/androidx/test/core/app/InstrumentationActivityInvoker.java b/core/java/androidx/test/core/app/InstrumentationActivityInvoker.java
index 896666ef9..dbaa81c6c 100644
--- a/core/java/androidx/test/core/app/InstrumentationActivityInvoker.java
+++ b/core/java/androidx/test/core/app/InstrumentationActivityInvoker.java
@@ -16,12 +16,14 @@
 
 package androidx.test.core.app;
 
+import static android.app.ActivityOptions.MODE_BACKGROUND_ACTIVITY_START_ALLOWED;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.internal.util.Checks.checkNotNull;
 import static androidx.test.internal.util.Checks.checkState;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.app.Instrumentation.ActivityResult;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
@@ -31,9 +33,11 @@
 import android.content.IntentSender;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import androidx.test.internal.platform.app.ActivityInvoker;
 import androidx.test.internal.platform.app.ActivityLifecycleTimeout;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
@@ -114,9 +118,6 @@ class InstrumentationActivityInvoker implements ActivityInvoker {
   private static final String FINISH_EMPTY_ACTIVITIES =
       "androidx.test.core.app.InstrumentationActivityInvoker.FINISH_EMPTY_ACTIVITIES";
 
-  // TODO(b/176898246): Update to PendingIntent.FLAG_MUTABLE once available
-  private static final int FLAG_MUTABLE = 1 << 25;
-
   /**
    * BootstrapActivity starts a test target activity specified by the extras bundle with key {@link
    * #TARGET_ACTIVITY_INTENT_KEY} in the intent that starts this bootstrap activity. The target
@@ -142,7 +143,7 @@ public void onReceive(Context context, Intent intent) {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
       super.onCreate(savedInstanceState);
-      registerReceiver(receiver, new IntentFilter(FINISH_BOOTSTRAP_ACTIVITY));
+      registerBroadcastReceiver(this, receiver, new IntentFilter(FINISH_BOOTSTRAP_ACTIVITY));
 
       isTargetActivityStarted =
           (savedInstanceState != null
@@ -167,9 +168,11 @@ protected void onResume() {
         isTargetActivityStarted = true;
         PendingIntent startTargetActivityIntent =
             checkNotNull(getIntent().getParcelableExtra(TARGET_ACTIVITY_INTENT_KEY));
-        Bundle options = getIntent().getBundleExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY);
+        Bundle options =
+            optInToGrantBalPrivileges(
+                getIntent().getBundleExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY));
         try {
-          if (options == null || Build.VERSION.SDK_INT < 16) {
+          if (options == null) {
             // Override and disable FLAG_ACTIVITY_NEW_TASK flag by flagsMask and flagsValue.
             // PendingIntentRecord#sendInner() will mask the original intent flag with the flagsMask
             // then override those bits with the new flagsValue specified here. This override is
@@ -269,7 +272,7 @@ public void onReceive(Context context, Intent intent) {
           };
       IntentFilter intentFilter = new IntentFilter(BOOTSTRAP_ACTIVITY_RESULT_RECEIVED);
       intentFilter.addAction(CANCEL_ACTIVITY_RESULT_WAITER);
-      context.registerReceiver(receiver, intentFilter);
+      registerBroadcastReceiver(context, receiver, intentFilter);
     }
 
     /**
@@ -286,7 +289,7 @@ public ActivityResult getActivityResult() {
       }
       checkNotNull(
           activityResult,
-          "onActivityResult never be called after %d milliseconds",
+          "onActivityResult was not called within %d milliseconds",
           ActivityLifecycleTimeout.getMillis());
       return activityResult;
     }
@@ -315,7 +318,7 @@ public void onReceive(Context context, Intent intent) {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
       super.onCreate(savedInstanceState);
-      registerReceiver(receiver, new IntentFilter(FINISH_EMPTY_ACTIVITIES));
+      registerBroadcastReceiver(this, receiver, new IntentFilter(FINISH_EMPTY_ACTIVITIES));
 
       // disable starting animations
       overridePendingTransition(0, 0);
@@ -364,7 +367,7 @@ public void onReceive(Context context, Intent intent) {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
       super.onCreate(savedInstanceState);
-      registerReceiver(receiver, new IntentFilter(FINISH_EMPTY_ACTIVITIES));
+      registerBroadcastReceiver(this, receiver, new IntentFilter(FINISH_EMPTY_ACTIVITIES));
 
       // disable starting animations
       overridePendingTransition(0, 0);
@@ -406,8 +409,48 @@ public void startActivity(Intent intent, @Nullable Bundle activityOptions) {
     getApplicationContext().sendBroadcast(new Intent(FINISH_BOOTSTRAP_ACTIVITY));
     getApplicationContext().sendBroadcast(new Intent(FINISH_EMPTY_ACTIVITIES));
 
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+    if (Build.VERSION.SDK_INT < 28) {
+      if (activityOptions != null) {
+        throw new IllegalStateException(
+            "Starting an activity with activityOptions is not supported on APIs below 28.");
+      } else {
+        getInstrumentation().startActivitySync(intent);
+      }
+    } else {
+      getInstrumentation().startActivitySync(intent, activityOptions);
+    }
+  }
+
+  @Override
+  public void startActivity(Intent intent) {
+    startActivity(intent, null);
+  }
+
+  /** Starts an Activity using the given intent. */
+  @Override
+  public void startActivityForResult(Intent intent, @Nullable Bundle activityOptionsBundle) {
+    // make sure the intent can resolve an activity
+    ActivityInfo ai = intent.resolveActivityInfo(getApplicationContext().getPackageManager(), 0);
+    if (ai == null) {
+      throw new IllegalStateException("Unable to resolve activity for: " + intent);
+    }
+    // Close empty activities and bootstrap activity if it's running. This might happen if the
+    // previous test crashes before it cleans up the state.
+    getApplicationContext().sendBroadcast(new Intent(FINISH_BOOTSTRAP_ACTIVITY));
+    getApplicationContext().sendBroadcast(new Intent(FINISH_EMPTY_ACTIVITIES));
+
     activityResultWaiter = new ActivityResultWaiter(getApplicationContext());
 
+    activityOptionsBundle = optInToGrantBalPrivileges(activityOptionsBundle);
+
+    // make an immutable intent if its implicit
+    int intentMutability =
+        intent.getPackage() == null && intent.getComponent() == null
+            ? PendingIntent.FLAG_IMMUTABLE
+            : PendingIntent.FLAG_MUTABLE;
+
     // Note: Instrumentation.startActivitySync(Intent) cannot be used here because BootstrapActivity
     // may start in different process. Also, we use PendingIntent because the target activity may
     // set "exported" attribute to false so that it prohibits starting the activity outside of their
@@ -419,27 +462,43 @@ public void startActivity(Intent intent, @Nullable Bundle activityOptions) {
                 TARGET_ACTIVITY_INTENT_KEY,
                 PendingIntent.getActivity(
                     getApplicationContext(),
-                    /*requestCode=*/ 0,
+                    /* requestCode= */ 0,
                     intent,
-                    /*flags=*/ PendingIntent.FLAG_UPDATE_CURRENT | FLAG_MUTABLE))
-            .putExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY, activityOptions);
+                    /* flags= */ PendingIntent.FLAG_UPDATE_CURRENT | intentMutability))
+            .putExtra(TARGET_ACTIVITY_OPTIONS_BUNDLE_KEY, activityOptionsBundle);
 
-    if (Build.VERSION.SDK_INT < 16) {
-      // activityOptions not supported
-      getApplicationContext().startActivity(bootstrapIntent);
-    } else {
-      getApplicationContext().startActivity(bootstrapIntent, activityOptions);
+    getApplicationContext().startActivity(bootstrapIntent, activityOptionsBundle);
+  }
+
+  private static Bundle optInToGrantBalPrivileges(Bundle activityOptionsBundle) {
+    if (VERSION.SDK_INT < VERSION_CODES.UPSIDE_DOWN_CAKE) {
+      return activityOptionsBundle;
+    }
+    // Initialize a bundle to grant this activities start privilege.
+    Bundle updatedActivityOptions =
+        ActivityOptions.makeBasic()
+            .setPendingIntentBackgroundActivityStartMode(MODE_BACKGROUND_ACTIVITY_START_ALLOWED)
+            .toBundle();
+    // Merge the bundle with the one passed in. This allows overriding the start mode if desired.
+    if (activityOptionsBundle != null) {
+      updatedActivityOptions.putAll(activityOptionsBundle);
     }
+    return updatedActivityOptions;
   }
 
   @Override
-  public void startActivity(Intent intent) {
-    startActivity(intent, null);
+  public void startActivityForResult(Intent intent) {
+    startActivityForResult(intent, null);
   }
 
   @Override
   public ActivityResult getActivityResult() {
-    return checkNotNull(activityResultWaiter, "You must start Activity first").getActivityResult();
+    if (activityResultWaiter == null) {
+      throw new IllegalStateException(
+          "You must start Activity first. Make sure you are using launchActivityForResult() to"
+              + " launch an Activity.");
+    }
+    return activityResultWaiter.getActivityResult();
   }
 
   /** Resumes the tested activity by finishing empty activities. */
@@ -468,8 +527,8 @@ public void onReceive(Context context, Intent intent) {
             latch.countDown();
           }
         };
-    getApplicationContext()
-        .registerReceiver(receiver, new IntentFilter(EMPTY_FLOATING_ACTIVITY_RESUMED));
+    registerBroadcastReceiver(
+        getApplicationContext(), receiver, new IntentFilter(EMPTY_FLOATING_ACTIVITY_RESUMED));
 
     // Starting an arbitrary Activity (android:windowIsFloating = true) forces the tested Activity
     // to the paused state.
@@ -481,7 +540,7 @@ public void onReceive(Context context, Intent intent) {
     try {
       latch.await(ActivityLifecycleTimeout.getMillis(), TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
-      throw new AssertionError("Failed to pause activity", e);
+      throw new RuntimeException("Failed to pause activity", e);
     } finally {
       getApplicationContext().unregisterReceiver(receiver);
     }
@@ -503,7 +562,8 @@ public void onReceive(Context context, Intent intent) {
             latch.countDown();
           }
         };
-    getApplicationContext().registerReceiver(receiver, new IntentFilter(EMPTY_ACTIVITY_RESUMED));
+    registerBroadcastReceiver(
+        getApplicationContext(), receiver, new IntentFilter(EMPTY_ACTIVITY_RESUMED));
 
     // Starting an arbitrary Activity (android:windowIsFloating = false) forces the tested Activity
     // to the stopped state.
@@ -514,7 +574,7 @@ public void onReceive(Context context, Intent intent) {
     try {
       latch.await(ActivityLifecycleTimeout.getMillis(), TimeUnit.MILLISECONDS);
     } catch (InterruptedException e) {
-      throw new AssertionError("Failed to stop activity", e);
+      throw new RuntimeException("Failed to stop activity", e);
     } finally {
       getApplicationContext().unregisterReceiver(receiver);
     }
@@ -549,11 +609,15 @@ public void finishActivity(Activity activity) {
     // for the API level above 19.
     startEmptyActivitySync();
     getInstrumentation().runOnMainSync(activity::finish);
-    getApplicationContext().sendBroadcast(new Intent(FINISH_BOOTSTRAP_ACTIVITY));
-    startEmptyActivitySync();
-    getInstrumentation().runOnMainSync(activity::finish);
+    if (activityResultWaiter != null) {
+      getApplicationContext().sendBroadcast(new Intent(FINISH_BOOTSTRAP_ACTIVITY));
+      startEmptyActivitySync();
+      getInstrumentation().runOnMainSync(activity::finish);
+    }
     getApplicationContext().sendBroadcast(new Intent(FINISH_EMPTY_ACTIVITIES));
-    getApplicationContext().sendBroadcast(new Intent(CANCEL_ACTIVITY_RESULT_WAITER));
+    if (activityResultWaiter != null) {
+      getApplicationContext().sendBroadcast(new Intent(CANCEL_ACTIVITY_RESULT_WAITER));
+    }
   }
 
   private static void checkActivityStageIsIn(Activity activity, Stage... expected) {
@@ -573,4 +637,13 @@ private static void checkActivityStageIsIn(Activity activity, Set<Stage> expecte
                   stage);
             });
   }
+
+  private static void registerBroadcastReceiver(
+      Context context, BroadcastReceiver broadcastReceiver, IntentFilter intentFilter) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+      context.registerReceiver(broadcastReceiver, intentFilter);
+    } else {
+      context.registerReceiver(broadcastReceiver, intentFilter, Context.RECEIVER_EXPORTED);
+    }
+  }
 }
diff --git a/core/java/androidx/test/core/app/ListFuture.java b/core/java/androidx/test/core/app/ListFuture.java
new file mode 100644
index 000000000..b154ac7be
--- /dev/null
+++ b/core/java/androidx/test/core/app/ListFuture.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.core.app;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
+import androidx.test.platform.concurrent.DirectExecutor;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * The Class is based on the ListFuture in Guava and to use the CallbackToFutureAdapter instead of
+ * the AbstractFuture.
+ *
+ * <p>Class that implements {@link Futures#allAsList(Collection)} and {@link
+ * Futures#successfulAsList(Collection)}. The idea is to create a (null-filled) List and register a
+ * listener with each component future to fill out the value in the List when that future completes.
+ *
+ * <p>This is a temporary fork of androidx.camera.core.impl.utils.futures.ListFuture. It will be
+ * removed in a future change in favor of using coroutines.
+ */
+class ListFuture<V> implements ListenableFuture<List<V>> {
+  @Nullable List<? extends ListenableFuture<? extends V>> mFutures;
+  @Nullable List<V> mValues;
+  private final boolean mAllMustSucceed;
+  @NonNull private final AtomicInteger mRemaining;
+  @NonNull private final ListenableFuture<List<V>> mResult;
+  CallbackToFutureAdapter.Completer<List<V>> mResultNotifier;
+
+  /**
+   * Constructor.
+   *
+   * @param futures all the futures to build the list from
+   * @param allMustSucceed whether a single failure or cancellation should propagate to this future
+   * @param listenerExecutor used to run listeners on all the passed in futures.
+   */
+  ListFuture(
+      @NonNull List<? extends ListenableFuture<? extends V>> futures,
+      boolean allMustSucceed,
+      @NonNull Executor listenerExecutor) {
+    mFutures = checkNotNull(futures);
+    mValues = new ArrayList<>(futures.size());
+    mAllMustSucceed = allMustSucceed;
+    mRemaining = new AtomicInteger(futures.size());
+    mResult =
+        CallbackToFutureAdapter.getFuture(
+            new CallbackToFutureAdapter.Resolver<List<V>>() {
+              @Override
+              public Object attachCompleter(
+                  @NonNull CallbackToFutureAdapter.Completer<List<V>> completer) {
+                checkState(mResultNotifier == null, "The result can only set once!");
+                mResultNotifier = completer;
+                return "ListFuture[" + this + "]";
+              }
+            });
+
+    init(listenerExecutor);
+  }
+
+  private void init(@NonNull Executor listenerExecutor) {
+    // First, schedule cleanup to execute when the Future is done.
+    addListener(
+        new Runnable() {
+          @Override
+          public void run() {
+            // By now the mValues array has either been set as the Future's value,
+            // or (in case of failure) is no longer useful.
+            ListFuture.this.mValues = null;
+
+            // Let go of the memory held by other mFutures
+            ListFuture.this.mFutures = null;
+          }
+        },
+        directExecutor());
+
+    // Now begin the "real" initialization.
+
+    // Corner case: List is empty.
+    if (mFutures.isEmpty()) {
+      mResultNotifier.set(new ArrayList<>(mValues));
+      return;
+    }
+
+    // Populate the results list with null initially.
+    for (int i = 0; i < mFutures.size(); ++i) {
+      mValues.add(null);
+    }
+
+    // Register a listener on each Future in the list to update
+    // the state of this future.
+    // Note that if all the mFutures on the list are done prior to completing
+    // this loop, the last call to addListener() will callback to
+    // setOneValue(), transitively call our cleanup listener, and set
+    // mFutures to null.
+    // We store a reference to mFutures to avoid the NPE.
+    List<? extends ListenableFuture<? extends V>> localFutures = mFutures;
+    for (int i = 0; i < localFutures.size(); i++) {
+      final ListenableFuture<? extends V> listenable = localFutures.get(i);
+      final int index = i;
+      listenable.addListener(
+          new Runnable() {
+            @Override
+            public void run() {
+              setOneValue(index, listenable);
+            }
+          },
+          listenerExecutor);
+    }
+  }
+
+  private static Executor directExecutor() {
+    return DirectExecutor.INSTANCE;
+  }
+
+  /** Sets the value at the given index to that of the given future. */
+  void setOneValue(int index, @NonNull Future<? extends V> future) {
+    List<V> localValues = mValues;
+    if (isDone() || localValues == null) {
+      // Some other future failed or has been cancelled, causing this one to
+      // also be cancelled or have an exception set. This should only happen
+      // if mAllMustSucceed is true.
+      checkState(mAllMustSucceed, "Future was done before all dependencies completed");
+      return;
+    }
+
+    try {
+      checkState(future.isDone(), "Tried to set value from future which is not done");
+      localValues.set(index, getUninterruptibly(future));
+    } catch (CancellationException e) {
+      if (mAllMustSucceed) {
+        // Set ourselves as cancelled. Let the input futures keep running
+        // as some of them may be used elsewhere.
+        // (Currently we don't override interruptTask, so
+        // mayInterruptIfRunning==false isn't technically necessary.)
+        cancel(false);
+      }
+    } catch (ExecutionException e) {
+      if (mAllMustSucceed) {
+        // As soon as the first one fails, throw the exception up.
+        // The mResult of all other inputs is then ignored.
+        mResultNotifier.setException(e.getCause());
+      }
+    } catch (RuntimeException e) {
+      if (mAllMustSucceed) {
+        mResultNotifier.setException(e);
+      }
+    } catch (Error e) {
+      // Propagate errors up ASAP - our superclass will rethrow the error
+      mResultNotifier.setException(e);
+    } finally {
+      int newRemaining = mRemaining.decrementAndGet();
+      checkState(newRemaining >= 0, "Less than 0 remaining futures");
+      if (newRemaining == 0) {
+        localValues = mValues;
+        if (localValues != null) {
+          mResultNotifier.set(new ArrayList<>(localValues));
+        } else {
+          checkState(isDone());
+        }
+      }
+    }
+  }
+
+  @Override
+  public void addListener(@NonNull Runnable listener, @NonNull Executor executor) {
+    mResult.addListener(listener, executor);
+  }
+
+  @Override
+  public boolean cancel(boolean mayInterruptIfRunning) {
+    if (mFutures != null) {
+      for (ListenableFuture<? extends V> f : mFutures) {
+        f.cancel(mayInterruptIfRunning);
+      }
+    }
+
+    return mResult.cancel(mayInterruptIfRunning);
+  }
+
+  @Override
+  public boolean isCancelled() {
+    return mResult.isCancelled();
+  }
+
+  @Override
+  public boolean isDone() {
+    return mResult.isDone();
+  }
+
+  @Override
+  @Nullable
+  public List<V> get() throws InterruptedException, ExecutionException {
+    callAllGets();
+
+    // This may still block in spite of the calls above, as the listeners may
+    // be scheduled for execution in other threads.
+    return mResult.get();
+  }
+
+  @Override
+  public List<V> get(long timeout, @NonNull TimeUnit unit)
+      throws InterruptedException, ExecutionException, TimeoutException {
+    return mResult.get(timeout, unit);
+  }
+
+  /**
+   * Calls the get method of all dependency futures to work around a bug in some ListenableFutures
+   * where the listeners aren't called until get() is called.
+   */
+  private void callAllGets() throws InterruptedException {
+    List<? extends ListenableFuture<? extends V>> oldFutures = mFutures;
+    if (oldFutures != null && !isDone()) {
+      for (ListenableFuture<? extends V> future : oldFutures) {
+        // We wait for a little while for the future, but if it's not done,
+        // we check that no other futures caused a cancellation or failure.
+        // This can introduce a delay of up to 10ms in reporting an exception.
+        while (!future.isDone()) {
+          try {
+            future.get();
+          } catch (Error e) {
+            throw e;
+          } catch (InterruptedException e) {
+            throw e;
+          } catch (Throwable e) {
+            // ExecutionException / CancellationException / RuntimeException
+            if (mAllMustSucceed) {
+              return;
+            } else {
+              continue;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Invokes {@code Future.}{@link Future#get() get()} uninterruptibly.
+   *
+   * @throws ExecutionException if the computation threw an exception
+   * @throws CancellationException if the computation was cancelled
+   */
+  @Nullable
+  private static <V> V getUninterruptibly(@NonNull Future<V> future) throws ExecutionException {
+    boolean interrupted = false;
+    try {
+      while (true) {
+        try {
+          return future.get();
+        } catch (InterruptedException e) {
+          interrupted = true;
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+}
diff --git a/core/java/androidx/test/core/content/pm/ApplicationInfoBuilder.java b/core/java/androidx/test/core/content/pm/ApplicationInfoBuilder.java
index 835591a7b..d5953cd32 100644
--- a/core/java/androidx/test/core/content/pm/ApplicationInfoBuilder.java
+++ b/core/java/androidx/test/core/content/pm/ApplicationInfoBuilder.java
@@ -24,6 +24,7 @@
 public final class ApplicationInfoBuilder {
   @Nullable private String name;
   @Nullable private String packageName;
+  private int flags = 0;
 
   private ApplicationInfoBuilder() {}
 
@@ -58,11 +59,22 @@ public ApplicationInfoBuilder setName(@Nullable String name) {
     return this;
   }
 
+  /**
+   * Sets the flags.
+   *
+   * @see ApplicationInfo#flags
+   */
+  public ApplicationInfoBuilder setFlags(int flags) {
+    this.flags = flags;
+    return this;
+  }
+
   /** Returns a {@link ApplicationInfo} with the provided data. */
   public ApplicationInfo build() {
     checkNotNull(packageName, "Mandatory field 'packageName' missing.");
 
     ApplicationInfo applicationInfo = new ApplicationInfo();
+    applicationInfo.flags = flags;
     applicationInfo.name = name;
     applicationInfo.packageName = packageName;
 
diff --git a/core/java/androidx/test/core/content/pm/PackageInfoBuilder.java b/core/java/androidx/test/core/content/pm/PackageInfoBuilder.java
index f01e75a3b..bc8bd2e7d 100644
--- a/core/java/androidx/test/core/content/pm/PackageInfoBuilder.java
+++ b/core/java/androidx/test/core/content/pm/PackageInfoBuilder.java
@@ -18,14 +18,22 @@
 import static androidx.test.internal.util.Checks.checkNotNull;
 import static androidx.test.internal.util.Checks.checkState;
 
+import android.annotation.TargetApi;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
+import android.os.Build;
 import androidx.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
 
 /** Builder for {@link PackageInfo}. */
 public final class PackageInfoBuilder {
   @Nullable private String packageName;
   @Nullable private ApplicationInfo applicationInfo;
+  private long longVersionCode = 0L;
+  @Nullable private String versionName;
+  /** Map of a requested permission to its requested permission flag. */
+  private final Map<String, Integer> requestedPermissionsMap = new HashMap<>();
 
   private PackageInfoBuilder() {}
 
@@ -50,6 +58,50 @@ public PackageInfoBuilder setPackageName(String packageName) {
     return this;
   }
 
+  /**
+   * Sets the version code.
+   *
+   * <p>On SDK P+, this value will be returned for both {@link PackageInfo#getLongVersionCode()} and
+   * {@link PackageInfo#versionCode}. Note that the value of {@link PackageInfo#versionCode} will be
+   * truncated if a value larger than Integer.MAX_VALUE is provided.
+   *
+   * <p>Default is 0L.
+   *
+   * @see PackageInfo#setLongVersionCode(long)
+   * @see PackageInfo#versionCode
+   */
+  @TargetApi(Build.VERSION_CODES.P)
+  public PackageInfoBuilder setVersionCode(long longVersionCode) {
+    this.longVersionCode = longVersionCode;
+    return this;
+  }
+
+  /**
+   * Sets the version name.
+   *
+   * <p>Default is {@code null}.
+   *
+   * @see PackageInfo#versionName
+   */
+  public PackageInfoBuilder setVersionName(String versionName) {
+    this.versionName = versionName;
+    return this;
+  }
+
+  /**
+   * Adds a requested permission and its flag for the app.
+   *
+   * <p>This can be called several times to add multiple permissions.
+   *
+   * @see PackageInfo#requestedPermissions
+   * @see PackageInfo#requestedPermissionsFlags
+   */
+  public PackageInfoBuilder addRequestedPermission(
+      String requestedPermission, int requestedPermissionFlag) {
+    requestedPermissionsMap.put(requestedPermission, requestedPermissionFlag);
+    return this;
+  }
+
   /**
    * Sets the application info.
    *
@@ -69,11 +121,28 @@ public PackageInfo build() {
 
     PackageInfo packageInfo = new PackageInfo();
     packageInfo.packageName = packageName;
+    packageInfo.versionName = versionName;
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      // setLongVersionCode will automatically set the version code.
+      packageInfo.setLongVersionCode(longVersionCode);
+    } else {
+      packageInfo.versionCode = (int) longVersionCode;
+    }
 
     if (applicationInfo == null) {
       applicationInfo = ApplicationInfoBuilder.newBuilder().setPackageName(packageName).build();
     }
     packageInfo.applicationInfo = applicationInfo;
+    packageInfo.requestedPermissions = requestedPermissionsMap.keySet().toArray(new String[0]);
+
+    Integer[] requestedPermissionsFlags = requestedPermissionsMap.values().toArray(new Integer[0]);
+    // Stream APIs such as `mapToInt` are not supported below API 24.
+    int[] requestedPermissionsFlagsIntArray = new int[requestedPermissionsFlags.length];
+    for (int i = 0; i < requestedPermissionsFlags.length; i++) {
+      requestedPermissionsFlagsIntArray[i] = requestedPermissionsFlags[i];
+    }
+    packageInfo.requestedPermissionsFlags = requestedPermissionsFlagsIntArray;
 
     checkState(
         packageInfo.packageName.equals(packageInfo.applicationInfo.packageName),
diff --git a/core/java/androidx/test/core/graphics/BitmapStorageExt.kt b/core/java/androidx/test/core/graphics/BitmapStorageExt.kt
new file mode 100644
index 000000000..683c1af87
--- /dev/null
+++ b/core/java/androidx/test/core/graphics/BitmapStorageExt.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("BitmapStorage")
+
+package androidx.test.core.graphics
+
+import android.graphics.Bitmap
+import androidx.annotation.RestrictTo
+import androidx.test.platform.io.PlatformTestStorage
+import androidx.test.platform.io.PlatformTestStorageRegistry
+import java.io.IOException
+
+/**
+ * Writes the contents of the [Bitmap] to a compressed png file on [PlatformTestStorage]
+ *
+ * @param name a descriptive base name for the resulting file. '.png' will be appended to this name.
+ * @throws IOException if bitmap could not be compressed or written to ds
+ */
+@Throws(IOException::class)
+fun Bitmap.writeToTestStorage(name: String) {
+  writeToTestStorage(PlatformTestStorageRegistry.getInstance(), name)
+}
+
+/**
+ * @deprecated
+ * @hide
+ */
+@Deprecated(
+  "use  PlatformTestStorageRegistry.setInstance in the rare cases where you want to override the PlatformTestStorage to use",
+  replaceWith = ReplaceWith("writeToTestStorage()"),
+)
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // legacy - used by espresso 3.5.0 DefaultFailureHandler
+@Throws(IOException::class)
+fun Bitmap.writeToTestStorage(testStorage: PlatformTestStorage, name: String) {
+  testStorage.openOutputFile("$name.png").use {
+    if (
+      !this.compress(
+        Bitmap.CompressFormat.PNG,
+        /** PNG is lossless, so quality is ignored. */
+        0,
+        it,
+      )
+    ) {
+      throw IOException("Failed to compress bitmap")
+    }
+  }
+}
diff --git a/core/java/androidx/test/core/internal/os/HandlerExecutor.kt b/core/java/androidx/test/core/internal/os/HandlerExecutor.kt
new file mode 100644
index 000000000..e8fc62fd2
--- /dev/null
+++ b/core/java/androidx/test/core/internal/os/HandlerExecutor.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.core.internal.os
+
+import android.os.Handler
+import androidx.annotation.RestrictTo
+import java.util.concurrent.Executor
+
+/**
+ * A likely temporary utility class that redirects Executor calls to a Handler.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+class HandlerExecutor(val handler: Handler) : Executor {
+
+  override fun execute(command: Runnable) {
+    if (Thread.currentThread().equals(handler.looper.thread)) {
+      command.run()
+    } else {
+      handler.post(command)
+    }
+  }
+}
diff --git a/core/java/androidx/test/core/view/ViewCapture.kt b/core/java/androidx/test/core/view/ViewCapture.kt
new file mode 100644
index 000000000..7dba04134
--- /dev/null
+++ b/core/java/androidx/test/core/view/ViewCapture.kt
@@ -0,0 +1,324 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("ViewCapture")
+
+package androidx.test.core.view
+
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
+import android.view.PixelCopy
+import android.view.Surface
+import android.view.SurfaceView
+import android.view.View
+import android.view.ViewTreeObserver.OnDrawListener
+import android.view.WindowManager
+import androidx.annotation.RequiresApi
+import androidx.annotation.RestrictTo
+import androidx.concurrent.futures.SuspendToFutureAdapter
+import androidx.test.core.internal.os.HandlerExecutor
+import androidx.test.internal.platform.ServiceLoaderWrapper
+import androidx.test.internal.platform.os.ControlledLooper
+import androidx.test.internal.platform.reflect.ReflectiveField
+import androidx.test.internal.platform.reflect.ReflectiveMethod
+import androidx.test.internal.util.Checks.checkState
+import androidx.test.platform.graphics.HardwareRendererCompat
+import com.google.common.util.concurrent.ListenableFuture
+import java.util.function.Consumer
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+
+/**
+ * Suspend function for capturing an image of the underlying view into a [Bitmap].
+ *
+ * For devices below [Build.VERSION_CODES#O], the image is obtained using [View#draw]. Otherwise,
+ * [PixelCopy] is used. Note when PixelCopy is used, the resulting image will be taken from the
+ * View's window, then cropped to the approximate location of the View in the window. So depending
+ * on window content you may see content from other View's within the resulting image.
+ *
+ * This method will also enable [HardwareRendererCompat#setDrawingEnabled(boolean)] if required.
+ *
+ * This API is primarily intended for use in lower layer libraries or frameworks. For test authors,
+ * it's recommended to use Espresso's captureToBitmap action or Compose's captureToImage.
+ *
+ * If a rect is supplied, this will further crop locally from the bounds of the given view. For
+ * example, if the given view is at (10, 10 - 30, 30) and the rect is (5, 5 - 10, 10), the final
+ * bitmap will be a 5x5 bitmap that spans (15, 15 - 20, 20). This is particularly useful for
+ * Compose, which only has a singular view that contains a hierarchy of nodes.
+ *
+ * This API must be called on the View's handler thread. If you're calling this from another
+ * context, eg directly from the test thread, you can use something like
+ * <pre>{@code
+ *   runBlocking(view.handler.asCoroutineDispatcher()) {
+ *     withTimeout(10.seconds) {
+ *       view.captureToBitmap(rect)
+ *     }
+ *   }
+ * }</pre>
+ *
+ * The resulting image is captured after forcing the View to redraw, and waiting for the draw to
+ * operation complete. This is done as a means to improve the stability of the resulting image -
+ * especially in cases where hardware rendering drawing is off initially.
+ */
+suspend fun View.captureToBitmap(rect: Rect? = null): Bitmap {
+  checkState(isAttachedToWindow, "View must be attached to a window")
+  checkState(
+    handler.looper.isCurrentThread,
+    "Must be called from view's handler thread. Current: ${Thread.currentThread().name}, view handler: ${handler.looper.thread.name}",
+  )
+
+  var bitmap: Bitmap? = null
+  val hardwareDrawingEnabled = HardwareRendererCompat.isDrawingEnabled()
+  HardwareRendererCompat.setDrawingEnabled(true)
+  try {
+    forceRedraw()
+    bitmap = generateBitmap(rect)
+  } finally {
+    HardwareRendererCompat.setDrawingEnabled(hardwareDrawingEnabled)
+  }
+
+  return bitmap!!
+}
+
+private fun getControlledLooper(): ControlledLooper {
+  return ServiceLoaderWrapper.loadSingleService(ControlledLooper::class.java) {
+    ControlledLooper.NO_OP_CONTROLLED_LOOPER
+  }
+}
+
+/** A ListenableFuture variant of captureToBitmap intended for use from Java. */
+fun View.captureToBitmapAsync(rect: Rect? = null): ListenableFuture<Bitmap> {
+  return SuspendToFutureAdapter.launchFuture(Dispatchers.Main) { captureToBitmap(rect) }
+}
+
+/**
+ * Trigger a redraw of the given view.
+ *
+ * Should only be called on UI thread.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+suspend fun View.forceRedraw() {
+  checkState(handler.looper.isCurrentThread, "Must be called from view's handler thread")
+  if (!getControlledLooper().areDrawCallbacksSupported()) {
+    Log.i("ViewCapture", "Skipping forceRedraw as it is not supported")
+    return
+  }
+
+  var drawListener: OnDrawListener? = null
+  try {
+    return suspendCancellableCoroutine<Unit> { cont ->
+      if (Build.VERSION.SDK_INT >= 29 && isHardwareAccelerated) {
+        viewTreeObserver.registerFrameCommitCallback() {
+          Log.i("forceRedraw", "FrameCommitCallback complete")
+          cont.resume(Unit)
+        }
+      } else {
+        drawListener =
+          object : OnDrawListener {
+            var handled = false
+
+            override fun onDraw() {
+              if (!handled) {
+                handled = true
+                cont.resume(Unit)
+              }
+            }
+          }
+        viewTreeObserver.addOnDrawListener(drawListener)
+      }
+      invalidate()
+    }
+  } finally {
+    if (drawListener != null) {
+      // post as async event to avoid 'cannot remove on draw listener inside of onDraw' error
+      handler.post { viewTreeObserver.removeOnDrawListener(drawListener) }
+    }
+  }
+}
+
+private suspend fun View.generateBitmap(rect: Rect? = null): Bitmap {
+  val rectWidth = rect?.width() ?: width
+  val rectHeight = rect?.height() ?: height
+  val destBitmap = Bitmap.createBitmap(rectWidth, rectHeight, Bitmap.Config.ARGB_8888)
+
+  return when {
+    Build.VERSION.SDK_INT < 26 -> generateBitmapFromDraw(destBitmap, rect)
+    Build.VERSION.SDK_INT >= 34 -> generateBitmapFromPixelCopy(destBitmap, rect)
+    this is SurfaceView -> generateBitmapFromSurfaceViewPixelCopy(destBitmap, rect)
+    else -> generateBitmapFromPixelCopy(this.getSurface(), destBitmap, rect)
+  }
+}
+
+@RequiresApi(Build.VERSION_CODES.O)
+private suspend fun SurfaceView.generateBitmapFromSurfaceViewPixelCopy(
+  destBitmap: Bitmap,
+  rect: Rect?,
+): Bitmap {
+  return suspendCancellableCoroutine<Bitmap> { cont ->
+    val onCopyFinished =
+      PixelCopy.OnPixelCopyFinishedListener { result ->
+        if (result == PixelCopy.SUCCESS) {
+          cont.resume(destBitmap)
+        } else {
+          cont.resumeWithException(RuntimeException(String.format("PixelCopy failed: %d", result)))
+        }
+      }
+    PixelCopy.request(this, rect, destBitmap, onCopyFinished, handler)
+  }
+}
+
+internal fun View.generateBitmapFromDraw(destBitmap: Bitmap, rect: Rect?): Bitmap {
+  destBitmap.density = resources.displayMetrics.densityDpi
+  computeScroll()
+  val canvas = Canvas(destBitmap)
+  canvas.translate((-scrollX).toFloat(), (-scrollY).toFloat())
+  if (rect != null) {
+    canvas.translate((-rect.left).toFloat(), (-rect.top).toFloat())
+  }
+
+  draw(canvas)
+  return destBitmap
+}
+
+/**
+ * Generates a bitmap from the given surface using [PixelCopy].
+ *
+ * This method is effectively the backwards compatibility version of android U's
+ * [PixelCopy.ofWindow(View)], and will be called when running on Android API levels O to T.
+ */
+@RequiresApi(Build.VERSION_CODES.O)
+private suspend fun View.generateBitmapFromPixelCopy(
+  surface: Surface,
+  destBitmap: Bitmap,
+  rect: Rect?,
+): Bitmap {
+  return suspendCancellableCoroutine<Bitmap> { cont ->
+    var bounds = getBoundsInSurface()
+    if (rect != null) {
+      bounds = Rect(rect).apply { offset(bounds.left, bounds.top) }
+    }
+    val onCopyFinished =
+      PixelCopy.OnPixelCopyFinishedListener { result ->
+        if (result == PixelCopy.SUCCESS) {
+          cont.resume(destBitmap)
+        } else {
+          cont.resumeWithException(RuntimeException("PixelCopy failed: $result"))
+        }
+      }
+    PixelCopy.request(surface, bounds, destBitmap, onCopyFinished, Handler(Looper.getMainLooper()))
+  }
+}
+
+/** Returns the Rect indicating the View's coordinates within its containing window. */
+private fun View.getBoundsInWindow(): Rect {
+  val locationInWindow = intArrayOf(0, 0)
+  getLocationInWindow(locationInWindow)
+  val x = locationInWindow[0]
+  val y = locationInWindow[1]
+  return Rect(x, y, x + width, y + height)
+}
+
+/** Returns the Rect indicating the View's coordinates within its containing surface. */
+private fun View.getBoundsInSurface(): Rect {
+  val locationInSurface = intArrayOf(0, 0)
+  if (Build.VERSION.SDK_INT < 29) {
+    reflectivelyGetLocationInSurface(locationInSurface)
+  } else {
+    getLocationInSurface(locationInSurface)
+  }
+  val x = locationInSurface[0]
+  val y = locationInSurface[1]
+  val bounds = Rect(x, y, x + width, y + height)
+
+  Log.d("ViewCapture", "getBoundsInSurface $bounds")
+
+  return bounds
+}
+
+private fun View.getSurface(): Surface {
+  // copy the implementation of API 34's PixelCopy.ofWindow to get the surface from view
+  val viewRootImpl = ReflectiveMethod<Any>(View::class.java, "getViewRootImpl").invoke(this)
+  return ReflectiveField<Surface>("android.view.ViewRootImpl", "mSurface").get(viewRootImpl)
+}
+
+/**
+ * The backwards compatible version of API 29's [View.getLocationInSurface].
+ *
+ * It makes a best effort attempt to replicate the API 29 logic.
+ */
+@SuppressLint("NewApi")
+private fun View.reflectivelyGetLocationInSurface(locationInSurface: IntArray) {
+  // copy the implementation of API 29+ getLocationInSurface
+  getLocationInWindow(locationInSurface)
+  if (Build.VERSION.SDK_INT < 28) {
+    val viewRootImpl = ReflectiveMethod<Any>(View::class.java, "getViewRootImpl").invoke(this)
+    val windowAttributes =
+      ReflectiveField<WindowManager.LayoutParams>("android.view.ViewRootImpl", "mWindowAttributes")
+        .get(viewRootImpl)
+    val surfaceInsets =
+      ReflectiveField<Rect>(WindowManager.LayoutParams::class.java, "surfaceInsets")
+        .get(windowAttributes)
+    locationInSurface[0] += surfaceInsets.left
+    locationInSurface[1] += surfaceInsets.top
+  } else {
+    // ART restrictions introduced in API 29 disallow reflective access to mWindowAttributes
+    Log.w(
+      "ViewCapture",
+      "Could not calculate offset of view in surface on API 28, resulting image may have incorrect positioning",
+    )
+  }
+}
+
+@RequiresApi(34)
+private suspend fun View.generateBitmapFromPixelCopy(
+  destBitmap: Bitmap,
+  rect: Rect? = null,
+): Bitmap {
+  val boundsInWindow = getBoundsInWindow()
+  val sourceRect =
+    if (rect != null) {
+      Rect(rect).apply { offset(boundsInWindow.left, boundsInWindow.top) }
+    } else {
+      boundsInWindow
+    }
+  return suspendCancellableCoroutine<Bitmap> { cont ->
+    val request =
+      PixelCopy.Request.Builder.ofWindow(this)
+        .setSourceRect(sourceRect)
+        .setDestinationBitmap(destBitmap)
+        .build()
+    val onCopyFinished =
+      Consumer<PixelCopy.Result> { result ->
+        if (result.status == PixelCopy.SUCCESS) {
+          cont.resume(result.bitmap)
+        } else {
+          cont.resumeWithException(
+            RuntimeException("PixelCopy failed with status code: ${result.status}")
+          )
+        }
+      }
+    PixelCopy.request(request, HandlerExecutor(handler), onCopyFinished)
+  }
+}
diff --git a/core/java/androidx/test/core/view/WindowCapture.kt b/core/java/androidx/test/core/view/WindowCapture.kt
new file mode 100644
index 000000000..8bbc9206b
--- /dev/null
+++ b/core/java/androidx/test/core/view/WindowCapture.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("WindowCapture")
+
+package androidx.test.core.view
+
+import android.graphics.Bitmap
+import android.graphics.Rect
+import android.os.Build
+import android.os.Handler
+import android.os.Looper
+import android.view.PixelCopy
+import android.view.Window
+import androidx.annotation.RequiresApi
+import androidx.concurrent.futures.SuspendToFutureAdapter
+import androidx.test.platform.graphics.HardwareRendererCompat
+import com.google.common.util.concurrent.ListenableFuture
+import kotlin.coroutines.resumeWithException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
+
+/**
+ * Suspend function that captures an image of the underlying window into a [Bitmap].
+ *
+ * For devices below [Build.VERSION_CODES#O] the image is obtained using [View#draw] on the windows
+ * decorView. Otherwise, [PixelCopy] is used.
+ *
+ * This method will also enable [HardwareRendererCompat#setDrawingEnabled(boolean)] if required.
+ *
+ * This API is primarily intended for use in lower layer libraries or frameworks. For test authors,
+ * its recommended to use espresso or compose's captureToImage.
+ *
+ * This API must be called from the UI thread.
+ *
+ * The resulting image is captured after forcing the View to redraw, and waiting for the draw to
+ * operation complete. This is done as a means to improve the stability of the resulting image -
+ * especially in cases where hardware rendering drawing is off initially.
+ */
+suspend fun Window.captureRegionToBitmap(boundsInWindow: Rect? = null): Bitmap {
+  var bitmap: Bitmap? = null
+
+  val hardwareDrawingEnabled = HardwareRendererCompat.isDrawingEnabled()
+  HardwareRendererCompat.setDrawingEnabled(true)
+  try {
+    decorView.forceRedraw()
+    bitmap = generateBitmap(boundsInWindow)
+  } finally {
+    HardwareRendererCompat.setDrawingEnabled(hardwareDrawingEnabled)
+  }
+
+  return bitmap!!
+}
+
+/** A ListenableFuture variant of captureRegionToBitmap intended for use from Java. */
+fun Window.captureRegionToBitmapAsync(boundsInWindow: Rect? = null): ListenableFuture<Bitmap> {
+  return SuspendToFutureAdapter.launchFuture(Dispatchers.Main) {
+    captureRegionToBitmap(boundsInWindow)
+  }
+}
+
+internal suspend fun Window.generateBitmap(boundsInWindow: Rect? = null): Bitmap {
+  val destBitmap =
+    Bitmap.createBitmap(
+      boundsInWindow?.width() ?: decorView.width,
+      boundsInWindow?.height() ?: decorView.height,
+      Bitmap.Config.ARGB_8888,
+    )
+  when {
+    Build.VERSION.SDK_INT < 26 ->
+      // TODO: handle boundsInWindow
+      decorView.generateBitmapFromDraw(destBitmap, boundsInWindow)
+    else -> generateBitmapFromPixelCopy(boundsInWindow, destBitmap)
+  }
+
+  return destBitmap
+}
+
+@RequiresApi(Build.VERSION_CODES.O)
+internal suspend fun Window.generateBitmapFromPixelCopy(
+  boundsInWindow: Rect? = null,
+  destBitmap: Bitmap,
+): Bitmap {
+  return suspendCancellableCoroutine<Bitmap> { cont ->
+    val onCopyFinished =
+      PixelCopy.OnPixelCopyFinishedListener { result ->
+        if (result == PixelCopy.SUCCESS) {
+          cont.resume(destBitmap, {})
+        } else {
+          cont.resumeWithException(RuntimeException("PixelCopy failed: $result"))
+        }
+      }
+
+    PixelCopy.request(
+      this,
+      boundsInWindow,
+      destBitmap,
+      onCopyFinished,
+      Handler(Looper.getMainLooper()),
+    )
+  }
+}
diff --git a/core/javatests/androidx/test/core/AndroidManifest_target.xml b/core/javatests/androidx/test/core/AndroidManifest_target.xml
deleted file mode 100644
index 502fe079d..000000000
--- a/core/javatests/androidx/test/core/AndroidManifest_target.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.core" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application >
-        <activity
-            android:name="androidx.test.core.app.testing.RecreationRecordingActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="androidx.test.core.app.testing.RecordingActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="androidx.test.core.app.testing.AsyncRecordingActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="androidx.test.core.app.testing.FinishItselfActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="androidx.test.core.app.testing.RedirectingActivity"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-    </application>
-
-</manifest>
diff --git a/core/javatests/androidx/test/core/BUILD.bazel b/core/javatests/androidx/test/core/BUILD.bazel
deleted file mode 100644
index f82cdb361..000000000
--- a/core/javatests/androidx/test/core/BUILD.bazel
+++ /dev/null
@@ -1,84 +0,0 @@
-# Description: Tests for androidx.test.core
-
-load("//build_extensions:android_library_instrumentation_tests.bzl", "android_library_instrumentation_tests")
-load("//build_extensions:android_library_local_tests.bzl", "android_library_local_tests")
-load("//build_extensions:android_app_instrumentation_tests.bzl", "android_app_instrumentation_tests")
-load("//build_extensions:test_devices.bzl", "devices")
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-# ActivityScenarioTest is unique, in that we want to define the activity under test in a
-# separate target binary, since that is how most users tests will be setup
-android_binary(
-    name = "ActivityScenarioTest_target",
-    manifest = "AndroidManifest_target.xml",
-    deps = [
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-    ],
-)
-
-android_app_instrumentation_tests(
-    name = "ActivityScenarioTest_instrumentation",
-    srcs = glob(["**/ActivityScenarioTest.java"]),
-    binary_target = ":ActivityScenarioTest_target",
-    target_devices = devices(),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//espresso/core/java/androidx/test/espresso",
-        "//ext/junit",
-        "//ext/truth",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = ["**/ActivityScenario*Test.java"],
-    ),
-    target_devices = devices(),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library_local_tests(
-    name = "local_tests",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = [
-            "**/ActivityScenarioTest.java",
-            "**/app/ActivityScenarioSharedTest.java",  # currently broken due to AXT/Roboelctric version mismatch
-        ],
-    ),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ext/truth",
-        "//runner/monitor/java/androidx/test:monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
diff --git a/core/javatests/androidx/test/core/app/ActivityScenarioTest.java b/core/javatests/androidx/test/core/app/ActivityScenarioTest.java
index c7ec51771..df94679c2 100644
--- a/core/javatests/androidx/test/core/app/ActivityScenarioTest.java
+++ b/core/javatests/androidx/test/core/app/ActivityScenarioTest.java
@@ -19,6 +19,7 @@
 import static android.app.Activity.RESULT_OK;
 import static androidx.test.ext.truth.content.IntentSubject.assertThat;
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
 import android.app.Activity;
@@ -43,7 +44,12 @@
 import androidx.test.runner.lifecycle.Stage;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -53,6 +59,12 @@
  */
 @RunWith(AndroidJUnit4.class)
 public final class ActivityScenarioTest {
+
+  @Before
+  public void setUp() {
+    RecordingActivity.clearCallbacks();
+  }
+
   @Test
   public void launchedActivityShouldBeResumed() throws Exception {
     try (ActivityScenario<RecreationRecordingActivity> scenario =
@@ -318,10 +330,25 @@ public void recreateResumedActivity() throws Exception {
     }
   }
 
+  @Ignore // TODO(hoisie): re-enable once github uses new robolectric
+  @Test
+  public void recreateIsChangingConfigurations() {
+    try (ActivityScenario<RecordingActivity> activityScenario =
+        ActivityScenario.launch(RecordingActivity.class)) {
+      activityScenario.recreate();
+
+      activityScenario.onActivity(
+          activity ->
+              assertThat(activity.getCallbacks())
+                  .containsAtLeast("onPause true", "onStop true", "onDestroy true")
+                  .inOrder());
+    }
+  }
+
   @Test
   public void activityResultWithNoResultData() throws Exception {
     try (ActivityScenario<RecreationRecordingActivity> scenario =
-        ActivityScenario.launch(RecreationRecordingActivity.class)) {
+        ActivityScenario.launchActivityForResult(RecreationRecordingActivity.class)) {
       scenario.onActivity(
           activity -> {
             activity.setResult(RESULT_OK);
@@ -335,7 +362,7 @@ public void activityResultWithNoResultData() throws Exception {
   @Test
   public void activityResultWithResultData() throws Exception {
     try (ActivityScenario<RecreationRecordingActivity> scenario =
-        ActivityScenario.launch(RecreationRecordingActivity.class)) {
+        ActivityScenario.launchActivityForResult(RecreationRecordingActivity.class)) {
       scenario.onActivity(
           activity -> {
             activity.setResult(RESULT_OK, new Intent().setAction(Intent.ACTION_SEND));
@@ -349,7 +376,7 @@ public void activityResultWithResultData() throws Exception {
   @Test
   public void activityResultWithResultDataAfterRecreate() throws Exception {
     try (ActivityScenario<RecreationRecordingActivity> scenario =
-        ActivityScenario.launch(RecreationRecordingActivity.class)) {
+        ActivityScenario.launchActivityForResult(RecreationRecordingActivity.class)) {
       scenario.recreate();
       scenario.onActivity(
           activity -> {
@@ -361,6 +388,19 @@ public void activityResultWithResultDataAfterRecreate() throws Exception {
     }
   }
 
+  @Test
+  public void scenarioResultAfterLaunch() throws Exception {
+    try (ActivityScenario<RecreationRecordingActivity> scenario =
+        ActivityScenario.launch(RecreationRecordingActivity.class)) {
+      IllegalStateException e = assertThrows(IllegalStateException.class, scenario::getResult);
+      assertThat(e)
+          .hasMessageThat()
+          .isEqualTo(
+              "You must start Activity first. Make sure you are using launchActivityForResult() to"
+                  + " launch an Activity.");
+    }
+  }
+
   @Test
   public void launch_unknownActivity() {
     Intent intent = new Intent();
@@ -416,68 +456,63 @@ public void perform(RecreationRecordingActivity activity) {
   }
 
   @Test
-  public void launch_callbackSequence() {
-    ActivityScenario<RecordingActivity> activityScenario =
-        ActivityScenario.launch(RecordingActivity.class);
-    Espresso.onIdle();
-    Espresso.onIdle();
-    activityScenario.onActivity(
-        activity ->
-            assertThat(activity.getCallbacks())
-                .containsExactly(
-                    "onCreate",
-                    "onStart",
-                    "onPostCreate",
-                    "onResume",
-                    "onPostResume",
-                    "onAttachedToWindow",
-                    "onWindowFocusChanged true")
-                .inOrder());
+  public void launch_callbackSequence()
+      throws ExecutionException, InterruptedException, TimeoutException {
+    try (ActivityScenario<RecordingActivity> activityScenario =
+        ActivityScenario.launch(RecordingActivity.class)) {
+
+      // windowFocus event is async, so wait a small amount of time for that
+      CountDownLatch windowFocusLatch = new CountDownLatch(1);
+      activityScenario.onActivity(
+          activity -> activity.listenForEvent(windowFocusLatch, "onWindowFocusChanged true"));
+      windowFocusLatch.await(1, TimeUnit.SECONDS);
+
+      activityScenario.onActivity(
+          activity ->
+              assertThat(activity.getCallbacks())
+                  .containsExactly(
+                      "onCreate",
+                      "onStart",
+                      "onPostCreate",
+                      "onResume",
+                      "onPostResume",
+                      "onAttachedToWindow",
+                      "onWindowFocusChanged true")
+                  .inOrder());
+    }
   }
 
   @Test
   public void launch_postingCallbackSequence() throws Exception {
-    ActivityScenario<AsyncRecordingActivity> activityScenario =
-        ActivityScenario.launch(AsyncRecordingActivity.class);
-    Espresso.onIdle();
-    Espresso.onIdle();
-
-    int maxRetry = 3;
-    AtomicBoolean activityHasFocus = new AtomicBoolean(false);
-    for (int attempt = 0; attempt < maxRetry; attempt++) {
-      activityScenario.onActivity(activity -> activityHasFocus.set(activity.hasWindowFocus()));
-      if (activityHasFocus.get()) {
-        break;
-      }
-      // Retry after the sleep. Window focus is the global state and there is a lag
-      // before onWindowFocusChanged is called after the activity is resumed.
-      // TODO(b/191072024): Find a beter way to monitor focus activity and remove the sleep.
-      Thread.sleep(500);
+    try (ActivityScenario<AsyncRecordingActivity> activityScenario =
+        ActivityScenario.launch(AsyncRecordingActivity.class)) {
+
+      CountDownLatch windowFocusLatch = new CountDownLatch(1);
+      activityScenario.onActivity(
+          activity -> activity.listenForEvent(windowFocusLatch, "onWindowFocusChanged true"));
+      windowFocusLatch.await(1, TimeUnit.SECONDS);
+
+      // wait for windowFocus post
+      Espresso.onIdle();
+
+      activityScenario.onActivity(
+          activity ->
+              // just assert the first few events, The exact order for the full event sequence is
+              // not deterministic
+              assertThat(activity.getCallbacks())
+                  .containsAtLeast(
+                      "onCreate",
+                      "onStart",
+                      "onPostCreate",
+                      "onResume",
+                      "onPostResume",
+                      "post from onCreate")
+                  .inOrder());
     }
+  }
 
-    activityScenario.onActivity(
-        activity ->
-            assertThat(activity.getCallbacks())
-                .containsExactly(
-                    "onCreate",
-                    "onStart",
-                    "onPostCreate",
-                    "onResume",
-                    "onPostResume",
-                    "post from onCreate",
-                    "post from onStart",
-                    "post from onPostCreate",
-                    "post from onResume",
-                    "post from onPostResume",
-                    "onAttachedToWindow",
-                    "post from onAttachedToWindow",
-                    "onWindowFocusChanged true",
-                    "post from onWindowFocusChanged true")
-                .inOrder());
-  }
-
-  @Test
-  @SdkSuppress(minSdkVersion = 16) // ActivityOptions is added in API 16.
+  @Test
+  @SdkSuppress(minSdkVersion = 28) // ActivityOptions is added in API 28.
   public void launch_withActivityOptionsBundle() throws Exception {
     try (ActivityScenario<RecreationRecordingActivity> scenario =
         ActivityScenario.launch(
@@ -496,6 +531,24 @@ public void launch_intentWithAction() {
     assertThat(activityScenario).isNotNull();
   }
 
+  @Test
+  public void launch_intentWithPackageName() {
+    Intent intent = new Intent("custom.actions.intent.EXAMPLE_INTENT");
+    intent.setPackage("androidx.test.core.app");
+
+    ActivityScenario<IntentActivity> activityScenario = ActivityScenario.launch(intent);
+    assertThat(activityScenario).isNotNull();
+  }
+
+  @Test
+  public void launchActivityForResult_intentWithAction() {
+    Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("scenario://test"));
+
+    ActivityScenario<IntentActivity> activityScenario =
+        ActivityScenario.launchActivityForResult(intent);
+    assertThat(activityScenario).isNotNull();
+  }
+
   private static Stage lastLifeCycleTransition(Activity activity) {
     return ActivityLifecycleMonitorRegistry.getInstance().getLifecycleStageOf(activity);
   }
diff --git a/core/javatests/androidx/test/core/app/AndroidManifest_target.xml b/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
new file mode 100644
index 000000000..cc9ccbbbf
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.core.app" >
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
+
+    <application >
+        <activity
+            android:name="androidx.test.core.app.testing.RecreationRecordingActivity"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="androidx.test.core.app.testing.RecordingActivity"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="androidx.test.core.app.testing.AsyncRecordingActivity"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="androidx.test.core.app.testing.FinishItselfActivity"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="androidx.test.core.app.testing.RedirectingActivity"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+</manifest>
diff --git a/core/javatests/androidx/test/core/app/AndroidManifest_test.xml b/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
new file mode 100644
index 000000000..8935f2d73
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.core.app.test" >
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
+
+    <application/>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="androidx.test.core.app">
+    </instrumentation>
+
+</manifest>
diff --git a/core/javatests/androidx/test/core/app/BUILD b/core/javatests/androidx/test/core/app/BUILD
new file mode 100644
index 000000000..b6220c505
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/BUILD
@@ -0,0 +1,119 @@
+# Description: Tests for androidx.test.core
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_application_test.bzl", "axt_android_application_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+load("//build_extensions:phone_devices.bzl", "devices")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# ActivityScenarioTest is unique, in that we want to define the activity under test in a
+# separate target binary, since that is how most users tests will be setup
+android_binary(
+    name = "ActivityScenarioTest_target",
+    manifest = "AndroidManifest_target.xml",
+    deps = [
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+    ],
+)
+
+axt_android_application_test(
+    name = "ActivityScenarioTest_instrumentation",
+    srcs = ["ActivityScenarioTest.java"],
+    args = [
+        "--instrumentation_options=waitForActivitiesToComplete=false",
+    ],
+    instruments = ":ActivityScenarioTest_target",
+    manifest = "AndroidManifest_test.xml",
+    shard_count = 8,
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/android_junit_runner",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_application_test(
+    name = "ActivityScenarioSharedTest_instrumentation",
+    srcs = ["ActivityScenarioSharedTest.java"],
+    args = [
+        "--instrumentation_options=waitForActivitiesToComplete=false",
+        # turn off video recording. Video recording won't work anyway on the upcoming slim device with skipDrawing enabled,
+        # and turning off video recording saves significant runtime and flakiness
+        "--record_test_video=NEVER",
+    ],
+    instruments = ":ActivityScenarioTest_target",
+    manifest = "AndroidManifest_test.xml",
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//ext/junit",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "ActivityScenarioTest",
+    srcs = ["ActivityScenarioTest.java"],
+    manifest_values = {
+        "applicationId": "androidx.test.core.app",
+    },
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/android_junit_runner",
+        "//runner/monitor/java/androidx/test:monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "ApplicationProviderTest",
+    srcs = ["ApplicationProviderTest.java"],
+    manifest_values = {
+        "applicationId": "androidx.test.core",
+    },
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+# TakeScreenshotTest needs its own rule due to higher min sdk
+axt_android_library_test(
+    name = "TakeScreenShotTest",
+    srcs = ["TakeScreenShotTest.kt"],
+    device_list = devices(),
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ktx/core",
+        "//services/storage/java/androidx/test/services/storage",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
diff --git a/core/javatests/androidx/test/core/app/TakeScreenShotTest.kt b/core/javatests/androidx/test/core/app/TakeScreenShotTest.kt
new file mode 100644
index 000000000..f37d6bb94
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/TakeScreenShotTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.core.app
+
+import androidx.test.core.app.testing.ActivityWithDialog
+import androidx.test.core.app.testing.UiActivity
+import androidx.test.core.graphics.writeToTestStorage
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TestName
+import org.junit.runner.RunWith
+
+/** Simple test for takeScreenshot */
+@RunWith(AndroidJUnit4::class)
+class TakeScreenShotTest {
+
+  @get:Rule val name = TestName()
+
+  @Test
+  fun takeScreenshot_blank() {
+    val bitmap = takeScreenshot()
+
+    assertThat(bitmap).isNotNull()
+    // arbitrary check to ensure bitmap is non empty. Contents need to be manually validated for now
+    assertThat(bitmap.byteCount).isGreaterThan(100)
+
+    bitmap.writeToTestStorage(name.methodName)
+  }
+
+  @Test
+  fun takeScreenshot_activity() {
+    launchActivity<UiActivity>().use {
+      val bitmap = takeScreenshot()
+
+      assertThat(bitmap).isNotNull()
+      // arbitrary check to ensure bitmap is non empty. Contents need to be manually validated for
+      // now
+      assertThat(bitmap.byteCount).isGreaterThan(100)
+
+      bitmap.writeToTestStorage(name.methodName)
+    }
+  }
+
+  @Test
+  fun takeScreenshot_activityWithDialog() {
+    launchActivity<ActivityWithDialog>().use {
+      val bitmap = takeScreenshot()
+
+      assertThat(bitmap).isNotNull()
+      // arbitrary check to ensure bitmap is non empty. Contents need to be manually validated for
+      // now
+      assertThat(bitmap.byteCount).isGreaterThan(100)
+
+      bitmap.writeToTestStorage(name.methodName)
+    }
+  }
+}
diff --git a/core/javatests/androidx/test/core/app/testing/ActivityWithDialog.kt b/core/javatests/androidx/test/core/app/testing/ActivityWithDialog.kt
new file mode 100644
index 000000000..1967091b0
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/testing/ActivityWithDialog.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.core.app.testing
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.os.Bundle
+
+class ActivityWithDialog : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.simple_activity)
+
+    AlertDialog.Builder(this)
+      .setMessage("This is a dialog")
+      .setTitle("Dialog Title")
+      .create()
+      .show()
+  }
+}
diff --git a/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml b/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml
index 28e829011..87340d09c 100644
--- a/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml
+++ b/core/javatests/androidx/test/core/app/testing/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.test.core.app.testing">
   <uses-sdk
-      android:minSdkVersion="14"/>
+      android:minSdkVersion="23"/>
   <application>
     <activity
         android:name=".RecreationRecordingActivity"
@@ -56,6 +56,15 @@
 
         <data android:scheme="scenario" />
       </intent-filter>
+      <intent-filter>
+        <action android:name="custom.actions.intent.EXAMPLE_INTENT" />
+        <category android:name="android.intent.category.DEFAULT" />
+      </intent-filter>
     </activity>
+    <activity android:name=".ActivityWithDialog"
+      android:exported="true"/>
+    <activity android:name=".UiActivity"
+        android:exported="true"/>
+
   </application>
 </manifest>
diff --git a/core/javatests/androidx/test/core/app/testing/AndroidManifest_empty.xml b/core/javatests/androidx/test/core/app/testing/AndroidManifest_empty.xml
new file mode 100644
index 000000000..8af416be7
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/testing/AndroidManifest_empty.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.core.app.testing">
+  <uses-sdk
+      android:minSdkVersion="23"/>
+  <application>
+  </application>
+</manifest>
diff --git a/core/javatests/androidx/test/core/app/testing/BUILD b/core/javatests/androidx/test/core/app/testing/BUILD
new file mode 100644
index 000000000..bee451c37
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/testing/BUILD
@@ -0,0 +1,36 @@
+# Description: Stub classes for testing androidx.test.core.app
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+kt_android_library(
+    name = "testing",
+    srcs = glob([
+        "**/*.java",
+        "**/*.kt",
+    ]),
+    manifest = "AndroidManifest_empty.xml",
+    resource_files = glob(["res/**"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//opensource/androidx:annotation",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)
+
+# keep the activity manifest entries in a separate target, so they are not
+# present in both binary_under_test and test apk
+android_library(
+    name = "manifest",
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:public"],
+)
diff --git a/core/javatests/androidx/test/core/app/testing/BUILD.bazel b/core/javatests/androidx/test/core/app/testing/BUILD.bazel
deleted file mode 100644
index b187122bf..000000000
--- a/core/javatests/androidx/test/core/app/testing/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-# Description: Stub classes for testing androidx.test.core.app
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "testing",
-    srcs = glob(["**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-    ],
-)
-
-# keep the activity manifest entries in a separate target, so they are not
-# present in both binary_under_test and test apk
-android_library(
-    name = "manifest",
-    exports_manifest = 1,
-    manifest = "AndroidManifest.xml",
-    visibility = ["//visibility:public"],
-)
diff --git a/core/javatests/androidx/test/core/app/testing/RecordingActivity.java b/core/javatests/androidx/test/core/app/testing/RecordingActivity.java
index 4e2ca4ef7..db4553e74 100644
--- a/core/javatests/androidx/test/core/app/testing/RecordingActivity.java
+++ b/core/javatests/androidx/test/core/app/testing/RecordingActivity.java
@@ -16,18 +16,24 @@
 
 package androidx.test.core.app.testing;
 
+import static org.junit.Assert.assertFalse;
+
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.view.View;
+import androidx.annotation.Nullable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 
 /** An Activity that records lifecycle states. */
 public class RecordingActivity extends Activity {
 
-  protected final List<String> callbacks = new ArrayList<>();
+  protected static final List<String> callbacks = new ArrayList<>();
+  private final Map<String, CountDownLatch> pendingEvents = new HashMap<>();
 
   private class VisibilityRecordingView extends View {
 
@@ -43,8 +49,21 @@ protected void onAttachedToWindow() {
     }
   }
 
+  public void listenForEvent(CountDownLatch latch, String stateDescription) {
+    if (callbacks.contains(stateDescription)) {
+      latch.countDown();
+    } else {
+      assertFalse(pendingEvents.containsKey(stateDescription));
+      pendingEvents.put(stateDescription, latch);
+    }
+  }
+
   protected void onEvent(String newStateDescription) {
     callbacks.add(newStateDescription);
+    CountDownLatch latch = pendingEvents.remove(newStateDescription);
+    if (latch != null) {
+      latch.countDown();
+    }
   }
 
   @Override
@@ -82,13 +101,13 @@ public void onPostResume() {
   @Override
   public void onPause() {
     super.onPause();
-    onEvent("onPause");
+    onEvent("onPause " + isChangingConfigurations());
   }
 
   @Override
   public void onStop() {
     super.onStop();
-    onEvent("onStop");
+    onEvent("onStop " + isChangingConfigurations());
   }
 
   @Override
@@ -100,7 +119,7 @@ public void onRestart() {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    onEvent("onDestroy");
+    onEvent("onDestroy " + isChangingConfigurations());
   }
 
   @Override
@@ -112,4 +131,8 @@ public void onWindowFocusChanged(boolean hasFocus) {
   public List<String> getCallbacks() {
     return callbacks;
   }
+
+  public static void clearCallbacks() {
+    callbacks.clear();
+  }
 }
diff --git a/core/javatests/androidx/test/core/app/testing/RecreationRecordingActivity.java b/core/javatests/androidx/test/core/app/testing/RecreationRecordingActivity.java
index de56c0cd3..e514921f1 100644
--- a/core/javatests/androidx/test/core/app/testing/RecreationRecordingActivity.java
+++ b/core/javatests/androidx/test/core/app/testing/RecreationRecordingActivity.java
@@ -18,8 +18,8 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.view.Window;
+import androidx.annotation.Nullable;
 
 /**
  * A minimum activity to demonstrate unit testing relating to Activity's life cycle events. It
diff --git a/core/javatests/androidx/test/core/app/testing/UiActivity.kt b/core/javatests/androidx/test/core/app/testing/UiActivity.kt
new file mode 100644
index 000000000..1721a6cdf
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/testing/UiActivity.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.core.app.testing
+
+import android.app.Activity
+import android.os.Bundle
+
+/**
+ * A simple [Activity] that displays UI.
+ *
+ * Used for screenshot testing
+ */
+class UiActivity : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.simple_activity)
+  }
+}
diff --git a/core/javatests/androidx/test/core/app/testing/res/layout/simple_activity.xml b/core/javatests/androidx/test/core/app/testing/res/layout/simple_activity.xml
new file mode 100644
index 000000000..6baa4da56
--- /dev/null
+++ b/core/javatests/androidx/test/core/app/testing/res/layout/simple_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:id="@+id/layout"
+      android:orientation="vertical"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      >
+
+    <EditText
+          android:id="@+id/edit_text"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"/>
+
+        <Button
+              android:id="@+id/button"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"/>
+
+            <TextView
+                    android:id="@+id/text_view"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:text="Text View"/>
+
+              </LinearLayout>
+
diff --git a/core/javatests/androidx/test/core/content/pm/ApplicationInfoBuilderTest.java b/core/javatests/androidx/test/core/content/pm/ApplicationInfoBuilderTest.java
index 732eab5c0..35d6c1058 100644
--- a/core/javatests/androidx/test/core/content/pm/ApplicationInfoBuilderTest.java
+++ b/core/javatests/androidx/test/core/content/pm/ApplicationInfoBuilderTest.java
@@ -31,12 +31,18 @@ public final class ApplicationInfoBuilderTest {
   public void buildAllFields() {
     String name = "TestName";
     String packageName = "test.package.name";
+    int flags = 0x00000001;
 
     ApplicationInfo applicationInfo =
-        ApplicationInfoBuilder.newBuilder().setName(name).setPackageName(packageName).build();
+        ApplicationInfoBuilder.newBuilder()
+            .setFlags(flags)
+            .setName(name)
+            .setPackageName(packageName)
+            .build();
 
     assertThat(applicationInfo.name).isEqualTo(name);
     assertThat(applicationInfo.packageName).isEqualTo(packageName);
+    assertThat(applicationInfo.flags).isEqualTo(flags);
   }
 
   @Test
diff --git a/core/javatests/androidx/test/core/content/pm/BUILD b/core/javatests/androidx/test/core/content/pm/BUILD
new file mode 100644
index 000000000..57b7c6f9a
--- /dev/null
+++ b/core/javatests/androidx/test/core/content/pm/BUILD
@@ -0,0 +1,57 @@
+# Description: Tests for androidx.test.core
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "ApplicationInfoBuilderTest",
+    srcs =
+        ["ApplicationInfoBuilderTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ApplicationInfoBuilderTest_android",
+    srcs =
+        ["ApplicationInfoBuilderTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "PackageInfoBuilderTest",
+    srcs =
+        ["PackageInfoBuilderTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "PackageInfoBuilderTest_android",
+    srcs =
+        ["PackageInfoBuilderTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/core/javatests/androidx/test/core/content/pm/PackageInfoBuilderTest.java b/core/javatests/androidx/test/core/content/pm/PackageInfoBuilderTest.java
index 712312be6..db531a759 100644
--- a/core/javatests/androidx/test/core/content/pm/PackageInfoBuilderTest.java
+++ b/core/javatests/androidx/test/core/content/pm/PackageInfoBuilderTest.java
@@ -17,8 +17,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import android.content.pm.PackageInfo;
+import android.os.Build;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -29,6 +31,9 @@ public final class PackageInfoBuilderTest {
 
   private static final String TEST_PACKAGE_NAME = "test.package.name";
   private static final String SECOND_TEST_PACKAGE_NAME = "second.test.package.name";
+  private static final String TEST_REQUESTED_PERMISSION = "android.permission.test";
+  private static final long TEST_VERSION_CODE = 123;
+  private static final String TEST_VERSION_NAME = "v1";
 
   @Test
   public void buildAllFields() {
@@ -37,10 +42,52 @@ public void buildAllFields() {
             .setPackageName(TEST_PACKAGE_NAME)
             .setApplicationInfo(
                 ApplicationInfoBuilder.newBuilder().setPackageName(TEST_PACKAGE_NAME).build())
+            .addRequestedPermission(
+                TEST_REQUESTED_PERMISSION, PackageInfo.REQUESTED_PERMISSION_GRANTED)
+            .setVersionCode(TEST_VERSION_CODE)
+            .setVersionName(TEST_VERSION_NAME)
             .build();
 
     assertThat(packageInfo.packageName).isEqualTo(TEST_PACKAGE_NAME);
     assertThat(packageInfo.applicationInfo).isNotNull();
+    assertThat(packageInfo.requestedPermissions).hasLength(1);
+    assertThat(packageInfo.requestedPermissions[0]).isEqualTo(TEST_REQUESTED_PERMISSION);
+    assertThat(packageInfo.versionCode).isEqualTo(TEST_VERSION_CODE);
+    assertThat(packageInfo.versionName).isEqualTo(TEST_VERSION_NAME);
+  }
+
+  @Test
+  public void build_withLongVersionCode() {
+    // API added in API 28.
+    assumeTrue(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P);
+    PackageInfo packageInfo =
+        PackageInfoBuilder.newBuilder()
+            .setPackageName(TEST_PACKAGE_NAME)
+            .setApplicationInfo(
+                ApplicationInfoBuilder.newBuilder().setPackageName(TEST_PACKAGE_NAME).build())
+            .setVersionCode(TEST_VERSION_CODE)
+            .build();
+
+    assertThat(packageInfo.getLongVersionCode()).isEqualTo(TEST_VERSION_CODE);
+    assertThat(packageInfo.versionCode).isEqualTo(TEST_VERSION_CODE);
+  }
+
+  @Test
+  public void build_withRequestedPermissionsFlags() {
+    int permissionFlag = PackageInfo.REQUESTED_PERMISSION_GRANTED;
+
+    PackageInfo packageInfo =
+        PackageInfoBuilder.newBuilder()
+            .setPackageName(TEST_PACKAGE_NAME)
+            .setApplicationInfo(
+                ApplicationInfoBuilder.newBuilder().setPackageName(TEST_PACKAGE_NAME).build())
+            .addRequestedPermission(TEST_REQUESTED_PERMISSION, permissionFlag)
+            .build();
+
+    assertThat(packageInfo.requestedPermissions).hasLength(1);
+    assertThat(packageInfo.requestedPermissions[0]).isEqualTo(TEST_REQUESTED_PERMISSION);
+    assertThat(packageInfo.requestedPermissionsFlags).hasLength(1);
+    assertThat(packageInfo.requestedPermissionsFlags[0]).isEqualTo(permissionFlag);
   }
 
   @Test
diff --git a/core/javatests/androidx/test/core/graphics/BUILD b/core/javatests/androidx/test/core/graphics/BUILD
new file mode 100644
index 000000000..6c8c681f4
--- /dev/null
+++ b/core/javatests/androidx/test/core/graphics/BUILD
@@ -0,0 +1,22 @@
+# Description: Tests for androidx.test.core
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "BitmapStorageTest_android",
+    srcs =
+        ["BitmapStorageTest.kt"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/monitor",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/core/javatests/androidx/test/core/graphics/BitmapStorageTest.kt b/core/javatests/androidx/test/core/graphics/BitmapStorageTest.kt
new file mode 100644
index 000000000..eb79ba38e
--- /dev/null
+++ b/core/javatests/androidx/test/core/graphics/BitmapStorageTest.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.core.graphics
+
+import android.graphics.Bitmap
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class BitmapStorageTest {
+
+  @Test
+  fun writeToTestStorage() {
+    val bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888)
+    bitmap.writeToTestStorage("test")
+  }
+}
diff --git a/core/javatests/androidx/test/core/os/BUILD b/core/javatests/androidx/test/core/os/BUILD
new file mode 100644
index 000000000..c3bc34138
--- /dev/null
+++ b/core/javatests/androidx/test/core/os/BUILD
@@ -0,0 +1,34 @@
+# Description: Tests for androidx.test.core
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "ParcelablesTest",
+    srcs =
+        ["ParcelablesTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ParcelablesTest_android",
+    srcs =
+        ["ParcelablesTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/core/javatests/androidx/test/core/view/BUILD b/core/javatests/androidx/test/core/view/BUILD
new file mode 100644
index 000000000..ac6d7c5e2
--- /dev/null
+++ b/core/javatests/androidx/test/core/view/BUILD
@@ -0,0 +1,36 @@
+# Description: Tests for androidx.test.core
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "MotionEventBuilderTest",
+    srcs =
+        ["MotionEventBuilderTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "MotionEventBuilderTest_android",
+    srcs =
+        ["MotionEventBuilderTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/BUILD b/espresso/BUILD
new file mode 100644
index 000000000..2f0400637
--- /dev/null
+++ b/espresso/BUILD
@@ -0,0 +1,18 @@
+load("@rules_license//rules:license.bzl", "license")
+
+package(
+    default_applicable_licenses = [":license"],
+    default_testonly = 1,
+)
+
+license(
+    name = "license",
+    package_name = "espresso",
+)
+
+licenses(["notice"])
+
+exports_files([
+    "proguard_binary.cfg",
+    "LICENSE",
+])
diff --git a/espresso/BUILD.bazel b/espresso/BUILD.bazel
deleted file mode 100644
index f52d48f2c..000000000
--- a/espresso/BUILD.bazel
+++ /dev/null
@@ -1,6 +0,0 @@
-licenses(["notice"])  # Apache License 2.0
-
-exports_files([
-    "proguard_binary.cfg",
-    "LICENSE",
-])
diff --git a/espresso/CHANGELOG.md b/espresso/CHANGELOG.md
new file mode 100644
index 000000000..41eba945b
--- /dev/null
+++ b/espresso/CHANGELOG.md
@@ -0,0 +1,36 @@
+### Espresso {version} {:#espresso-{version}}
+
+{{date}}
+
+The following artifacts were released:
+
+* `androidx.test.espresso:espresso-accessibility:{version}`
+* `androidx.test.espresso:espresso-core:{version}`
+* `androidx.test.espresso:espresso-contrib:{version}`
+* `androidx.test.espresso:espresso-idling-resource:{version}`
+* `androidx.test.espresso:espresso-intents:{version}`
+* `androidx.test.espresso:espresso-remote:{version}`
+* `androidx.test.espresso:espresso-web:{version}`
+* `androidx.test.espresso.idling:idling-concurrent:{version}`
+* `androidx.test.espresso.idling:idling-net:{version}`
+
+**Bug Fixes**
+
+* Replace now-unnecessary reflection from TestLooperManagerCompat when using Android SDK 36 APIs
+* Don't suppress AppNotIdleException if dumpThreadStates throws.
+* Remove Espresso.onIdle tracing
+* Fix NullPointerException in UiControllerImpl.
+
+**New Features**
+
+* Add `doesNotHaveFlag` and `doesNotHaveFlags` matchers to `IntentMatchers`.
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/AccessibilityChecks.java b/espresso/accessibility/java/androidx/test/espresso/accessibility/AccessibilityChecks.java
index 8af943432..81783cfb9 100644
--- a/espresso/accessibility/java/androidx/test/espresso/accessibility/AccessibilityChecks.java
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/AccessibilityChecks.java
@@ -62,7 +62,7 @@ public void check(View view, NoMatchingViewException noViewFoundException) {
           }
           StrictMode.ThreadPolicy originalPolicy = StrictMode.allowThreadDiskWrites();
           try {
-            CHECK_EXECUTOR.checkAndReturnResults(view);
+            CHECK_EXECUTOR.check(view);
           } finally {
             StrictMode.setThreadPolicy(originalPolicy);
           }
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml b/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml
index 7246f353c..89b9c7b1c 100644
--- a/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.espresso.accessibility" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application />
 
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD b/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD
new file mode 100644
index 000000000..f331576f0
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD
@@ -0,0 +1,58 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# Description:
+# Espresso Accessibility APIs
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+android_library(
+    name = "accessibility_checks",
+    srcs = [
+        "AccessibilityChecks.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
+        "@maven//:org_hamcrest_hamcrest_core",  # unuseddeps: keep
+        "@maven//:org_hamcrest_hamcrest_library",  # unuseddeps: keep
+    ],
+)
+
+axt_android_aar(
+    name = "accessibility_checks_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.accessibility",
+    ],
+    included_dep = ":accessibility_checks",
+)
+
+maven_artifact(
+    name = "accessibility_checks_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":accessibility_checks_aar",
+)
+
+dackka_test(
+    name = "accessibility_checks_doc",
+    runtime_dep = ":accessibility_checks",
+    src_jar =
+        ":accessibility_checks_aar-src.jar",
+)
+
+api_checks(
+    name = "accessibility_api",
+    runtime_dep = ":accessibility_checks",
+    src_jar =
+        ":accessibility_checks_aar-src.jar",
+)
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD.bazel b/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD.bazel
deleted file mode 100644
index dfdc2b13f..000000000
--- a/espresso/accessibility/java/androidx/test/espresso/accessibility/BUILD.bazel
+++ /dev/null
@@ -1,66 +0,0 @@
-# Description:
-# Espresso Accessibility APIs
-
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ATF_VERSION", "ESPRESSO_VERSION")
-load("//build_extensions:droiddoc.bzl", "droiddoc")
-
-licenses(["notice"])
-
-package(
-    default_visibility = ["//:__subpackages__"],
-)
-
-android_library(
-    name = "accessibility_checks",
-    testonly = 1,
-    srcs = [
-        "AccessibilityChecks.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//espresso/core/java/androidx/test/espresso",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-axt_release_lib(
-    name = "accessibility_checks_release",
-    keep_spec = "androidx/test/espresso/accessibility",
-    remove_spec = "androidx/test/espresso/accessibility/R[$$\\.]",
-    deps = [
-        ":accessibility_checks",
-    ],
-)
-
-filegroup(
-    name = "accessibility_checks_src",
-    srcs = [
-        ":libaccessibility_checks-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "accessibility_checks_src_jars",
-    srcs = [
-        ":accessibility_checks_src",
-    ],
-)
-
-maven_artifact(
-    name = "accessibility_checks_maven_artifact",
-    src = ":accessibility_checks_release.aar",
-    artifact_deps = [
-        "androidx.test.espresso:espresso-core:%s" % ESPRESSO_VERSION,
-        "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:%s" % ATF_VERSION,
-    ],
-    artifact_id = "espresso-accessibility",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":accessibility_checks_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.4.0_public.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.4.0_public.txt
new file mode 100644
index 000000000..31204ffdd
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.4.0_public.txt
@@ -0,0 +1,11 @@
+// Signature format: 3.0
+package androidx.test.espresso.accessibility {
+
+  public final class AccessibilityChecks {
+    method public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method public static void disable();
+    method public static AccessibilityValidator enable();
+  }
+
+}
+
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.5.0_internal.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.5.0_public.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.5.0_public.txt
new file mode 100644
index 000000000..dfdbc0712
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.5.0_public.txt
@@ -0,0 +1,11 @@
+// Signature format: 3.0
+package androidx.test.espresso.accessibility {
+
+  public final class AccessibilityChecks {
+    method public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method public static void disable();
+    method public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+}
+
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.6.0_internal.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.6.0_public.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.6.0_public.txt
new file mode 100644
index 000000000..dfdbc0712
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.6.0_public.txt
@@ -0,0 +1,11 @@
+// Signature format: 3.0
+package androidx.test.espresso.accessibility {
+
+  public final class AccessibilityChecks {
+    method public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method public static void disable();
+    method public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+}
+
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.7.0_internal.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.7.0_public.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.7.0_public.txt
new file mode 100644
index 000000000..dfdbc0712
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/3.7.0_public.txt
@@ -0,0 +1,11 @@
+// Signature format: 3.0
+package androidx.test.espresso.accessibility {
+
+  public final class AccessibilityChecks {
+    method public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method public static void disable();
+    method public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+}
+
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/current_internal.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/accessibility/java/androidx/test/espresso/accessibility/api/current_public.txt b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/current_public.txt
new file mode 100644
index 000000000..b9f7f8bf7
--- /dev/null
+++ b/espresso/accessibility/java/androidx/test/espresso/accessibility/api/current_public.txt
@@ -0,0 +1,11 @@
+// Signature format: 5.0
+package androidx.test.espresso.accessibility {
+
+  public final class AccessibilityChecks {
+    method public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method public static void disable();
+    method public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+}
+
diff --git a/espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD b/espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD
new file mode 100644
index 000000000..2c43dc27c
--- /dev/null
+++ b/espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD
@@ -0,0 +1,32 @@
+# Description:
+#   Tests for espresso accessibility apis
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "AccessibilityChecksIntegrationTest",
+    srcs = ["AccessibilityChecksIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD.bazel b/espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD.bazel
deleted file mode 100644
index 614b58661..000000000
--- a/espresso/accessibility/javatests/androidx/test/espresso/accessibility/BUILD.bazel
+++ /dev/null
@@ -1,32 +0,0 @@
-# Description:
-#  Tests for espresso accessibility apis
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["*.java"]),
-    binary_args = {"multidex": "legacy"},
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//core",
-        "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/AccessibilityChecks.java b/espresso/contrib/java/androidx/test/espresso/contrib/AccessibilityChecks.java
index aa3d5221a..7ed25f7e6 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/AccessibilityChecks.java
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/AccessibilityChecks.java
@@ -65,7 +65,7 @@ public void check(View view, NoMatchingViewException noViewFoundException) {
           }
           StrictMode.ThreadPolicy originalPolicy = StrictMode.allowThreadDiskWrites();
           try {
-            CHECK_EXECUTOR.checkAndReturnResults(view);
+            CHECK_EXECUTOR.check(view);
           } finally {
             StrictMode.setThreadPolicy(originalPolicy);
           }
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml b/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml
index 5ca2f5ce8..221ee4e85 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.espresso.contrib" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application />
 
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD
new file mode 100644
index 000000000..80df262f1
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD
@@ -0,0 +1,196 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:jetify.bzl", "jetify_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# Description:
+#   Contributed / non-core functionality of Espresso. Tools which add on to
+#   Espresso belong here.
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+COMMON_JAVACOPTS = [
+    "-Xep:ObjectToString:OFF",  # See http://go/objecttostring-lsc
+]
+
+android_library(
+    name = "resources",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+)
+
+android_library(
+    name = "counting_idling_resource",
+    visibility = ["//visibility:public"],
+    exports = [
+        "//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
+    ],
+)
+
+android_library(
+    name = "scheduled_thread_pool_idling_resource",
+    visibility = ["//visibility:public"],
+    exports = [
+        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:scheduled_thread_pool_idling_resource",
+    ],
+)
+
+android_library(
+    name = "thread_pool_idling_resource",
+    visibility = ["//visibility:public"],
+    exports = [
+        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
+    ],
+)
+
+android_library(
+    name = "picker_actions",
+    srcs = ["PickerActions.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+COMMON_JAVACOPTS = [
+    "-Xep:ObjectToString:OFF",  # See http://go/objecttostring-lsc
+]
+
+jetify_android_library(
+    name = "recycler_view",
+    srcs = ["RecyclerViewActions.java"],
+    javacopts = COMMON_JAVACOPTS,
+    jetify_sources = True,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:androidx_recyclerview_recyclerview",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+android_library(
+    name = "drawer_actions",
+    srcs = [
+        "DrawerActions.java",
+        "DrawerMatchers.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":resources",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "@maven//:androidx_core_core",
+        "@maven//:androidx_drawerlayout_drawerlayout",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "activity_result_matchers",
+    srcs = [
+        "ActivityResultMatchers.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "accessibility_checks",
+    srcs = [
+        "AccessibilityChecks.java",
+    ],
+    deprecation = "use //espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks instead",
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "design_lib_actions",
+    srcs = ["NavigationViewActions.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "@maven//:androidx_appcompat_appcompat",
+        "@maven//:androidx_drawerlayout_drawerlayout",
+        "@maven//:com_google_android_material_material",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+android_library(
+    name = "view_pager_actions",
+    srcs = ["ViewPagerActions.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "@maven//:androidx_viewpager_viewpager",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "espresso_contrib_aar_lib",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    exports = [
+        ":accessibility_checks",
+        ":activity_result_matchers",
+        ":design_lib_actions",
+        ":drawer_actions",
+        ":picker_actions",
+        ":recycler_view",
+        ":view_pager_actions",
+    ],
+)
+
+axt_android_aar(
+    name = "espresso_contrib_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.contrib",
+    ],
+    included_dep = ":espresso_contrib_aar_lib",
+)
+
+maven_artifact(
+    name = "espresso_contrib_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":espresso_contrib_aar",
+)
+
+dackka_test(
+    name = "espresso_contrib_doc",
+    runtime_dep = ":espresso_contrib_aar_lib",
+    src_jar = ":espresso_contrib_aar-src.jar",
+)
+
+api_checks(
+    name = "espresso_contrib_api",
+    runtime_dep = ":espresso_contrib_aar_lib",
+    src_jar = ":espresso_contrib_aar-src.jar",
+)
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD.bazel b/espresso/contrib/java/androidx/test/espresso/contrib/BUILD.bazel
deleted file mode 100644
index 09f32bff5..000000000
--- a/espresso/contrib/java/androidx/test/espresso/contrib/BUILD.bazel
+++ /dev/null
@@ -1,238 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "ATF_VERSION", "ESPRESSO_VERSION", "GOOGLE_MATERIAL_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-# Description:
-#   Contributed / non-core functionality of Espresso. Tools which add on to
-#   Espresso belong here.
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = ["//:__subpackages__"],
-)
-
-android_library(
-    name = "resources",
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-)
-
-android_library(
-    name = "counting_idling_resource",
-    visibility = ["//visibility:public"],
-    exports = [
-        "//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
-    ],
-)
-
-android_library(
-    name = "scheduled_thread_pool_idling_resource",
-    visibility = ["//visibility:public"],
-    exports = [
-        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:scheduled_thread_pool_idling_resource",
-    ],
-)
-
-android_library(
-    name = "thread_pool_idling_resource",
-    visibility = ["//visibility:public"],
-    exports = [
-        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
-    ],
-)
-
-android_library(
-    name = "picker_actions",
-    srcs = ["PickerActions.java"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-        "//:androidx_core",
-        "//:androidx_legacy_support_core_ui",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "recycler_view",
-    srcs = ["RecyclerViewActions.java"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":guava_checks",
-        "//:androidx_annotation",
-        "//:androidx_core",
-        "//:androidx_legacy_support_core_ui",
-        "//:androidx_recyclerview",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "drawer_actions",
-    testonly = 1,
-    srcs = [
-        "DrawerActions.java",
-        "DrawerMatchers.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":resources",
-        "//:androidx_annotation",
-        "//:androidx_core",
-        "//:androidx_drawerlayout",
-        "//:androidx_legacy_support_core_ui",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "activity_result_matchers",
-    srcs = [
-        "ActivityResultMatchers.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "accessibility_checks",
-    testonly = 1,
-    srcs = [
-        "AccessibilityChecks.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":guava_checks",
-        "//espresso/core/java/androidx/test/espresso",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "design_lib_actions",
-    testonly = 1,
-    srcs = ["NavigationViewActions.java"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-        "//:androidx_core",
-        "//:androidx_drawerlayout",
-        "//:androidx_legacy_support_core_ui",
-        "//:androidx_recyclerview",
-        "//:google_android_material",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "view_pager_actions",
-    testonly = 1,
-    srcs = ["ViewPagerActions.java"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-        "//:androidx_core",
-        "//:androidx_legacy_support_core_ui",
-        "//:androidx_viewpager",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "guava_checks",
-    srcs = ["Checks.java"],
-    deps = ["@maven//:com_google_code_findbugs_jsr305"],
-)
-
-android_library(
-    name = "espresso_contrib_release_lib",
-    testonly = 1,
-    exports = [
-        ":accessibility_checks",
-        ":activity_result_matchers",
-        ":design_lib_actions",
-        ":drawer_actions",
-        ":guava_checks",
-        ":picker_actions",
-        ":recycler_view",
-        ":view_pager_actions",
-    ],
-)
-
-axt_release_lib(
-    name = "espresso_contrib_release",
-    keep_spec = "androidx/test/espresso/contrib",
-    multidex = "native",
-    remove_spec = "androidx/test/espresso/contrib/R[$$\\.]",
-    resource_files = glob(["res/**"]),
-    deps = [
-        ":espresso_contrib_release_lib",
-    ],
-)
-
-filegroup(
-    name = "contrib_src",
-    srcs = [
-        ":libaccessibility_checks-src.jar",
-        ":libactivity_result_matchers-src.jar",
-        ":libcounting_idling_resource-src.jar",
-        ":libdesign_lib_actions-src.jar",
-        ":libdrawer_actions-src.jar",
-        ":libpicker_actions-src.jar",
-        ":librecycler_view-src.jar",
-        ":libview_pager_actions-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "contrib_src_jars",
-    srcs = [
-        ":contrib_src",
-    ],
-)
-
-maven_artifact(
-    name = "espresso_contrib_maven_artifact",
-    src = ":espresso_contrib_release.aar",
-    artifact_deps = [
-        "androidx.test.espresso:espresso-core:%s" % ESPRESSO_VERSION,
-        "androidx.test.espresso:espresso-idling-resource:%s" % ESPRESSO_VERSION,
-        "com.google.android.material:material:%s" % GOOGLE_MATERIAL_VERSION,
-        "androidx.recyclerview:recyclerview:%s" % ANDROIDX_VERSION,
-        "androidx.drawerlayout:drawerlayout:%s" % ANDROIDX_VERSION,
-        "androidx.viewpager:viewpager:%s" % ANDROIDX_VERSION,
-        "androidx.core:core:%s" % ANDROIDX_VERSION,
-        "androidx.legacy:legacy-support-core-utils:%s" % ANDROIDX_VERSION,
-        "com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:%s" % ATF_VERSION,
-    ],
-    artifact_id = "espresso-contrib",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":contrib_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/Checks.java b/espresso/contrib/java/androidx/test/espresso/contrib/Checks.java
deleted file mode 100644
index ba67eeb71..000000000
--- a/espresso/contrib/java/androidx/test/espresso/contrib/Checks.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.espresso.contrib;
-
-import javax.annotation.Nullable;
-
-/** Substitute for Guava Preconditions to avoid pulling in guava as a dep to the contrib project. */
-final class Checks {
-
-  private Checks() {}
-
-  public static <T> T checkNotNull(T reference) {
-    if (reference == null) {
-      throw new NullPointerException();
-    }
-    return reference;
-  }
-
-  public static <T> T checkNotNull(T reference, Object errorMessage) {
-    if (reference == null) {
-      throw new NullPointerException(String.valueOf(errorMessage));
-    }
-    return reference;
-  }
-
-  public static <T> T checkNotNull(
-      T reference, String errorMessageTemplate, Object... errorMessageArgs) {
-    if (reference == null) {
-      // If either of these parameters is null, the right thing happens anyway
-      throw new NullPointerException(format(errorMessageTemplate, errorMessageArgs));
-    }
-    return reference;
-  }
-
-  public static void checkArgument(
-      boolean expression,
-      @Nullable String errorMessageTemplate,
-      @Nullable Object... errorMessageArgs) {
-    if (!expression) {
-      throw new IllegalArgumentException(format(errorMessageTemplate, errorMessageArgs));
-    }
-  }
-
-  public static void checkState(
-      boolean expression,
-      @Nullable String errorMessageTemplate,
-      @Nullable Object... errorMessageArgs) {
-    if (!expression) {
-      throw new IllegalStateException(format(errorMessageTemplate, errorMessageArgs));
-    }
-  }
-
-  private static String format(String template, Object... args) {
-    template = String.valueOf(template); // null -> "null"
-
-    // start substituting the arguments into the '%s' placeholders
-    StringBuilder builder = new StringBuilder(template.length() + 16 * args.length);
-    int templateStart = 0;
-    int i = 0;
-    while (i < args.length) {
-      int placeholderStart = template.indexOf("%s", templateStart);
-      if (placeholderStart == -1) {
-        break;
-      }
-      builder.append(template.substring(templateStart, placeholderStart));
-      builder.append(args[i++]);
-      templateStart = placeholderStart + 2;
-    }
-    builder.append(template.substring(templateStart));
-
-    // if we run out of placeholders, append the extra args in square braces
-    if (i < args.length) {
-      builder.append(" [");
-      builder.append(args[i++]);
-      while (i < args.length) {
-        builder.append(", ");
-        builder.append(args[i++]);
-      }
-      builder.append(']');
-    }
-
-    return builder.toString();
-  }
-}
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/DrawerActions.java b/espresso/contrib/java/androidx/test/espresso/contrib/DrawerActions.java
index 1e3b34fd1..10918bcda 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/DrawerActions.java
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/DrawerActions.java
@@ -22,8 +22,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 
-import androidx.core.view.GravityCompat;
 import android.view.View;
+import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.drawerlayout.widget.DrawerLayout.SimpleDrawerListener;
 import androidx.test.espresso.IdlingRegistry;
@@ -36,8 +36,8 @@
 /**
  * Espresso actions for using a {@link DrawerLayout}.
  *
- * @see <a href="http://developer.android.com/design/patterns/navigation-drawer.html">Navigation
- *     drawer design guide</a>
+ * <p>See <a href="http://developer.android.com/design/patterns/navigation-drawer.html">Navigation
+ * drawer design guide</a>
  */
 public final class DrawerActions {
   private static final AtomicInteger nextId = new AtomicInteger();
@@ -60,7 +60,6 @@ private DrawerActions() {
   }
 
   private abstract static class DrawerAction implements ViewAction {
-
     @Override
     public final Matcher<View> getConstraints() {
       return isAssignableFrom(DrawerLayout.class);
@@ -84,7 +83,6 @@ public final void perform(UiController uiController, View view) {
         drawer.addDrawerListener(idlingListener);
         IdlingRegistry.getInstance().register(idlingListener);
       }
-
       performAction(uiController, drawer);
       uiController.loopMainThreadUntilIdle();
 
@@ -194,17 +192,81 @@ protected Matcher<View> checkAction() {
       }
 
       @Override
-      protected void performAction(UiController uiController, DrawerLayout view) {
-        view.closeDrawer(gravity);
+      public void performAction(UiController uiController, DrawerLayout drawer) {
+        IdlingDrawerClosedListener closeListener = new IdlingDrawerClosedListener();
+        drawer.addDrawerListener(closeListener);
+        drawer.closeDrawer(gravity);
         uiController.loopMainThreadUntilIdle();
-        // If still open wait some more...
-        if (view.isDrawerVisible(gravity)) {
-          uiController.loopMainThreadForAtLeast(300);
-        }
+        // Need to wait extra time after it closes to reduce flakiness.
+        uiController.loopMainThreadForAtLeast(300);
+        drawer.removeDrawerListener(closeListener);
       }
     };
   }
 
+  /**
+   * Creates an action that will wait for the drawer to close. Use this in cases where the closing
+   * of the drawer is implicit, such as selecting an item in the drawer. No operation if the drawer
+   * is closed. This uses an idling resource to wait for close, so it will fail if it does not close
+   * within the idling resource timeout.
+   */
+  public static ViewAction waitForClose() {
+    return new DrawerAction() {
+      @Override
+      public String getDescription() {
+        return "waiting for drawer to close";
+      }
+
+      @Override
+      protected Matcher<View> checkAction() {
+        return isOpen();
+      }
+
+      @Override
+      public void performAction(UiController uiController, DrawerLayout drawer) {
+        // Add a listener that waits for the drawer to be closed, wait for it to idle,
+        // and then remove the listener immediately.
+        IdlingDrawerClosedListener closeListener = new IdlingDrawerClosedListener();
+        drawer.addDrawerListener(closeListener);
+        uiController.loopMainThreadUntilIdle();
+        drawer.removeDrawerListener(closeListener);
+      }
+    };
+  }
+
+  /** Drawer listener that functions as an {@link IdlingResource} for Espresso. */
+  private static final class IdlingDrawerClosedListener extends SimpleDrawerListener
+      implements IdlingResource {
+
+    private final int id = nextId.getAndIncrement();
+
+    private ResourceCallback callback;
+    private boolean isClosed = false;
+
+    @Override
+    public void onDrawerClosed(View view) {
+      isClosed = true;
+      if (callback != null) {
+        callback.onTransitionToIdle();
+      }
+    }
+
+    @Override
+    public String getName() {
+      return "IdlingDrawerListener::" + id;
+    }
+
+    @Override
+    public boolean isIdleNow() {
+      return isClosed;
+    }
+
+    @Override
+    public void registerIdleTransitionCallback(ResourceCallback callback) {
+      this.callback = callback;
+    }
+  }
+
   /** Drawer listener that functions as an {@link IdlingResource} for Espresso. */
   private static final class IdlingDrawerListener extends SimpleDrawerListener
       implements IdlingResource {
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/DrawerMatchers.java b/espresso/contrib/java/androidx/test/espresso/contrib/DrawerMatchers.java
index 6cbb17359..fe09c2146 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/DrawerMatchers.java
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/DrawerMatchers.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.contrib;
 
-import androidx.core.view.GravityCompat;
 import android.view.View;
+import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.test.espresso.matcher.BoundedMatcher;
 import org.hamcrest.Description;
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/PickerActions.java b/espresso/contrib/java/androidx/test/espresso/contrib/PickerActions.java
index bdcc03e86..a42a41126 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/PickerActions.java
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/PickerActions.java
@@ -30,8 +30,8 @@
 /**
  * Espresso action for interacting with {@link DatePicker} and {@link TimePicker}.
  *
- * @see <a href="http://developer.android.com/guide/topics/ui/controls/pickers.html">Pickers API
- *     guide</a>
+ * <p>See <a href="http://developer.android.com/guide/topics/ui/controls/pickers.html">Pickers API
+ * guide</a>
  */
 public final class PickerActions {
 
@@ -39,7 +39,13 @@ private PickerActions() {
     // no Instance
   }
 
-  /** Returns a {@link ViewAction} that sets a date on a {@link DatePicker}. */
+  /**
+   * Returns a {@link ViewAction} that sets a date on a {@link DatePicker}.
+   *
+   * @param year The year.
+   * @param monthOfYear The month which is starting from zero.
+   * @param dayOfMonth The day of the month.
+   */
   public static ViewAction setDate(final int year, final int monthOfYear, final int dayOfMonth) {
 
     // monthOfYear which starts with zero in DatePicker widget.
@@ -58,7 +64,6 @@ public String getDescription() {
         return "set date";
       }
 
-      @SuppressWarnings("unchecked")
       @Override
       public Matcher<View> getConstraints() {
         return allOf(isAssignableFrom(DatePicker.class), isDisplayed());
@@ -66,7 +71,12 @@ public Matcher<View> getConstraints() {
     };
   }
 
-  /** Returns a {@link ViewAction} that sets a time on a {@link TimePicker}. */
+  /**
+   * Returns a {@link ViewAction} that sets a time on a {@link TimePicker}.
+   *
+   * @param hours the hour to set, in the range (0-23).
+   * @param minutes the minute to set, in the range (0-59).
+   */
   public static ViewAction setTime(final int hours, final int minutes) {
 
     return new ViewAction() {
@@ -83,7 +93,6 @@ public String getDescription() {
         return "set time";
       }
 
-      @SuppressWarnings("unchecked")
       @Override
       public Matcher<View> getConstraints() {
         return allOf(isAssignableFrom(TimePicker.class), isDisplayed());
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/RecyclerViewActions.java b/espresso/contrib/java/androidx/test/espresso/contrib/RecyclerViewActions.java
index 95f35adf8..ce4d16683 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/RecyclerViewActions.java
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/RecyclerViewActions.java
@@ -16,18 +16,19 @@
 
 package androidx.test.espresso.contrib;
 
-import static androidx.test.espresso.contrib.Checks.checkArgument;
-import static androidx.test.espresso.contrib.Checks.checkNotNull;
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.allOf;
 
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.Adapter;
-import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.util.SparseArray;
 import android.view.View;
 import android.widget.AdapterView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import androidx.test.espresso.Espresso;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
@@ -35,6 +36,7 @@
 import androidx.test.espresso.util.HumanReadables;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -127,6 +129,12 @@ public static <VH extends ViewHolder> ViewAction scrollToPosition(final int posi
     return new ScrollToPositionViewAction(position);
   }
 
+  /** Returns a {@link ViewAction} which scrolls {@link RecyclerView} to the last position. */
+  @NonNull
+  public static <VH extends ViewHolder> ViewAction scrollToLastPosition() {
+    return new ScrollToLastPositionViewAction();
+  }
+
   /**
    * Performs a {@link ViewAction} on a view matched by viewHolderMatcher.
    *
@@ -204,13 +212,18 @@ public PositionableRecyclerViewAction atPosition(int position) {
     public String getDescription() {
       if (atPosition == NO_POSITION) {
         return String.format(
+            Locale.ROOT,
             "performing ViewAction: %s on item matching: %s",
-            viewAction.getDescription(), viewHolderMatcher);
+            viewAction.getDescription(),
+            viewHolderMatcher);
 
       } else {
         return String.format(
+            Locale.ROOT,
             "performing ViewAction: %s on %d-th item matching: %s",
-            viewAction.getDescription(), atPosition, viewHolderMatcher);
+            viewAction.getDescription(),
+            atPosition,
+            viewHolderMatcher);
       }
     }
 
@@ -343,7 +356,10 @@ public String getDescription() {
         return "scroll RecyclerView to: " + viewHolderMatcher;
       } else {
         return String.format(
-            "scroll RecyclerView to the: %dth matching %s.", atPosition, viewHolderMatcher);
+            Locale.ROOT,
+            "scroll RecyclerView to the: %dth matching %s.",
+            atPosition,
+            viewHolderMatcher);
       }
     }
 
@@ -413,6 +429,30 @@ public void perform(UiController uiController, View view) {
     }
   }
 
+  /**
+   * {@link ViewAction} which scrolls {@link RecyclerView} to the last position. See {@link
+   * RecyclerViewActions#scrollToLastPosition} for more details.
+   */
+  private static final class ScrollToLastPositionViewAction implements ViewAction {
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Matcher<View> getConstraints() {
+      return allOf(isAssignableFrom(RecyclerView.class), isDisplayed());
+    }
+
+    @Override
+    public String getDescription() {
+      return "scroll RecyclerView to last position";
+    }
+
+    @Override
+    public void perform(UiController uiController, View view) {
+      RecyclerView recyclerView = (RecyclerView) view;
+      recyclerView.scrollToPosition(recyclerView.getAdapter().getItemCount() - 1);
+    }
+  }
+
   /**
    * Finds positions of items in {@link RecyclerView} which is matching given viewHolderMatcher.
    * This is similar to positionMatching(RecyclerView, Matcher<VH>), except that it returns list of
@@ -447,9 +487,9 @@ private static <T extends VH, VH extends ViewHolder> List<MatchedItem> itemsMatc
                 position,
                 HumanReadables.getViewHierarchyErrorMessage(
                     cachedViewHolder.itemView,
-                    null,
+                    /* problemViews= */ null,
                     "\n\n*** Matched ViewHolder item at position: " + position + " ***",
-                    null)));
+                    /* problemViewSuffix= */ null)));
         adapter.onViewRecycled((T) cachedViewHolder);
         if (matchedItems.size() == max) {
           break;
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/ViewPagerActions.java b/espresso/contrib/java/androidx/test/espresso/contrib/ViewPagerActions.java
index fcbfae819..e83e1c527 100644
--- a/espresso/contrib/java/androidx/test/espresso/contrib/ViewPagerActions.java
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/ViewPagerActions.java
@@ -18,9 +18,9 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 
-import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.Espresso;
 import androidx.test.espresso.IdlingResource;
 import androidx.test.espresso.UiController;
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.4.0_public.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.4.0_public.txt
new file mode 100644
index 000000000..e27e6f2c2
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.4.0_public.txt
@@ -0,0 +1,69 @@
+// Signature format: 3.0
+package androidx.test.espresso.contrib {
+
+  @Deprecated public final class AccessibilityChecks {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method @Deprecated public static AccessibilityValidator enable();
+  }
+
+  public final class ActivityResultMatchers {
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult>! hasResultCode(int);
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
+  }
+
+  public final class DrawerActions {
+    method public static androidx.test.espresso.ViewAction! close();
+    method public static androidx.test.espresso.ViewAction! close(int);
+    method @Deprecated public static void closeDrawer(int);
+    method @Deprecated public static void closeDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! open();
+    method public static androidx.test.espresso.ViewAction! open(int);
+    method @Deprecated public static void openDrawer(int);
+    method @Deprecated public static void openDrawer(int, int);
+  }
+
+  public final class DrawerMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen();
+  }
+
+  public final class NavigationViewActions {
+    method public static androidx.test.espresso.ViewAction! navigateTo(int);
+  }
+
+  public final class PickerActions {
+    method public static androidx.test.espresso.ViewAction! setDate(int, int, int);
+    method public static androidx.test.espresso.ViewAction! setTime(int, int);
+  }
+
+  public final class RecyclerViewActions {
+    method public static <VH extends ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnItem(org.hamcrest.Matcher<android.view.View!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends ViewHolder> androidx.test.espresso.ViewAction! actionOnItemAtPosition(int, androidx.test.espresso.ViewAction!);
+    method public static <VH extends ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollTo(org.hamcrest.Matcher<android.view.View!>!);
+    method public static <VH extends ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH!>!);
+    method public static <VH extends ViewHolder> androidx.test.espresso.ViewAction! scrollToPosition(int);
+  }
+
+  public static interface RecyclerViewActions.PositionableRecyclerViewAction extends androidx.test.espresso.ViewAction {
+    method public androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! atPosition(int);
+  }
+
+  public final class ViewPagerActions {
+    method public static androidx.test.espresso.ViewAction! clickBetweenTwoTitles(String!, String!);
+    method public static androidx.test.espresso.ViewAction! scrollLeft();
+    method public static androidx.test.espresso.ViewAction! scrollLeft(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollRight();
+    method public static androidx.test.espresso.ViewAction! scrollRight(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToFirst();
+    method public static androidx.test.espresso.ViewAction! scrollToFirst(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToLast();
+    method public static androidx.test.espresso.ViewAction! scrollToLast(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int, boolean);
+  }
+
+}
+
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.5.0_internal.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.5.0_public.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.5.0_public.txt
new file mode 100644
index 000000000..22cf3cb89
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.5.0_public.txt
@@ -0,0 +1,70 @@
+// Signature format: 3.0
+package androidx.test.espresso.contrib {
+
+  @Deprecated public final class AccessibilityChecks {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method @Deprecated public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+  public final class ActivityResultMatchers {
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult>! hasResultCode(int);
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
+  }
+
+  public final class DrawerActions {
+    method public static androidx.test.espresso.ViewAction! close();
+    method public static androidx.test.espresso.ViewAction! close(int);
+    method @Deprecated public static void closeDrawer(int);
+    method @Deprecated public static void closeDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! open();
+    method public static androidx.test.espresso.ViewAction! open(int);
+    method @Deprecated public static void openDrawer(int);
+    method @Deprecated public static void openDrawer(int, int);
+  }
+
+  public final class DrawerMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen();
+  }
+
+  public final class NavigationViewActions {
+    method public static androidx.test.espresso.ViewAction! navigateTo(int);
+  }
+
+  public final class PickerActions {
+    method public static androidx.test.espresso.ViewAction! setDate(int, int, int);
+    method public static androidx.test.espresso.ViewAction! setTime(int, int);
+  }
+
+  public final class RecyclerViewActions {
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnItem(org.hamcrest.Matcher<android.view.View!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! actionOnItemAtPosition(int, androidx.test.espresso.ViewAction!);
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollTo(org.hamcrest.Matcher<android.view.View!>!);
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH!>!);
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction scrollToLastPosition();
+    method public static <VH extends androidx.recyclerview.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! scrollToPosition(int);
+  }
+
+  public static interface RecyclerViewActions.PositionableRecyclerViewAction extends androidx.test.espresso.ViewAction {
+    method public androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! atPosition(int);
+  }
+
+  public final class ViewPagerActions {
+    method public static androidx.test.espresso.ViewAction! clickBetweenTwoTitles(String!, String!);
+    method public static androidx.test.espresso.ViewAction! scrollLeft();
+    method public static androidx.test.espresso.ViewAction! scrollLeft(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollRight();
+    method public static androidx.test.espresso.ViewAction! scrollRight(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToFirst();
+    method public static androidx.test.espresso.ViewAction! scrollToFirst(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToLast();
+    method public static androidx.test.espresso.ViewAction! scrollToLast(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int, boolean);
+  }
+
+}
+
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.6.0_internal.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.6.0_public.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.6.0_public.txt
new file mode 100644
index 000000000..cdc67bad8
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.6.0_public.txt
@@ -0,0 +1,71 @@
+// Signature format: 3.0
+package androidx.test.espresso.contrib {
+
+  @Deprecated public final class AccessibilityChecks {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method @Deprecated public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+  public final class ActivityResultMatchers {
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultCode(int);
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
+  }
+
+  public final class DrawerActions {
+    method public static androidx.test.espresso.ViewAction! close();
+    method public static androidx.test.espresso.ViewAction! close(int);
+    method @Deprecated public static void closeDrawer(int);
+    method @Deprecated public static void closeDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! open();
+    method public static androidx.test.espresso.ViewAction! open(int);
+    method @Deprecated public static void openDrawer(int);
+    method @Deprecated public static void openDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! waitForClose();
+  }
+
+  public final class DrawerMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen();
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen(int);
+  }
+
+  public final class NavigationViewActions {
+    method public static androidx.test.espresso.ViewAction! navigateTo(int);
+  }
+
+  public final class PickerActions {
+    method public static androidx.test.espresso.ViewAction! setDate(int, int, int);
+    method public static androidx.test.espresso.ViewAction! setTime(int, int);
+  }
+
+  public final class RecyclerViewActions {
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnItem(org.hamcrest.Matcher<android.view.View!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! actionOnItemAtPosition(int, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollTo(org.hamcrest.Matcher<android.view.View!>!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH!>!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction scrollToLastPosition();
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! scrollToPosition(int);
+  }
+
+  public static interface RecyclerViewActions.PositionableRecyclerViewAction extends androidx.test.espresso.ViewAction {
+    method public androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! atPosition(int);
+  }
+
+  public final class ViewPagerActions {
+    method public static androidx.test.espresso.ViewAction! clickBetweenTwoTitles(String!, String!);
+    method public static androidx.test.espresso.ViewAction! scrollLeft();
+    method public static androidx.test.espresso.ViewAction! scrollLeft(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollRight();
+    method public static androidx.test.espresso.ViewAction! scrollRight(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToFirst();
+    method public static androidx.test.espresso.ViewAction! scrollToFirst(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToLast();
+    method public static androidx.test.espresso.ViewAction! scrollToLast(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int, boolean);
+  }
+
+}
+
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.7.0_internal.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/3.7.0_public.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.7.0_public.txt
new file mode 100644
index 000000000..cdc67bad8
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/3.7.0_public.txt
@@ -0,0 +1,71 @@
+// Signature format: 3.0
+package androidx.test.espresso.contrib {
+
+  @Deprecated public final class AccessibilityChecks {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method @Deprecated public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+  public final class ActivityResultMatchers {
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultCode(int);
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
+  }
+
+  public final class DrawerActions {
+    method public static androidx.test.espresso.ViewAction! close();
+    method public static androidx.test.espresso.ViewAction! close(int);
+    method @Deprecated public static void closeDrawer(int);
+    method @Deprecated public static void closeDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! open();
+    method public static androidx.test.espresso.ViewAction! open(int);
+    method @Deprecated public static void openDrawer(int);
+    method @Deprecated public static void openDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! waitForClose();
+  }
+
+  public final class DrawerMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen();
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen(int);
+  }
+
+  public final class NavigationViewActions {
+    method public static androidx.test.espresso.ViewAction! navigateTo(int);
+  }
+
+  public final class PickerActions {
+    method public static androidx.test.espresso.ViewAction! setDate(int, int, int);
+    method public static androidx.test.espresso.ViewAction! setTime(int, int);
+  }
+
+  public final class RecyclerViewActions {
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnItem(org.hamcrest.Matcher<android.view.View!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! actionOnItemAtPosition(int, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollTo(org.hamcrest.Matcher<android.view.View!>!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH!>!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction scrollToLastPosition();
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! scrollToPosition(int);
+  }
+
+  public static interface RecyclerViewActions.PositionableRecyclerViewAction extends androidx.test.espresso.ViewAction {
+    method public androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! atPosition(int);
+  }
+
+  public final class ViewPagerActions {
+    method public static androidx.test.espresso.ViewAction! clickBetweenTwoTitles(String!, String!);
+    method public static androidx.test.espresso.ViewAction! scrollLeft();
+    method public static androidx.test.espresso.ViewAction! scrollLeft(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollRight();
+    method public static androidx.test.espresso.ViewAction! scrollRight(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToFirst();
+    method public static androidx.test.espresso.ViewAction! scrollToFirst(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToLast();
+    method public static androidx.test.espresso.ViewAction! scrollToLast(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int, boolean);
+  }
+
+}
+
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/current_internal.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt b/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt
new file mode 100644
index 000000000..0d26e2ca7
--- /dev/null
+++ b/espresso/contrib/java/androidx/test/espresso/contrib/api/current_public.txt
@@ -0,0 +1,71 @@
+// Signature format: 5.0
+package androidx.test.espresso.contrib {
+
+  @Deprecated public final class AccessibilityChecks {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! accessibilityAssertion();
+    method @Deprecated public static com.google.android.apps.common.testing.accessibility.framework.integrations.espresso.AccessibilityValidator! enable();
+  }
+
+  public final class ActivityResultMatchers {
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultCode(int);
+    method public static org.hamcrest.Matcher<? super android.app.Instrumentation.ActivityResult!>! hasResultData(org.hamcrest.Matcher<android.content.Intent!>!);
+  }
+
+  public final class DrawerActions {
+    method public static androidx.test.espresso.ViewAction! close();
+    method public static androidx.test.espresso.ViewAction! close(int);
+    method @Deprecated public static void closeDrawer(int);
+    method @Deprecated public static void closeDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! open();
+    method public static androidx.test.espresso.ViewAction! open(int);
+    method @Deprecated public static void openDrawer(int);
+    method @Deprecated public static void openDrawer(int, int);
+    method public static androidx.test.espresso.ViewAction! waitForClose();
+  }
+
+  public final class DrawerMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClosed(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen();
+    method public static org.hamcrest.Matcher<android.view.View!>! isOpen(int);
+  }
+
+  public final class NavigationViewActions {
+    method public static androidx.test.espresso.ViewAction! navigateTo(int);
+  }
+
+  public final class PickerActions {
+    method public static androidx.test.espresso.ViewAction! setDate(int, int, int);
+    method public static androidx.test.espresso.ViewAction! setTime(int, int);
+  }
+
+  public final class RecyclerViewActions {
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnHolderItem(org.hamcrest.Matcher<VH>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! actionOnItem(org.hamcrest.Matcher<android.view.View!>!, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! actionOnItemAtPosition(int, androidx.test.espresso.ViewAction!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollTo(org.hamcrest.Matcher<android.view.View!>!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! scrollToHolder(org.hamcrest.Matcher<VH>!);
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction scrollToLastPosition();
+    method public static <VH extends android.support.v7.widget.RecyclerView.ViewHolder> androidx.test.espresso.ViewAction! scrollToPosition(int);
+  }
+
+  public static interface RecyclerViewActions.PositionableRecyclerViewAction extends androidx.test.espresso.ViewAction {
+    method public androidx.test.espresso.contrib.RecyclerViewActions.PositionableRecyclerViewAction! atPosition(int);
+  }
+
+  public final class ViewPagerActions {
+    method public static androidx.test.espresso.ViewAction! clickBetweenTwoTitles(String!, String!);
+    method public static androidx.test.espresso.ViewAction! scrollLeft();
+    method public static androidx.test.espresso.ViewAction! scrollLeft(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollRight();
+    method public static androidx.test.espresso.ViewAction! scrollRight(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToFirst();
+    method public static androidx.test.espresso.ViewAction! scrollToFirst(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToLast();
+    method public static androidx.test.espresso.ViewAction! scrollToLast(boolean);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int);
+    method public static androidx.test.espresso.ViewAction! scrollToPage(int, boolean);
+  }
+
+}
+
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/AndroidManifest.xml b/espresso/contrib/javatests/androidx/test/espresso/contrib/AndroidManifest.xml
deleted file mode 100644
index b7c352cb1..000000000
--- a/espresso/contrib/javatests/androidx/test/espresso/contrib/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.espresso.contrib.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-
-    </application>
-
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.ui.app" />
-
-</manifest>
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD b/espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD
new file mode 100644
index 000000000..257118c34
--- /dev/null
+++ b/espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD
@@ -0,0 +1,169 @@
+# Description:
+#   Tests for espresso contrib classes
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load("//build_extensions:jetify.bzl", "jetify_android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+## Android tests
+
+jetify_android_library(
+    name = "recycler_view_tests",
+    srcs = [
+        "RecyclerViewGridLayoutManagerTest.java",
+        "RecyclerViewIntegrationTest.java",
+        "RecyclerViewLinearLayoutManagerTest.java",
+        "RecyclerViewStaggeredGridLayoutManagerTest.java",
+    ],
+    jetify_sources = True,
+    deps = [
+        "//core",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:recycler_view",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:androidx_recyclerview_recyclerview",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "AccessibilityChecksIntegrationTest",
+    srcs =
+        ["AccessibilityChecksIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:accessibility_checks",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ActivityResultMatchersTest",
+    srcs =
+        ["ActivityResultMatchersTest.java"],
+    deps = [
+        "//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "DrawerActionsIntegrationTest",
+    srcs =
+        ["DrawerActionsIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "NavigationViewActionsIntegrationTest",
+    srcs =
+        ["NavigationViewActionsIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:design_lib_actions",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:androidx_core_core",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "RecyclerViewGridLayoutManagerTest",
+    deps = [
+        ":recycler_view_tests",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:recycler_view",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "RecyclerViewLinearLayoutManagerTest",
+    deps = [
+        ":recycler_view_tests",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:recycler_view",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:androidx_recyclerview_recyclerview",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "RecyclerViewStaggeredGridLayoutManagerTest",
+    deps = [
+        ":recycler_view_tests",
+        "//espresso/contrib/java/androidx/test/espresso/contrib:recycler_view",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ViewPagerActionsIntegrationTest",
+    srcs =
+        ["ViewPagerActionsIntegrationTest.java"],
+    deps = [
+        "//espresso/contrib/java/androidx/test/espresso/contrib:view_pager_actions",
+        "//espresso/core/java/androidx/test/espresso",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD.bazel b/espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD.bazel
deleted file mode 100644
index 91d8772a0..000000000
--- a/espresso/contrib/javatests/androidx/test/espresso/contrib/BUILD.bazel
+++ /dev/null
@@ -1,86 +0,0 @@
-# Description:
-#   Tests for espresso contrib classes
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-## Android tests
-
-UTIL_SRC = ["RecyclerViewIntegrationTest.java"]
-
-android_library(
-    name = "util",
-    testonly = 1,
-    srcs = UTIL_SRC,
-    deps = [
-        "//:androidx_recyclerview",
-        "//core",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:recycler_view",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//runner/android_junit_runner",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["*.java"],
-        exclude = UTIL_SRC + [
-            # does not support androidx
-            "AccessibilityChecksIntegrationTest.java",
-            # TODO(b/151977929): time out
-            "NavigationViewActionsIntegrationTest.java",
-            "RecyclerViewGridLayoutManagerTest.java",
-            "RecyclerViewLinearLayoutManagerTest.java",
-            "RecyclerViewStaggeredGridLayoutManagerTest.java",
-        ],
-    ),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        ":util",
-        "//:androidx_core",
-        "//:androidx_recyclerview",
-        "//core",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:accessibility_checks",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:design_lib_actions",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:recycler_view",
-        "//espresso/contrib/java/androidx/test/espresso/contrib:view_pager_actions",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:javax_inject_javax_inject",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/DrawerActionsIntegrationTest.java b/espresso/contrib/javatests/androidx/test/espresso/contrib/DrawerActionsIntegrationTest.java
index c686edfe4..b0ec157b0 100644
--- a/espresso/contrib/javatests/androidx/test/espresso/contrib/DrawerActionsIntegrationTest.java
+++ b/espresso/contrib/javatests/androidx/test/espresso/contrib/DrawerActionsIntegrationTest.java
@@ -24,6 +24,7 @@
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.contrib.DrawerActions.close;
 import static androidx.test.espresso.contrib.DrawerActions.open;
+import static androidx.test.espresso.contrib.DrawerActions.waitForClose;
 import static androidx.test.espresso.contrib.DrawerMatchers.isClosed;
 import static androidx.test.espresso.contrib.DrawerMatchers.isOpen;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
@@ -91,6 +92,8 @@ public void testOpenDrawer_clickItem() {
     String rowContents = DrawerActivity.DRAWER_CONTENTS[rowIndex];
     onData(allOf(is(instanceOf(String.class)), is(rowContents))).perform(click());
 
+    onView(withId(R.id.drawer_layout)).perform(waitForClose());
+
     // clicking the item should close the drawer.
     onView(withId(R.id.drawer_layout)).check(matches(isClosed()));
 
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewIntegrationTest.java b/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewIntegrationTest.java
index 82bbc1413..cfbb0115d 100644
--- a/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewIntegrationTest.java
+++ b/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewIntegrationTest.java
@@ -31,19 +31,18 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static com.google.common.base.Preconditions.checkArgument;
+import static androidx.test.internal.util.Checks.checkArgument;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.any;
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.fail;
 
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.core.app.ActivityScenario.ActivityAction;
 import androidx.test.espresso.PerformException;
-import androidx.test.filters.Suppress;
 import androidx.test.ui.app.ItemListAdapter.CustomViewHolder;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.RecyclerViewActivity;
@@ -51,6 +50,7 @@
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public abstract class RecyclerViewIntegrationTest {
@@ -191,7 +191,7 @@ public void testScrolling_scrollToItemAndClick() {
   }
 
   // TODO(b/68003948): flaky
-  @Suppress
+  @Ignore
   @Test
   public void testScrolling_scrollToMultipleViewsAndClick() {
     onView(withId(rvLayoutId)).perform(scrollTo(hasDescendant(withText(ITEM_16))));
@@ -338,7 +338,7 @@ public void testActionOnItemAtPosition_clickOnLastAndFirstItem() {
   }
 
   // TODO(b/68003948): flaky
-  @Suppress
+  @Ignore
   @Test
   public void testActionsOnItem_clickMultipleItems() throws InterruptedException {
     onView(withItemText(ITEM_64)).check(doesNotExist());
@@ -362,7 +362,9 @@ public void testActionsOnItem_clickMultipleItems() throws InterruptedException {
     onView(withId(selectedItemId)).check(matches(withText(expectedItem0Text)));
   }
 
-  /** @return the layout id of the {@link androidx.recyclerview.widget.RecyclerView} used. */
+  /**
+   * @return the layout id of the {@link androidx.recyclerview.widget.RecyclerView} used.
+   */
   protected abstract int getRVLayoutId();
 
   /** @return the view id of the selected item {@link android.widget.TextView} */
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewLinearLayoutManagerTest.java b/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewLinearLayoutManagerTest.java
index 9a1bf3015..20b931bf0 100644
--- a/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewLinearLayoutManagerTest.java
+++ b/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewLinearLayoutManagerTest.java
@@ -33,8 +33,8 @@
 import org.junit.runner.RunWith;
 
 /**
- * {@link RecyclerViewIntegrationTest}s for {@link androidx.recyclerview.widget.RecyclerView} using a
- * {@link androidx.recyclerview.widget.LinearLayoutManager}
+ * {@link RecyclerViewIntegrationTest}s for {@link androidx.recyclerview.widget.RecyclerView} using
+ * a {@link androidx.recyclerview.widget.LinearLayoutManager}
  */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
diff --git a/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewStaggeredGridLayoutManagerTest.java b/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewStaggeredGridLayoutManagerTest.java
index 21b7eb797..9e86bba94 100644
--- a/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewStaggeredGridLayoutManagerTest.java
+++ b/espresso/contrib/javatests/androidx/test/espresso/contrib/RecyclerViewStaggeredGridLayoutManagerTest.java
@@ -30,8 +30,8 @@
 import org.junit.runner.RunWith;
 
 /**
- * {@link RecyclerViewIntegrationTest}s for {@link androidx.recyclerview.widget.RecyclerView} using a
- * {@link 	androidx.recyclerview.widget.StaggeredGridLayoutManager}
+ * {@link RecyclerViewIntegrationTest}s for {@link androidx.recyclerview.widget.RecyclerView} using
+ * a {@link androidx.recyclerview.widget.StaggeredGridLayoutManager}
  */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
diff --git a/espresso/core/BUILD b/espresso/core/BUILD
new file mode 100644
index 000000000..6ec29c808
--- /dev/null
+++ b/espresso/core/BUILD
@@ -0,0 +1,14 @@
+# Alias for androidx.test.espresso.core API library
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "core",
+    actual = "//espresso/core/java/androidx/test/espresso",
+    visibility = ["//visibility:public"],
+)
diff --git a/espresso/core/BUILD.bazel b/espresso/core/BUILD.bazel
deleted file mode 100644
index 06af5451d..000000000
--- a/espresso/core/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-# Alias for androidx.test.espresso.core dependency
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "core",
-    visibility = ["//visibility:public"],
-    exports = ["//espresso/core/java/androidx/test/espresso"],
-)
diff --git a/espresso/core/java/androidx/test/espresso/AmbiguousViewMatcherException.java b/espresso/core/java/androidx/test/espresso/AmbiguousViewMatcherException.java
index 7ba618521..8b53c45be 100644
--- a/espresso/core/java/androidx/test/espresso/AmbiguousViewMatcherException.java
+++ b/espresso/core/java/androidx/test/espresso/AmbiguousViewMatcherException.java
@@ -16,19 +16,23 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.util.HumanReadables;
 import androidx.test.internal.platform.util.TestOutputEmitter;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import org.hamcrest.Matcher;
 
 /**
- * An exception which indicates that a Matcher<View> matched multiple views in the hierarchy when
- * only one view was expected. It should be called only from the main thread.
+ * An exception which indicates that a {@code Matcher<View>} matched multiple views in the hierarchy
+ * when only one view was expected. It should be called only from the main thread.
  *
  * <p>Contains details about the matcher and the current view hierarchy to aid in debugging.
  *
@@ -40,7 +44,7 @@
  * hierarchy may have changed since exception creation (leading to more confusion).
  */
 public final class AmbiguousViewMatcherException extends RuntimeException
-    implements EspressoException {
+    implements RootViewException {
 
   private Matcher<? super View> viewMatcher;
   private View rootView;
@@ -54,7 +58,7 @@ private AmbiguousViewMatcherException(String description) {
   }
 
   private AmbiguousViewMatcherException(Builder builder) {
-    super(getErrorMessage(builder));
+    this(getErrorMessage(builder));
     this.viewMatcher = builder.viewMatcher;
     this.rootView = builder.rootView;
     this.view1 = builder.view1;
@@ -65,28 +69,62 @@ private AmbiguousViewMatcherException(Builder builder) {
   private static String getErrorMessage(Builder builder) {
     String errorMessage = "";
     if (builder.includeViewHierarchy) {
-      ImmutableSet<View> ambiguousViews =
-          ImmutableSet.<View>builder()
-              .add(builder.view1, builder.view2)
-              .add(builder.others)
-              .build();
+      List<View> ambiguousViews = new ArrayList<>();
+      ambiguousViews.add(builder.view1);
+      ambiguousViews.add(builder.view2);
+      Collections.addAll(ambiguousViews, builder.others);
+
+      StringBuilder viewsAsText = new StringBuilder();
+      int numViews = ambiguousViews.size();
+      for (int i = 0; i < numViews; i++) {
+        if (i < 5) {
+          viewsAsText.append(
+              String.format(
+                  Locale.ROOT,
+                  "\n- [%d] %s",
+                  i + 1,
+                  HumanReadables.describe(ambiguousViews.get(i))));
+        } else {
+          viewsAsText.append(
+              String.format(Locale.ROOT, "\n- [truncated, listing 5 out of %d views].", numViews));
+          break;
+        }
+      }
+
       errorMessage =
           HumanReadables.getViewHierarchyErrorMessage(
               builder.rootView,
-              Lists.newArrayList(ambiguousViews),
+              ambiguousViews,
               String.format(
                   Locale.ROOT,
-                  "'%s' matches multiple views in the hierarchy.",
-                  builder.viewMatcher),
-              "****MATCHES****");
+                  "'%s' matches %d views in the hierarchy:%s",
+                  builder.viewMatcher,
+                  numViews,
+                  viewsAsText),
+              "****MATCHES****",
+              builder.maxMsgLen);
+
+      if (builder.viewHierarchyFile != null) {
+        errorMessage +=
+            String.format(
+                "\nThe complete view hierarchy is available in artifact file '%s'.",
+                builder.viewHierarchyFile);
+      }
     } else {
       errorMessage =
           String.format(
-              Locale.ROOT, "Multiple Ambiguous Views found for matcher %s", builder.viewMatcher);
+              Locale.ROOT, "Multiple ambiguous views found for matcher %s", builder.viewMatcher);
     }
+
     return errorMessage;
   }
 
+  /** Returns the root view where this exception is thrown. */
+  @Override
+  public View getRootView() {
+    return rootView;
+  }
+
   /** Builder for {@link AmbiguousViewMatcherException}. */
   public static class Builder {
     private Matcher<? super View> viewMatcher;
@@ -95,6 +133,8 @@ public static class Builder {
     private View view2;
     private View[] others;
     private boolean includeViewHierarchy = true;
+    private int maxMsgLen = Integer.MAX_VALUE;
+    private String viewHierarchyFile = null;
 
     public Builder from(AmbiguousViewMatcherException exception) {
       this.viewMatcher = exception.viewMatcher;
@@ -135,6 +175,20 @@ public Builder includeViewHierarchy(boolean includeViewHierarchy) {
       return this;
     }
 
+    @CanIgnoreReturnValue
+    @NonNull
+    public Builder withMaxMsgLen(int maxMsgLen) {
+      this.maxMsgLen = maxMsgLen;
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    @NonNull
+    public Builder withViewHierarchyFile(@Nullable String viewHierarchyFile) {
+      this.viewHierarchyFile = viewHierarchyFile;
+      return this;
+    }
+
     public AmbiguousViewMatcherException build() {
       checkNotNull(viewMatcher);
       checkNotNull(rootView);
diff --git a/espresso/core/java/androidx/test/espresso/AndroidManifest.xml b/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
index 6d97d0e9c..7bd15762b 100644
--- a/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
+++ b/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.core" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/espresso/core/java/androidx/test/espresso/AppNotIdleException.java b/espresso/core/java/androidx/test/espresso/AppNotIdleException.java
index 1e77788ad..9799d2a5a 100644
--- a/espresso/core/java/androidx/test/espresso/AppNotIdleException.java
+++ b/espresso/core/java/androidx/test/espresso/AppNotIdleException.java
@@ -16,11 +16,10 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.os.Looper;
-import androidx.test.internal.platform.util.TestOutputEmitter;
-import com.google.common.base.Joiner;
+import androidx.test.espresso.util.StringJoinerKt;
 import java.util.List;
 import java.util.Locale;
 
@@ -31,7 +30,6 @@ public final class AppNotIdleException extends RuntimeException implements Espre
 
   private AppNotIdleException(String description) {
     super(description);
-    TestOutputEmitter.dumpThreadStates("ThreadState-AppNotIdleException.txt");
   }
 
   /**
@@ -57,7 +55,7 @@ public static AppNotIdleException create(
                 + "after trying for %s iterations. The following Idle Conditions failed %s",
             seconds,
             loopCount,
-            Joiner.on(",").join(idleConditions));
+            StringJoinerKt.joinToString(idleConditions, ","));
     return new AppNotIdleException(errorMessage);
   }
 
@@ -77,7 +75,7 @@ public static AppNotIdleException create(List<String> idleConditions, String mes
             Locale.ROOT,
             "%s The following Idle Conditions failed %s.",
             message,
-            Joiner.on(",").join(idleConditions));
+            StringJoinerKt.joinToString(idleConditions, ","));
     return new AppNotIdleException(errorMessage);
   }
 }
diff --git a/espresso/core/java/androidx/test/espresso/BUILD b/espresso/core/java/androidx/test/espresso/BUILD
new file mode 100644
index 000000000..fc3db03ab
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/BUILD
@@ -0,0 +1,243 @@
+# Description:
+#   Espresso - the new UI Test API for Android.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+# Add only espresso packages here.
+package_group(
+    name = "espresso_pkg",
+    packages = [
+        "//espresso/...",
+    ],
+)
+
+package_group(
+    name = "espresso_first_party",
+    packages = [
+    ],
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+exports_files(["AndroidManifest.xml"])
+
+PUBLIC_FRAMEWORK_LAYER = [
+    "ViewAction.java",
+    "ViewAssertion.java",
+]
+
+BASE_LAYER_INTERFACES = [
+    "AmbiguousViewMatcherException.java",
+    "AppNotIdleException.java",
+    "NoActivityResumedException.java",
+    "NoMatchingRootException.java",
+    "NoMatchingViewException.java",
+    "EspressoException.java",
+    "FailureHandler.java",
+    "IdlingPolicies.java",
+    "IdlingPolicy.java",
+    "IdlingResourceTimeoutException.java",
+    "InjectEventSecurityException.java",
+    "PerformException.java",
+    "Root.java",
+    "RootViewException.java",
+    "ViewFinder.java",
+    "UiController.java",
+]
+
+VIEW_INTERACTION = [
+    "ViewInteraction.java",
+    "ViewInteractionComponent.java",
+    "ViewInteractionModule.java",
+    "InteractionResultsHandler.java",
+]
+
+INTERNAL_API_ANNOTATION = [
+]
+
+android_library(
+    name = "view-interaction",
+    srcs = VIEW_INTERACTION,
+    visibility = ["//visibility:private"],
+    deps = [
+        ":framework",
+        ":interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/internal/data",
+        "//espresso/core/java/androidx/test/espresso/internal/data/model",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:aidls",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//opensource/androidx:annotation",
+        "//opensource/dagger",
+        "//runner/android_junit_runner",
+        "@maven//:androidx_concurrent_concurrent_futures",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+ESPRESSO_GRAPH = [
+    "GraphHolder.java",
+    "BaseLayerComponent.java",
+]
+
+android_library(
+    name = "espresso-graph",
+    srcs = ESPRESSO_GRAPH,
+    visibility = ["//visibility:private"],
+    deps = [
+        ":interface",
+        ":view-interaction",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//espresso/core/java/androidx/test/espresso/internal/data",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//opensource/androidx:annotation",
+        "//opensource/dagger",
+        "//runner/android_junit_runner",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "espresso",
+    srcs = glob(
+        ["*.java"],
+        exclude = BASE_LAYER_INTERFACES + PUBLIC_FRAMEWORK_LAYER + ESPRESSO_GRAPH + VIEW_INTERACTION + INTERNAL_API_ANNOTATION,
+    ),
+    exports = [
+        # Anything listed here is instantly available to targets that
+        # depend on :espresso.
+        #
+        # Only list items here which are required to have a 'useful'
+        # cut of espresso.
+        #
+        # For example: //j/c/g/a/a/c/testing/ui/espresso/action
+        # sure you can use espresso without this dependency, but 98% of users
+        # will include it because its such a key piece of functionality.
+        ":framework",
+        ":interface",
+        ":view-interaction",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/action:adapter_view_protocol",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+    ],
+    deps = [
+        ":espresso-graph",
+        ":framework",
+        ":interface",
+        ":view-interaction",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/action:adapter_view_protocol",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
+    ],
+)
+
+android_library(
+    name = "framework",
+    srcs = PUBLIC_FRAMEWORK_LAYER,
+    deps = [
+        ":interface",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "interface",
+    srcs = BASE_LAYER_INTERFACES,
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+# Compile-time library is used by tests, to avoid including the project code into test apk.
+# By doing this we significantly reduce test apk filesize.
+# Test code classpath is overlayed with project classpath on Android.
+android_library(
+    name = "espresso_compiletime",
+    testonly = 1,
+    neverlink = 1,
+    exports = [":espresso"],
+)
+
+android_library(
+    name = "espresso_aar_lib",
+    testonly = 1,
+    custom_package = "androidx.test.espresso.core",
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [":proguard_library.cfg"],
+    visibility = ["//visibility:private"],
+    exports = [
+        ":espresso",
+        "//espresso/core/java/androidx/test/espresso/core/internal/deps/dagger",
+    ],
+)
+
+axt_android_aar(
+    name = "espresso_core_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso",
+    ],
+    included_dep = ":espresso_aar_lib",
+    jarjar_rule =
+        "release_jarjar_rules.txt",
+)
+
+maven_artifact(
+    name = "espresso_core_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":espresso_core_aar",
+)
+
+dackka_test(
+    name = "espresso_core_doc",
+    runtime_dep = ":espresso_aar_lib",
+    src_jar = ":espresso_core_aar-src.jar",
+)
+
+api_checks(
+    name = "espresso_core_api",
+    runtime_dep = ":espresso_aar_lib",
+    src_jar = ":espresso_core_aar-src.jar",
+)
diff --git a/espresso/core/java/androidx/test/espresso/BUILD.bazel b/espresso/core/java/androidx/test/espresso/BUILD.bazel
deleted file mode 100644
index 085e4e1b9..000000000
--- a/espresso/core/java/androidx/test/espresso/BUILD.bazel
+++ /dev/null
@@ -1,288 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION", "HAMCREST_VERSION", "RUNNER_VERSION", "KOTLIN_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-load("//build_extensions:remove_from_jar.bzl", "remove_from_jar")
-
-# Description:
-#   Espresso - the new UI Test API for Android.
-licenses(["notice"])  # Apache License 2.0
-
-# Add only espresso packages here.
-package_group(
-    name = "espresso_pkg",
-    packages = [
-        "//espresso/...",
-    ],
-)
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-exports_files(["AndroidManifest.xml"])
-
-PUBLIC_FRAMEWORK_LAYER = [
-    "ViewAction.java",
-    "ViewAssertion.java",
-    "ViewFinder.java",
-]
-
-BASE_LAYER_INTERFACES = [
-    "AmbiguousViewMatcherException.java",
-    "AppNotIdleException.java",
-    "NoActivityResumedException.java",
-    "NoMatchingRootException.java",
-    "NoMatchingViewException.java",
-    "EspressoException.java",
-    "FailureHandler.java",
-    "IdlingPolicies.java",
-    "IdlingPolicy.java",
-    "IdlingResourceTimeoutException.java",
-    "InjectEventSecurityException.java",
-    "PerformException.java",
-    "Root.java",
-    "ViewFinder.java",
-    "UiController.java",
-]
-
-VIEW_INTERACTION = [
-    "ViewInteraction.java",
-    "ViewInteractionComponent.java",
-    "ViewInteractionModule.java",
-    "InteractionResultsHandler.java",
-]
-
-REMOTE = [
-    "DataInteractionRemote.java",
-]
-
-android_library(
-    name = "data-interaction-remote",
-    srcs = REMOTE,
-    deps = [
-        ":espresso",
-        "//espresso/core/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "view-interaction",
-    srcs = VIEW_INTERACTION,
-    plugins = ["//opensource/dagger:dagger_plugin"],  # Add programmatically
-    visibility = [":espresso_pkg"],
-    deps = [
-        ":framework",
-        ":interface",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/base",
-        "//espresso/core/java/androidx/test/espresso/internal/data",
-        "//espresso/core/java/androidx/test/espresso/internal/data/model",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote:aidls",
-        "//espresso/core/java/androidx/test/espresso/remote:bindable",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//opensource/dagger",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-ESPRESSO_GRAPH = [
-    "GraphHolder.java",
-    "BaseLayerComponent.java",
-]
-
-android_library(
-    name = "espresso-graph",
-    srcs = ESPRESSO_GRAPH,
-    deps = [
-        ":interface",
-        ":view-interaction",
-        "//espresso/core/java/androidx/test/espresso/base",
-        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
-        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//opensource/dagger",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "espresso",
-    srcs = glob(
-        ["*.java"],
-        exclude = BASE_LAYER_INTERFACES + PUBLIC_FRAMEWORK_LAYER + ESPRESSO_GRAPH + VIEW_INTERACTION + REMOTE,
-    ),
-    exports = [
-        # Anything listed here is instantly available to targets that
-        # depend on :espresso.
-        #
-        # Only list items here which are required to have a 'useful'
-        # cut of espresso.
-        #
-        # For example: //j/c/g/a/a/c/testing/ui/espresso/action
-        # sure you can use espresso without this dependency, but 98% of users
-        # will include it because its such a key piece of functionality.
-        ":framework",
-        ":interface",
-        ":view-interaction",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/action:adapter_view_protocol",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-    ],
-    deps = [
-        ":espresso-graph",
-        ":framework",
-        ":interface",
-        ":view-interaction",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/action:adapter_view_protocol",
-        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
-        "//espresso/core/java/androidx/test/espresso/internal/data",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//runner/monitor",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "framework",
-    srcs = PUBLIC_FRAMEWORK_LAYER,
-    deps = [
-        ":interface",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "interface",
-    srcs = BASE_LAYER_INTERFACES,
-    manifest = "AndroidManifest.xml",
-    deps = [
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-# Compile-time library is used by tests, to avoid including the project code into test apk.
-# By doing this we significantly reduce test apk filesize.
-# Test code classpath is overlayed with project classpath on Android.
-android_library(
-    name = "espresso_compiletime",
-    testonly = 1,
-    neverlink = 1,
-    exports = [":espresso"],
-)
-
-# Android binary for the UI framework lib, used to generate eclipse dependencies.
-android_binary(
-    name = "espresso_binary",
-    testonly = 1,
-    manifest = "AndroidManifest.xml",
-    deps = [
-        ":espresso",
-        "//:androidx_core",
-        "//:androidx_recyclerview",
-        "//opensource/java_lib:webbridge",
-        "@maven//:org_ccil_cowan_tagsoup_tagsoup",
-    ],
-)
-
-axt_release_lib(
-    name = "espresso_core_release",
-    custom_package = "androidx.test.espresso.core",
-    jarjar_rules = "release_jarjar_rules.txt",
-    keep_spec = "androidx/test/espresso",
-    overlapping_jars = [
-        "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_release_no_deps.jar",
-    ],
-    proguard_library = ":proguard_library.cfg",
-    proguard_specs = [
-        "//:proguard_binary.cfg",
-        "//espresso:proguard_binary.cfg",
-    ],
-    remove_spec = "androidx/test/espresso/core/R[$$\\.]",
-    deps = [
-        ":espresso",
-    ],
-)
-
-filegroup(
-    name = "espresso_src",
-    srcs = [
-        ":libespresso-src.jar",
-        ":libframework-src.jar",
-        ":libinterface-src.jar",
-        ":libview-interaction-src.jar",
-        "//espresso/core/java/androidx/test/espresso/action:libaction-src.jar",
-        "//espresso/core/java/androidx/test/espresso/action:libadapter_view_protocol-src.jar",
-        "//espresso/core/java/androidx/test/espresso/assertion:libassertion-src.jar",
-        "//espresso/core/java/androidx/test/espresso/base:espresso_base_src",
-        "//espresso/core/java/androidx/test/espresso/matcher:libmatcher-src.jar",
-        "//espresso/core/java/androidx/test/espresso/remote:espresso_remote_src",
-        "//espresso/core/java/androidx/test/espresso/util:libutil-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "espresso_src_all_jars",
-    srcs = [
-        ":espresso_src",
-    ],
-)
-
-remove_from_jar(
-    name = "espresso_src_jars",
-    jar = ":espresso_src_all_jars.jar",
-    keep_spec = "androidx/test/espresso",
-    # Remove generated dagger classes from source jar
-    remove_spec = ".*_Provide.*|.*_Factory.*",
-)
-
-maven_artifact(
-    name = "espresso_core_maven_artifact",
-    src = ":espresso_core_release.aar",
-    artifact_deps = [
-        "androidx.test:runner:%s" % RUNNER_VERSION,
-        "androidx.test.espresso:espresso-idling-resource:%s" % ESPRESSO_VERSION,
-        "com.squareup:javawriter:2.1.1",
-        "javax.inject:javax.inject:1",
-        "org.hamcrest:hamcrest-library:%s" % HAMCREST_VERSION,
-        "org.hamcrest:hamcrest-integration:%s" % HAMCREST_VERSION,
-        "com.google.code.findbugs:jsr305:2.0.1",
-        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
-    ],
-    artifact_id = "espresso-core",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":espresso_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/core/java/androidx/test/espresso/BaseLayerComponent.java b/espresso/core/java/androidx/test/espresso/BaseLayerComponent.java
index 2b056c16e..02ea31135 100644
--- a/espresso/core/java/androidx/test/espresso/BaseLayerComponent.java
+++ b/espresso/core/java/androidx/test/espresso/BaseLayerComponent.java
@@ -16,6 +16,8 @@
 
 package androidx.test.espresso;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.espresso.base.ActiveRootLister;
 import androidx.test.espresso.base.BaseLayerModule;
 import androidx.test.espresso.base.IdlingResourceRegistry;
@@ -23,13 +25,19 @@
 import androidx.test.espresso.base.UiControllerModule;
 import androidx.test.internal.platform.os.ControlledLooper;
 import androidx.test.platform.io.PlatformTestStorage;
+import androidx.test.platform.tracing.Tracing;
 import dagger.Component;
 import java.util.concurrent.Executor;
 import javax.inject.Singleton;
 
-/** Dagger component for base classes. */
+/**
+ * Dagger component for base classes.
+ *
+ * @hide
+ */
 @Component(modules = {BaseLayerModule.class, UiControllerModule.class})
 @Singleton
+@RestrictTo(Scope.LIBRARY)
 public interface BaseLayerComponent {
   BaseLayerModule.FailureHandlerHolder failureHolder();
 
@@ -49,4 +57,6 @@ public interface BaseLayerComponent {
   ControlledLooper controlledLooper();
 
   PlatformTestStorage testStorage();
+
+  Tracing tracer();
 }
diff --git a/espresso/core/java/androidx/test/espresso/DataInteraction.java b/espresso/core/java/androidx/test/espresso/DataInteraction.java
index 30d63e8c6..6bca8e610 100644
--- a/espresso/core/java/androidx/test/espresso/DataInteraction.java
+++ b/espresso/core/java/androidx/test/espresso/DataInteraction.java
@@ -20,16 +20,17 @@
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 import static org.hamcrest.Matchers.allOf;
 
-import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.ViewParent;
 import android.widget.Adapter;
 import android.widget.AdapterView;
 import androidx.annotation.CheckResult;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.action.AdapterDataLoaderAction;
 import androidx.test.espresso.action.AdapterViewProtocol;
@@ -40,7 +41,7 @@
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
 import androidx.test.espresso.util.EspressoOptional;
-import com.google.common.base.Function;
+import java.util.function.Consumer;
 import javax.annotation.CheckReturnValue;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -68,8 +69,8 @@ public class DataInteraction {
 
   private final Matcher<? extends Object> dataMatcher;
   private Matcher<View> adapterMatcher = isAssignableFrom(AdapterView.class);
-  private EspressoOptional<Matcher<View>> childViewMatcher = EspressoOptional.absent();
-  private EspressoOptional<Integer> atPosition = EspressoOptional.absent();
+  @Nullable private Matcher<View> childViewMatcher = null;
+  @Nullable private Integer atPosition = null;
   private AdapterViewProtocol adapterViewProtocol = AdapterViewProtocols.standardProtocol();
   private Matcher<Root> rootMatcher = RootMatchers.DEFAULT;
 
@@ -84,7 +85,7 @@ public class DataInteraction {
   @CheckResult
   @CheckReturnValue
   public DataInteraction onChildView(Matcher<View> childMatcher) {
-    this.childViewMatcher = EspressoOptional.of(checkNotNull(childMatcher));
+    this.childViewMatcher = checkNotNull(childMatcher);
     return this;
   }
 
@@ -111,7 +112,7 @@ public DataInteraction inAdapterView(Matcher<View> adapterMatcher) {
   @CheckResult
   @CheckReturnValue
   public DataInteraction atPosition(Integer atPosition) {
-    this.atPosition = EspressoOptional.of(checkNotNull(atPosition));
+    this.atPosition = checkNotNull(atPosition);
     return this;
   }
 
@@ -130,6 +131,7 @@ public DataInteraction usingAdapterViewProtocol(AdapterViewProtocol adapterViewP
    * Performs an action on the view after we force the data to be loaded.
    *
    * @return an {@link ViewInteraction} for more assertions or actions.
+   * @throws RuntimeException when being invoked on the main thread.
    */
   public ViewInteraction perform(ViewAction... actions) {
     return onView(makeTargetMatcher()).inRoot(rootMatcher).perform(actions);
@@ -139,18 +141,18 @@ public ViewInteraction perform(ViewAction... actions) {
    * Performs an assertion on the state of the view after we force the data to be loaded.
    *
    * @return an {@link ViewInteraction} for more assertions or actions.
+   * @throws RuntimeException when being invoked on the main thread.
    */
   public ViewInteraction check(ViewAssertion assertion) {
     return onView(makeTargetMatcher()).inRoot(rootMatcher).check(assertion);
   }
 
-  @SuppressWarnings("unchecked")
   private Matcher<View> makeTargetMatcher() {
     Matcher<View> targetView =
         displayDataMatcher(
             adapterMatcher, dataMatcher, rootMatcher, atPosition, adapterViewProtocol);
-    if (childViewMatcher.isPresent()) {
-      targetView = allOf(childViewMatcher.get(), isDescendantOfA(targetView));
+    if (childViewMatcher != null) {
+      targetView = allOf(childViewMatcher, isDescendantOfA(targetView));
     }
     return targetView;
   }
@@ -207,12 +209,8 @@ private DisplayDataMatcher(
           dataMatcher,
           adapterViewProtocol,
           adapterDataLoaderAction,
-          new Function<AdapterDataLoaderAction, ViewInteraction>() {
-            @Override
-            public ViewInteraction apply(AdapterDataLoaderAction adapterDataLoaderAction) {
-              return onView(adapterMatcher).inRoot(rootMatcher).perform(adapterDataLoaderAction);
-            }
-          });
+          adapterDataLoaderAction1 ->
+              onView(adapterMatcher).inRoot(rootMatcher).perform(adapterDataLoaderAction1));
     }
 
     @VisibleForTesting
@@ -221,13 +219,13 @@ public ViewInteraction apply(AdapterDataLoaderAction adapterDataLoaderAction) {
         @NonNull Matcher<? extends Object> dataMatcher,
         @NonNull AdapterViewProtocol adapterViewProtocol,
         @NonNull AdapterDataLoaderAction adapterDataLoaderAction,
-        @NonNull Function<AdapterDataLoaderAction, ViewInteraction> loadDataFunction) {
+        @NonNull Consumer<AdapterDataLoaderAction> loadDataFunction) {
       this.adapterMatcher = checkNotNull(adapterMatcher);
       this.dataMatcher = checkNotNull(dataMatcher);
       this.adapterViewProtocol = checkNotNull(adapterViewProtocol);
       this.adapterViewProtocolClass = adapterViewProtocol.getClass();
       this.adapterDataLoaderAction = checkNotNull(adapterDataLoaderAction);
-      checkNotNull(loadDataFunction).apply(adapterDataLoaderAction);
+      checkNotNull(loadDataFunction).accept(adapterDataLoaderAction);
     }
 
     /**
@@ -237,8 +235,13 @@ public ViewInteraction apply(AdapterDataLoaderAction adapterDataLoaderAction) {
      *
      * @param adapterMatcher matcher that matches an {@link AdapterView}
      * @param dataMatcher the data matcher for matching a {@link View} by it's adapter data
+     * @param rootMatcher matcher for view's root
+     * @param atPosition optional position of the view to match
      * @param adapterViewProtocol the {@link AdapterViewProtocol} used for this data interaction
+     * @deprecated use {@link #displayDataMatcher(Matcher, Matcher, Matcher, Integer,
+     *     AdapterViewProtocol)} instead.
      */
+    @Deprecated
     public static DisplayDataMatcher displayDataMatcher(
         @NonNull Matcher<View> adapterMatcher,
         @NonNull Matcher<? extends Object> dataMatcher,
@@ -253,6 +256,31 @@ public static DisplayDataMatcher displayDataMatcher(
           new AdapterDataLoaderAction(dataMatcher, atPosition, adapterViewProtocol));
     }
 
+    /**
+     * Returns an instance of {@link DisplayDataMatcher}.
+     *
+     * <p>Note: This is an internal method, do not call from test code!
+     *
+     * @param adapterMatcher matcher that matches an {@link AdapterView}
+     * @param dataMatcher the data matcher for matching a {@link View} by it's adapter data
+     * @param rootMatcher matcher for view's root
+     * @param atPosition optional zero-based position of the data to be matched
+     * @param adapterViewProtocol the {@link AdapterViewProtocol} used for this data interaction
+     */
+    public static DisplayDataMatcher displayDataMatcher(
+        @NonNull Matcher<View> adapterMatcher,
+        @NonNull Matcher<? extends Object> dataMatcher,
+        @NonNull Matcher<Root> rootMatcher,
+        @Nullable Integer atPosition,
+        @NonNull AdapterViewProtocol adapterViewProtocol) {
+      return new DisplayDataMatcher(
+          adapterMatcher,
+          dataMatcher,
+          rootMatcher,
+          adapterViewProtocol,
+          new AdapterDataLoaderAction(dataMatcher, atPosition, adapterViewProtocol));
+    }
+
     @Override
     public void describeTo(Description description) {
       description.appendText(" displaying data matching: ");
@@ -261,7 +289,6 @@ public void describeTo(Description description) {
       adapterMatcher.describeTo(description);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public boolean matchesSafely(View view) {
       checkState(adapterViewProtocol != null, "adapterViewProtocol cannot be null!");
@@ -270,13 +297,11 @@ public boolean matchesSafely(View view) {
         parent = parent.getParent();
       }
       if (parent != null && adapterMatcher.matches(parent)) {
-        EspressoOptional<AdaptedData> data =
-            adapterViewProtocol.getDataRenderedByView(
+        AdaptedData data =
+            adapterViewProtocol.getDataRenderedByView2(
                 (AdapterView<? extends Adapter>) parent, view);
-        if (data.isPresent()) {
-          return data.get()
-              .opaqueToken
-              .equals(adapterDataLoaderAction.getAdaptedData().opaqueToken);
+        if (data != null) {
+          return data.opaqueToken.equals(adapterDataLoaderAction.getAdaptedData().opaqueToken);
         }
       }
       return false;
diff --git a/espresso/core/java/androidx/test/espresso/Espresso.java b/espresso/core/java/androidx/test/espresso/Espresso.java
index 9ef8a4c04..3eadd0efb 100644
--- a/espresso/core/java/androidx/test/espresso/Espresso.java
+++ b/espresso/core/java/androidx/test/espresso/Espresso.java
@@ -22,15 +22,13 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
 import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
 import static androidx.test.espresso.matcher.ViewMatchers.withContentDescription;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.endsWith;
 
 import android.content.Context;
 import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Looper;
 import android.util.Log;
 import android.view.Choreographer;
@@ -39,9 +37,12 @@
 import androidx.annotation.CheckResult;
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.base.IdlingResourceRegistry;
+import androidx.test.espresso.util.TracingUtil;
 import androidx.test.espresso.util.TreeIterables;
+import androidx.test.espresso.util.concurrent.ListenableFutureTask;
 import androidx.test.platform.app.InstrumentationRegistry;
-import com.google.common.util.concurrent.ListenableFutureTask;
+import androidx.test.platform.tracing.Tracer.Span;
+import androidx.test.platform.tracing.Tracing;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -61,6 +62,7 @@ public final class Espresso {
   private static final String TAG = Espresso.class.getSimpleName();
   private static final BaseLayerComponent BASE = GraphHolder.baseLayer();
   private static final IdlingResourceRegistry baseRegistry = BASE.idlingResourceRegistry();
+  private static final Tracing tracer = BASE.tracer();
   private static final int TIMEOUT_SECONDS = 5;
 
   private Espresso() {}
@@ -81,7 +83,10 @@ private Espresso() {}
   @CheckReturnValue
   @CheckResult
   public static ViewInteraction onView(final Matcher<View> viewMatcher) {
-    return BASE.plus(new ViewInteractionModule(viewMatcher)).viewInteraction();
+    String spanName = TracingUtil.getSpanName("Espresso", "onView", viewMatcher);
+    try (Span ignored = tracer.beginSpan(spanName)) {
+      return BASE.plus(new ViewInteractionModule(viewMatcher)).viewInteraction();
+    }
   }
 
   /**
@@ -190,7 +195,6 @@ public static void setFailureHandler(FailureHandler failureHandler) {
   // Ideally, this should be only allOf(isDisplayed(), withContentDescription("More options"))
   // But the AppCompatActivity compat lib is missing a content description for this element, so
   // we add the class name matcher as another option to find the view.
-  @SuppressWarnings("unchecked")
   private static final Matcher<View> OVERFLOW_BUTTON_MATCHER =
       anyOf(
           allOf(isDisplayed(), withContentDescription("More options")),
@@ -198,7 +202,9 @@ public static void setFailureHandler(FailureHandler failureHandler) {
 
   /** Closes soft keyboard if open. */
   public static void closeSoftKeyboard() {
-    onView(isRoot()).perform(ViewActions.closeSoftKeyboard());
+    try (Span ignored = tracer.beginSpan("Espresso.closeSoftKeyboard")) {
+      onView(isRoot()).perform(ViewActions.closeSoftKeyboard());
+    }
   }
 
   /**
@@ -210,13 +216,14 @@ public static void closeSoftKeyboard() {
    * ActionMode will always present an overflow icon and that icon only responds to clicks. The menu
    * button (if present) has no impact on it.
    */
-  @SuppressWarnings("unchecked")
   public static void openContextualActionModeOverflowMenu() {
-    onView(isRoot()).perform(new TransitionBridgingViewAction());
+    try (Span ignored = tracer.beginSpan("Espresso.openContextualActionModeOverflowMenu")) {
+      onView(isRoot()).perform(new TransitionBridgingViewAction());
 
-    // provide an pressBack rollback action to the click, to handle occasional flakiness where the
-    // click is interpreted as a long press
-    onView(OVERFLOW_BUTTON_MATCHER).perform(click(ViewActions.pressBack()));
+      // provide an pressBack rollback action to the click, to handle occasional flakiness where the
+      // click is interpreted as a long press
+      onView(OVERFLOW_BUTTON_MATCHER).perform(click(ViewActions.pressBack()));
+    }
   }
 
   /**
@@ -226,7 +233,9 @@ public static void openContextualActionModeOverflowMenu() {
    *     button would result in application closing.
    */
   public static void pressBack() {
-    onView(isRoot()).perform(ViewActions.pressBack());
+    try (Span ignored = tracer.beginSpan("Espresso.pressBack")) {
+      onView(isRoot()).perform(ViewActions.pressBack());
+    }
   }
 
   /**
@@ -234,7 +243,9 @@ public static void pressBack() {
    * outside the application or process under test.
    */
   public static void pressBackUnconditionally() {
-    onView(isRoot()).perform(ViewActions.pressBackUnconditionally());
+    try (Span ignored = tracer.beginSpan("Espresso.pressBackUnconditionally")) {
+      onView(isRoot()).perform(ViewActions.pressBackUnconditionally());
+    }
   }
 
   /**
@@ -246,47 +257,44 @@ public static void pressBackUnconditionally() {
    * overflows. If a hardware menu key is present, the overflow icon is never displayed in
    * ActionBars and can only be interacted with via menu key presses.
    */
-  @SuppressWarnings("unchecked")
   public static void openActionBarOverflowOrOptionsMenu(Context context) {
-    // We need to wait for Activity#onPrepareOptionsMenu to be called before trying to open
-    // overflow or it's missing. onPrepareOptionsMenu is called by Choreographer after onResume and
-    // view is attached to window. To ensure the options menu is created before we try to open,
-    // wait for all processing tasks in this frame to be finished.
-    waitUntilNextFrame(2);
-
-    if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.HONEYCOMB) {
-      // regardless of the os level of the device, this app will be rendering a menukey
-      // in the virtual navigation bar (if present) or responding to hardware option keys on
-      // any activity.
-      onView(isRoot()).perform(pressMenuKey());
-    } else if (hasVirtualOverflowButton(context)) {
-      // If we're using virtual keys - theres a chance we're in mid animation of switching
-      // between a contextual action bar and the non-contextual action bar. In this case there
-      // are 2 'More Options' buttons present. Lets wait till that is no longer the case.
-      onView(isRoot()).perform(new TransitionBridgingViewAction());
+    try (Span ignored = tracer.beginSpan("Espresso.openActionBarOverflowOrOptionsMenu")) {
+      // We need to wait for Activity#onPrepareOptionsMenu to be called before trying to open
+      // overflow or it's missing. onPrepareOptionsMenu is called by Choreographer after onResume
+      // and view is attached to window. To ensure the options menu is created before we try to
+      // open, wait for all processing tasks in this frame to be finished.
+      waitUntilNextFrame(2);
+
+      if (context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.HONEYCOMB) {
+        // regardless of the os level of the device, this app will be rendering a menukey
+        // in the virtual navigation bar (if present) or responding to hardware option keys on
+        // any activity.
+        onView(isRoot()).perform(pressMenuKey());
+      } else if (hasVirtualOverflowButton(context)) {
+        // If we're using virtual keys - theres a chance we're in mid animation of switching
+        // between a contextual action bar and the non-contextual action bar. In this case there
+        // are 2 'More Options' buttons present. Lets wait till that is no longer the case.
+        onView(isRoot()).perform(new TransitionBridgingViewAction());
+
+        onView(OVERFLOW_BUTTON_MATCHER).perform(click());
+      } else {
+        // either a hardware button exists, or we're on a pre-HC os.
+        onView(isRoot()).perform(pressMenuKey());
+      }
 
-      onView(OVERFLOW_BUTTON_MATCHER).perform(click());
-    } else {
-      // either a hardware button exists, or we're on a pre-HC os.
-      onView(isRoot()).perform(pressMenuKey());
+      // Again, we need to wait for the next rendering frame so that overflow menu is rendered on
+      // screen. This wait is especially important for API 29+ devices. If we skip this wait and you
+      // try clicking on overflow menu, the click may delivered to unexpected view which is
+      // positioned the same location but under the overflow menu. This happens because the context
+      // menu is there in view hierarchy but not rendered yet so Espresso is able to calculate
+      // coordinate but injected motion event goes to the wrong view. Waits for two frames because
+      // runnable to display the menu is registered in the current frame and it is executed in the
+      // next frame.
+      waitUntilNextFrame(2);
     }
-
-    // Again, we need to wait for the next rendering frame so that overflow menu is rendered on
-    // screen. This wait is especially important for API 29+ devices. If we skip this wait and you
-    // try clicking on overflow menu, the click may delivered to unexpected view which is positioned
-    // the same location but under the overflow menu. This happens because the context menu is
-    // there in view hierarchy but not rendered yet so Espresso is able to calculate coordinate but
-    // injected motion event goes to the wrong view. Waits for two frames because runnable to
-    // display the menu is registered in the current frame and it is executed in the next frame.
-    waitUntilNextFrame(2);
   }
 
   private static void waitUntilNextFrame(int times) {
-    // Choreographer API is added in API 16.
-    if (VERSION.SDK_INT < VERSION_CODES.JELLY_BEAN) {
-      return;
-    }
-
     for (int i = 0; i < times; ++i) {
       CountDownLatch latch = new CountDownLatch(1);
       InstrumentationRegistry.getInstrumentation()
@@ -308,24 +316,30 @@ private static void waitUntilNextFrame(int times) {
    * Loops the main thread until the app goes idle.
    *
    * <p>Same as {@link Espresso#onIdle()}, but takes an additional {@link Callable} as parameter,
-   * which is executed after the app goes idle.
+   * which is executed after the app goes idle. This works on any thread, including the main thread.
    *
    * @param action callable executed when the app goes idle.
-   * @return the computed result of the action callable
-   * @throws AppNotIdleException when app does not go Idle within the master policies timeout
+   * @return the computed result of the action callable.
+   * @throws AppNotIdleException when app does not go Idle within the master policies timeout.
    */
   public static <T> T onIdle(Callable<T> action) {
-    Executor mainThreadExecutor = BASE.mainThreadExecutor();
+    if (Thread.currentThread().equals(Looper.getMainLooper().getThread())) {
+      BASE.controlledLooper().drainMainThreadUntilIdle();
+      BASE.uiController().loopMainThreadUntilIdle();
+      try {
+        return action.call();
+      } catch (Exception e) {
+        throw new RuntimeException("Callable action in onIdle reported an exception.", e);
+      }
+    }
+    FutureTask<T> actionTask = new FutureTask<>(action);
     ListenableFutureTask<Void> idleFuture =
         ListenableFutureTask.create(
-            new Runnable() {
-              @Override
-              public void run() {
-                BASE.uiController().loopMainThreadUntilIdle();
-              }
-            },
-            null);
-    FutureTask<T> actionTask = new FutureTask<>(action);
+            () -> {
+              BASE.uiController().loopMainThreadUntilIdle();
+              return null;
+            });
+    Executor mainThreadExecutor = BASE.mainThreadExecutor();
     idleFuture.addListener(actionTask, mainThreadExecutor);
     mainThreadExecutor.execute(idleFuture);
     BASE.controlledLooper().drainMainThreadUntilIdle();
@@ -352,10 +366,11 @@ public void run() {
    * frameworks that are build on top of Espresso.
    *
    * <p>For UI tests use {@link Espresso#onView(Matcher)} or {@link Espresso#onData(Matcher)}. These
-   * Apis already use Espresso's internal synchronisation mechanisms and do not require a call to
+   * APIs already use Espresso's internal synchronisation mechanisms and do not require a call to
    * {@link Espresso#onIdle()}.
    *
-   * @throws AppNotIdleException when app does not go Idle within the master policies timeout
+   * @throws AppNotIdleException when app does not go Idle within the master policies timeout.
+   * @throws RuntimeException when being invoked on the main thread.
    */
   public static void onIdle() {
     onIdle(
@@ -369,11 +384,7 @@ public Void call() throws Exception {
   }
 
   private static boolean hasVirtualOverflowButton(Context context) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      return Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB;
-    } else {
-      return !ViewConfiguration.get(context).hasPermanentMenuKey();
-    }
+    return !ViewConfiguration.get(context).hasPermanentMenuKey();
   }
 
   /**
diff --git a/espresso/core/java/androidx/test/espresso/GraphHolder.java b/espresso/core/java/androidx/test/espresso/GraphHolder.java
index a61df270b..5ac7af6e9 100644
--- a/espresso/core/java/androidx/test/espresso/GraphHolder.java
+++ b/espresso/core/java/androidx/test/espresso/GraphHolder.java
@@ -16,15 +16,8 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
-import android.util.Log;
-import androidx.test.espresso.base.ActiveRootLister;
-import androidx.test.internal.runner.tracker.UsageTrackerRegistry.AxtVersions;
-import androidx.test.platform.io.PlatformTestStorage;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
 /** Holds Espresso's object graph. */
@@ -45,10 +38,6 @@ static BaseLayerComponent baseLayer() {
     if (null == instanceRef) {
       instanceRef = new GraphHolder(DaggerBaseLayerComponent.create());
       if (instance.compareAndSet(null, instanceRef)) {
-        // Also adds the usage data as test output properties. By default it's no-op.
-        Map<String, Serializable> usageProperties = new HashMap<>();
-        usageProperties.put("Espresso", AxtVersions.ESPRESSO_VERSION);
-        addUsageToOutputProperties(usageProperties, instanceRef.component.testStorage());
         return instanceRef.component;
       } else {
         return instance.get().component;
@@ -57,20 +46,4 @@ static BaseLayerComponent baseLayer() {
       return instanceRef.component;
     }
   }
-
-  private static void addUsageToOutputProperties(
-      Map<String, Serializable> usageProperties, PlatformTestStorage testStorage) {
-    try {
-      testStorage.addOutputProperties(usageProperties);
-    } catch (Exception e) {
-      // The properties.dat file can be created only once on an automotive emulator with API 30,
-      // which causes the `addOutputProperties` call to fail when running multiple test cases. Catch
-      // the exception and log until the issue is fixed in the emulator.
-      Log.d(
-          TAG,
-          "Failed to add the output properties. This could happen when running on an"
-              + " automotive emulator with API 30. Ignore for now.",
-          e);
-    }
-  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/IdlingPolicies.java b/espresso/core/java/androidx/test/espresso/IdlingPolicies.java
index 351966081..f048e60c5 100644
--- a/espresso/core/java/androidx/test/espresso/IdlingPolicies.java
+++ b/espresso/core/java/androidx/test/espresso/IdlingPolicies.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import java.util.concurrent.TimeUnit;
 
@@ -92,9 +92,6 @@ public static void setIdlingResourceTimeout(long timeout, TimeUnit unit) {
    * This method overrides Espresso's default behaviour of disabling timeouts when a step debugger
    * is attached to the VM. Setting the timeout flag reenables the behaviour of throwing a timeout
    * exception.
-   *
-   * <p>The value set in this method is superceded if {@link #unsafeMakeMasterPolicyWarning()} is
-   * also called.
    */
   public static void setMasterPolicyTimeoutWhenDebuggerAttached(
       boolean timeoutWhenDebuggerAttached) {
@@ -104,7 +101,6 @@ public static void setMasterPolicyTimeoutWhenDebuggerAttached(
             .build();
   }
 
-
   public static IdlingPolicy getMasterIdlingPolicy() {
     return masterIdlingPolicy;
   }
diff --git a/espresso/core/java/androidx/test/espresso/IdlingPolicy.java b/espresso/core/java/androidx/test/espresso/IdlingPolicy.java
index 3bf7a8eea..be73e31fd 100644
--- a/espresso/core/java/androidx/test/espresso/IdlingPolicy.java
+++ b/espresso/core/java/androidx/test/espresso/IdlingPolicy.java
@@ -16,10 +16,11 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.util.Log;
+import androidx.test.internal.platform.util.TestOutputEmitter;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -58,7 +59,14 @@ public TimeUnit getIdleTimeoutUnit() {
   public void handleTimeout(List<String> busyResources, String message) {
     switch (errorHandler) {
       case THROW_APP_NOT_IDLE:
-        throw AppNotIdleException.create(busyResources, message);
+        AppNotIdleException appNotIdleException =
+            AppNotIdleException.create(busyResources, message);
+        try {
+          TestOutputEmitter.dumpThreadStates("ThreadState-AppNotIdleException.txt");
+        } catch (RuntimeException | Error e) {
+          appNotIdleException.addSuppressed(e);
+        }
+        throw appNotIdleException;
       case THROW_IDLE_TIMEOUT:
         throw new IdlingResourceTimeoutException(busyResources);
       case LOG_ERROR:
diff --git a/espresso/core/java/androidx/test/espresso/IdlingResourceTimeoutException.java b/espresso/core/java/androidx/test/espresso/IdlingResourceTimeoutException.java
index 7ae428bb8..1172ee13f 100644
--- a/espresso/core/java/androidx/test/espresso/IdlingResourceTimeoutException.java
+++ b/espresso/core/java/androidx/test/espresso/IdlingResourceTimeoutException.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.internal.platform.util.TestOutputEmitter;
 import java.util.List;
diff --git a/espresso/core/java/androidx/test/espresso/InteractionResultsHandler.java b/espresso/core/java/androidx/test/espresso/InteractionResultsHandler.java
index 9800593f7..a3cd691eb 100644
--- a/espresso/core/java/androidx/test/espresso/InteractionResultsHandler.java
+++ b/espresso/core/java/androidx/test/espresso/InteractionResultsHandler.java
@@ -16,14 +16,14 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.remote.NoRemoteEspressoInstanceException;
-import com.google.common.annotations.VisibleForTesting;
+import androidx.test.espresso.util.ToStringHelper;
+import androidx.test.platform.concurrent.DirectExecutor;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
@@ -49,7 +49,7 @@ private InteractionResultsHandler() {}
 
   /** Awaits for the 1st meaningful result from the futures and returns it to the caller. */
   static <T> T gatherAnyResult(List<ListenableFuture<T>> tasks) {
-    return gatherAnyResult(tasks, MoreExecutors.directExecutor());
+    return gatherAnyResult(tasks, DirectExecutor.INSTANCE);
   }
 
   @VisibleForTesting
@@ -217,8 +217,7 @@ public static <T> ExecutionResult<T> error(Throwable error, boolean priorityFail
 
     @Override
     public String toString() {
-      return toStringHelper(this)
-          .omitNullValues()
+      return new ToStringHelper(this)
           .add("priority", priority)
           .add("success", success)
           .add("result", result)
diff --git a/espresso/core/java/androidx/test/espresso/NoMatchingRootException.java b/espresso/core/java/androidx/test/espresso/NoMatchingRootException.java
index 8a4b5e5b1..8585a88fb 100644
--- a/espresso/core/java/androidx/test/espresso/NoMatchingRootException.java
+++ b/espresso/core/java/androidx/test/espresso/NoMatchingRootException.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.internal.platform.util.TestOutputEmitter;
 import java.util.List;
diff --git a/espresso/core/java/androidx/test/espresso/NoMatchingViewException.java b/espresso/core/java/androidx/test/espresso/NoMatchingViewException.java
index 78ffe9098..ba8494fdc 100644
--- a/espresso/core/java/androidx/test/espresso/NoMatchingViewException.java
+++ b/espresso/core/java/androidx/test/espresso/NoMatchingViewException.java
@@ -16,12 +16,15 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.util.EspressoOptional;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.collect.Lists;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import org.hamcrest.Matcher;
@@ -38,17 +41,13 @@
  * thread, it would be invalid to touch the view on the instrumentation thread. Also the view
  * hierarchy may have changed since exception creation (leading to more confusion).
  */
-public final class NoMatchingViewException extends RuntimeException implements EspressoException {
+public final class NoMatchingViewException extends RuntimeException implements RootViewException {
 
   private Matcher<? super View> viewMatcher;
   private View rootView;
-  private List<View> adapterViews = Lists.newArrayList();
+  private List<View> adapterViews = new ArrayList<>();
   private boolean includeViewHierarchy = true;
-  private EspressoOptional<String> adapterViewWarning = EspressoOptional.<String>absent();
-
-  private NoMatchingViewException(String description) {
-    super(description);
-  }
+  @Nullable private String adapterViewWarning = null;
 
   private NoMatchingViewException(Builder builder) {
     super(getErrorMessage(builder), builder.cause);
@@ -71,6 +70,7 @@ public String getViewMatcherDescription() {
   }
 
   /** Returns the root view where this exception is thrown. */
+  @Override
   public View getRootView() {
     return rootView;
   }
@@ -81,16 +81,28 @@ private static String getErrorMessage(Builder builder) {
       String message =
           String.format(
               Locale.ROOT, "No views in hierarchy found matching: %s", builder.viewMatcher);
-      if (builder.adapterViewWarning.isPresent()) {
-        message = message + builder.adapterViewWarning.get();
+      if (builder.adapterViewWarning != null) {
+        message = message + builder.adapterViewWarning;
       }
       errorMessage =
           HumanReadables.getViewHierarchyErrorMessage(
-              builder.rootView, null /* problemViews */, message, null /* problemViewSuffix */);
+              builder.rootView,
+              /* problemViews= */ null,
+              message,
+              /* problemViewSuffix= */ null,
+              builder.maxMsgLen);
+
+      if (builder.viewHierarchyFile != null) {
+        errorMessage +=
+            String.format(
+                "\nThe complete view hierarchy is available in artifact file '%s'.",
+                builder.viewHierarchyFile);
+      }
     } else {
       errorMessage =
           String.format(Locale.ROOT, "Could not find a view that matches %s", builder.viewMatcher);
     }
+
     return errorMessage;
   }
 
@@ -99,10 +111,12 @@ public static class Builder {
 
     private Matcher<? super View> viewMatcher;
     private View rootView;
-    private List<View> adapterViews = Lists.newArrayList();
+    private List<View> adapterViews = new ArrayList<>();
     private boolean includeViewHierarchy = true;
-    private EspressoOptional<String> adapterViewWarning = EspressoOptional.<String>absent();
+    @Nullable private String adapterViewWarning = null;
     private Throwable cause;
+    private int maxMsgLen = Integer.MAX_VALUE;
+    private String viewHierarchyFile = null;
 
     public Builder from(NoMatchingViewException exception) {
       this.viewMatcher = exception.viewMatcher;
@@ -133,7 +147,16 @@ public Builder includeViewHierarchy(boolean includeViewHierarchy) {
       return this;
     }
 
+    /**
+     * @deprecated use {@link #withAdapterViewWarning(String)} instead
+     */
+    @Deprecated
     public Builder withAdapterViewWarning(EspressoOptional<String> adapterViewWarning) {
+      return withAdapterViewWarning(adapterViewWarning.get());
+    }
+
+    @CanIgnoreReturnValue
+    public Builder withAdapterViewWarning(String adapterViewWarning) {
       this.adapterViewWarning = adapterViewWarning;
       return this;
     }
@@ -143,11 +166,22 @@ public Builder withCause(Throwable cause) {
       return this;
     }
 
+    @NonNull
+    public Builder withMaxMsgLen(int maxMsgLen) {
+      this.maxMsgLen = maxMsgLen;
+      return this;
+    }
+
+    @NonNull
+    public Builder withViewHierarchyFile(@Nullable String viewHierarchyFile) {
+      this.viewHierarchyFile = viewHierarchyFile;
+      return this;
+    }
+
     public NoMatchingViewException build() {
       checkNotNull(viewMatcher);
       checkNotNull(rootView);
       checkNotNull(adapterViews);
-      checkNotNull(adapterViewWarning);
       return new NoMatchingViewException(this);
     }
   }
diff --git a/espresso/core/java/androidx/test/espresso/PerformException.java b/espresso/core/java/androidx/test/espresso/PerformException.java
index 86f542b99..6d81dba72 100644
--- a/espresso/core/java/androidx/test/espresso/PerformException.java
+++ b/espresso/core/java/androidx/test/espresso/PerformException.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.internal.platform.util.TestOutputEmitter;
 import java.util.Locale;
diff --git a/espresso/core/java/androidx/test/espresso/Root.java b/espresso/core/java/androidx/test/espresso/Root.java
index 3533e6a4d..8cb0ee9f3 100644
--- a/espresso/core/java/androidx/test/espresso/Root.java
+++ b/espresso/core/java/androidx/test/espresso/Root.java
@@ -16,15 +16,15 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.View;
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.util.EspressoOptional;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import androidx.test.espresso.util.ToStringHelper;
 
 /**
  * Represents a root view in the application and optionally the layout params of the window holding
@@ -35,18 +35,26 @@
  */
 public final class Root {
   private final View decorView;
-  private final EspressoOptional<LayoutParams> windowLayoutParams;
+  @Nullable private final LayoutParams windowLayoutParams;
 
   private Root(Builder builder) {
     this.decorView = checkNotNull(builder.decorView);
-    this.windowLayoutParams = EspressoOptional.fromNullable(builder.windowLayoutParams);
+    this.windowLayoutParams = builder.windowLayoutParams;
   }
 
   public View getDecorView() {
     return decorView;
   }
 
+  /**
+   * @deprecated use {@link #getWindowLayoutParams2()}
+   */
+  @Deprecated
   public EspressoOptional<WindowManager.LayoutParams> getWindowLayoutParams() {
+    return EspressoOptional.of(windowLayoutParams);
+  }
+
+  public WindowManager.LayoutParams getWindowLayoutParams2() {
     return windowLayoutParams;
   }
 
@@ -58,7 +66,7 @@ public EspressoOptional<WindowManager.LayoutParams> getWindowLayoutParams() {
    */
   public boolean isReady() {
     if (!decorView.isLayoutRequested()) {
-      int flags = windowLayoutParams.get().flags;
+      int flags = windowLayoutParams.flags;
       return decorView.hasWindowFocus()
           || (flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE)
               == WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
@@ -69,14 +77,14 @@ public boolean isReady() {
   @Override
   public String toString() {
     ToStringHelper helper =
-        toStringHelper(this)
+        new ToStringHelper(this)
             .add("application-window-token", decorView.getApplicationWindowToken())
             .add("window-token", decorView.getWindowToken())
             .add("has-window-focus", decorView.hasWindowFocus());
-    if (windowLayoutParams.isPresent()) {
+    if (windowLayoutParams != null) {
       helper
-          .add("layout-params-type", windowLayoutParams.get().type)
-          .add("layout-params-string", windowLayoutParams.get());
+          .add("layout-params-type", windowLayoutParams.type)
+          .add("layout-params-string", windowLayoutParams);
     }
     helper.add("decor-view-string", HumanReadables.describe(decorView));
     return helper.toString();
diff --git a/espresso/core/java/androidx/test/espresso/RootViewException.java b/espresso/core/java/androidx/test/espresso/RootViewException.java
new file mode 100644
index 000000000..e54f4da47
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/RootViewException.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso;
+
+import android.view.View;
+import androidx.annotation.NonNull;
+
+/**
+ * An {@link EspressoException} that can provide a Root View.
+ *
+ * <p>Types which implement this are also expected to extend {@link Throwable} or any of its
+ * sub-types, as is typical of all Java exceptions.
+ */
+public interface RootViewException extends EspressoException {
+
+  /** Returns the root view where this exception is thrown. */
+  @NonNull
+  View getRootView();
+}
diff --git a/espresso/core/java/androidx/test/espresso/ViewInteraction.java b/espresso/core/java/androidx/test/espresso/ViewInteraction.java
index 6a0a444f5..5073ab8a5 100644
--- a/espresso/core/java/androidx/test/espresso/ViewInteraction.java
+++ b/espresso/core/java/androidx/test/espresso/ViewInteraction.java
@@ -18,8 +18,9 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static androidx.test.internal.util.LogUtil.logDebugWithProcess;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Collections.unmodifiableMap;
 
 import android.os.IBinder;
 import android.os.RemoteException;
@@ -36,12 +37,14 @@
 import androidx.test.espresso.remote.IInteractionExecutionStatus;
 import androidx.test.espresso.remote.RemoteInteraction;
 import androidx.test.espresso.util.HumanReadables;
+import androidx.test.espresso.util.TracingUtil;
+import androidx.test.espresso.util.concurrent.ListenableFutureTask;
+import androidx.test.espresso.util.concurrent.ListeningExecutorService;
 import androidx.test.internal.platform.os.ControlledLooper;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
+import androidx.test.internal.util.Checks;
+import androidx.test.platform.tracing.Tracer.Span;
+import androidx.test.platform.tracing.Tracing;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListenableFutureTask;
-import com.google.common.util.concurrent.ListeningExecutorService;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -79,6 +82,7 @@ public final class ViewInteraction {
   private final RemoteInteraction remoteInteraction;
   private final ListeningExecutorService remoteExecutor;
   private final TestFlowVisualizer testFlowVisualizer;
+  private final Tracing tracer;
   // test thread only
   private boolean hasRootMatcher = false;
 
@@ -94,7 +98,8 @@ public final class ViewInteraction {
       RemoteInteraction remoteInteraction,
       ListeningExecutorService remoteExecutor,
       ControlledLooper controlledLooper,
-      TestFlowVisualizer testFlowVisualizer) {
+      TestFlowVisualizer testFlowVisualizer,
+      Tracing tracer) {
     this.viewFinder = checkNotNull(viewFinder);
     this.uiController = (InterruptableUiController) checkNotNull(uiController);
     this.failureHandler = checkNotNull(failureHandler);
@@ -106,6 +111,7 @@ public final class ViewInteraction {
     this.remoteExecutor = checkNotNull(remoteExecutor);
     this.controlledLooper = checkNotNull(controlledLooper);
     this.testFlowVisualizer = checkNotNull(testFlowVisualizer);
+    this.tracer = tracer;
   }
 
   /**
@@ -119,6 +125,7 @@ public final class ViewInteraction {
    *
    * @param viewActions one or more actions to execute.
    * @return this interaction for further perform/verification calls.
+   * @throws RuntimeException when being invoked on the main thread.
    */
   public ViewInteraction perform(final ViewAction... viewActions) {
     checkNotNull(viewActions);
@@ -145,11 +152,11 @@ private static Map<String, IBinder> getIBindersFromBindables(List<Bindable> bind
           checkNotNull(bindable.getId(), "Bindable id cannot be null!"),
           checkNotNull(bindable.getIBinder(), "Bindable binder cannot be null!"));
     }
-    return ImmutableMap.copyOf(iBinders);
+    return unmodifiableMap(iBinders);
   }
 
   private static List<Bindable> getBindables(Object... objects) {
-    List<Bindable> bindables = Lists.newArrayListWithCapacity(objects.length);
+    List<Bindable> bindables = new ArrayList<>(objects.length);
     for (Object object : objects) {
       if (object instanceof Bindable) {
         bindables.add((Bindable) object);
@@ -169,20 +176,29 @@ private static Map<String, IBinder> getIBindersFromViewAssertions(
 
   private void desugaredPerform(
       final SingleExecutionViewAction va, int actionIndex, boolean testFlowEnabled) {
+    ViewAction innerViewAction = va.getInnerViewAction();
+
     Callable<Void> performInteraction =
         new Callable<Void>() {
           @Override
           public Void call() {
-            doPerform(va, actionIndex, testFlowEnabled);
+            String spanName =
+                TracingUtil.getSpanName(
+                    "Espresso",
+                    "perform",
+                    TracingUtil.getClassName(
+                        innerViewAction, /* defaultName= */ innerViewAction.getDescription()),
+                    viewMatcher);
+            try (Span ignored = tracer.beginSpan(spanName)) {
+              doPerform(va, actionIndex, testFlowEnabled);
+            }
             return null;
           }
         };
 
-    ViewAction innerViewAction = va.getInnerViewAction();
-
     List<ListenableFuture<Void>> interactions = new ArrayList<>();
     interactions.add(postAsynchronouslyOnUiThread(performInteraction));
-    if (!remoteInteraction.isRemoteProcess()) {
+    if (!remoteInteraction.isRemoteProcess() && remoteInteraction.isRemoteClient()) {
       // Only the original process should submit remote interactionsList;
       interactions.add(
           remoteExecutor.submit(
@@ -198,9 +214,9 @@ public Void call() {
 
   /**
    * Replaces the default failure handler (@see Espresso.setFailureHandler) with a custom
-   * failurehandler for this particular interaction.
+   * FailureHandler for this particular interaction.
    *
-   * @param failureHandler a non-null failurehandler to use to report failures.
+   * @param failureHandler a non-null FailureHandler to use to report failures.
    * @return this interaction for further perform/verification calls.
    */
   public ViewInteraction withFailureHandler(FailureHandler failureHandler) {
@@ -275,7 +291,11 @@ && isDescendantOfA(isAssignableFrom(AdapterView.class)).matches(targetView)) {
       if (testFlowEnabled) {
         testFlowVisualizer.beforeActionRecordData(actionData, targetView);
       }
-      viewAction.perform(uiController, targetView);
+      String spanName =
+          TracingUtil.getSpanName("Espresso", "doPerform", HumanReadables.describe(targetView));
+      try (Span ignored = tracer.beginSpan(spanName)) {
+        viewAction.perform(uiController, targetView);
+      }
       if (testFlowEnabled) {
         testFlowVisualizer.afterActionRecordData(actionData);
       }
@@ -283,10 +303,11 @@ && isDescendantOfA(isAssignableFrom(AdapterView.class)).matches(targetView)) {
   }
 
   /**
-   * Checks the given {@link ViewAssertion} on the the view selected by the current view matcher.
+   * Checks the given {@link ViewAssertion} on the view selected by the current view matcher.
    *
    * @param viewAssert the assertion to check.
    * @return this interaction for further perform/verification calls.
+   * @throws RuntimeException when being invoked on the main thread.
    */
   public ViewInteraction check(final ViewAssertion viewAssert) {
     checkNotNull(viewAssert);
@@ -298,27 +319,40 @@ public ViewInteraction check(final ViewAssertion viewAssert) {
         new Callable<Void>() {
           @Override
           public Void call() {
-            uiController.loopMainThreadUntilIdle();
-
-            View targetView = null;
-            NoMatchingViewException missingViewException = null;
-            try {
-              targetView = viewFinder.getView();
-            } catch (NoMatchingViewException nsve) {
-              missingViewException = nsve;
+            String spanName =
+                TracingUtil.getSpanName(
+                    "Espresso",
+                    "check",
+                    TracingUtil.getClassName(viewAssert, /* defaultName= */ "ViewAssertion"),
+                    viewMatcher);
+            try (Span ignored = tracer.beginSpan(spanName)) {
+              uiController.loopMainThreadUntilIdle();
+
+              View targetView = null;
+              NoMatchingViewException missingViewException = null;
+              try {
+                targetView = viewFinder.getView();
+              } catch (NoMatchingViewException nsve) {
+                missingViewException = nsve;
+              }
+              Log.i(
+                  TAG,
+                  String.format(
+                      Locale.ROOT, "Checking '%s' assertion on view %s", viewAssert, viewMatcher));
+              String checkOnTargetViewSpan =
+                  TracingUtil.getSpanName(
+                      "Espresso", "doCheck", HumanReadables.describe(targetView));
+              try (Span checkOnTargetViewSpanIgnored = tracer.beginSpan(checkOnTargetViewSpan)) {
+                singleExecutionViewAssertion.check(targetView, missingViewException);
+                return null;
+              }
             }
-            Log.i(
-                TAG,
-                String.format(
-                    Locale.ROOT, "Checking '%s' assertion on view %s", viewAssert, viewMatcher));
-            singleExecutionViewAssertion.check(targetView, missingViewException);
-            return null;
           }
         };
 
     List<ListenableFuture<Void>> interactions = new ArrayList<>();
     interactions.add(postAsynchronouslyOnUiThread(checkInteraction));
-    if (!remoteInteraction.isRemoteProcess()) {
+    if (!remoteInteraction.isRemoteProcess() && remoteInteraction.isRemoteClient()) {
       // Only the original process should submit remote interactionsList;
       interactions.add(
           remoteExecutor.submit(
@@ -334,6 +368,8 @@ public Void call() {
   }
 
   private ListenableFuture<Void> postAsynchronouslyOnUiThread(Callable<Void> interaction) {
+    Checks.checkNotMainThread();
+
     ListenableFutureTask<Void> mainThreadInteraction = ListenableFutureTask.create(interaction);
     mainThreadExecutor.execute(mainThreadInteraction);
     return mainThreadInteraction;
@@ -343,6 +379,7 @@ private void waitForAndHandleInteractionResults(List<ListenableFuture<Void>> int
     try {
       controlledLooper.drainMainThreadUntilIdle();
       // Blocking call
+      // TODO(brettchabot): This method should only be accessed from tests or within private scope
       InteractionResultsHandler.gatherAnyResult(interactions);
     } catch (RuntimeException ee) {
       failureHandler.handle(ee, viewMatcher);
diff --git a/espresso/core/java/androidx/test/espresso/ViewInteractionComponent.java b/espresso/core/java/androidx/test/espresso/ViewInteractionComponent.java
index ef1c0b88c..385b399cb 100644
--- a/espresso/core/java/androidx/test/espresso/ViewInteractionComponent.java
+++ b/espresso/core/java/androidx/test/espresso/ViewInteractionComponent.java
@@ -16,12 +16,19 @@
 
 package androidx.test.espresso;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.espresso.base.RootViewPickerScope;
 import dagger.Subcomponent;
 
-/** Dagger component for view interaction classes. */
+/**
+ * Dagger component for view interaction classes.
+ *
+ * @hide
+ */
 @RootViewPickerScope
 @Subcomponent(modules = ViewInteractionModule.class)
+@RestrictTo(Scope.LIBRARY)
 public interface ViewInteractionComponent {
   ViewInteraction viewInteraction();
 }
diff --git a/espresso/core/java/androidx/test/espresso/ViewInteractionModule.java b/espresso/core/java/androidx/test/espresso/ViewInteractionModule.java
index 5be70f55a..0840339cb 100644
--- a/espresso/core/java/androidx/test/espresso/ViewInteractionModule.java
+++ b/espresso/core/java/androidx/test/espresso/ViewInteractionModule.java
@@ -16,9 +16,11 @@
 
 package androidx.test.espresso;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.View;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.espresso.base.PlatformTestStorageModule;
 import androidx.test.espresso.base.RootViewPicker;
 import androidx.test.espresso.base.ViewFinderImpl;
@@ -37,6 +39,7 @@
  *
  * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 @Module(includes = {PlatformTestStorageModule.class})
 class ViewInteractionModule {
 
diff --git a/espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderAction.java b/espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderAction.java
index 6a8ab954d..0b2714b79 100755
--- a/espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderAction.java
@@ -18,19 +18,20 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 import static org.hamcrest.Matchers.allOf;
 
 import android.view.View;
 import android.widget.Adapter;
 import android.widget.AdapterView;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.util.EspressoOptional;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import org.hamcrest.Matcher;
@@ -42,39 +43,49 @@
  */
 public final class AdapterDataLoaderAction implements ViewAction {
   final Matcher<? extends Object> dataToLoadMatcher;
-  final EspressoOptional<Integer> atPosition;
+  @Nullable final Integer atPosition;
   final AdapterViewProtocol adapterViewProtocol;
   private AdapterViewProtocol.AdaptedData adaptedData;
   private boolean performed = false;
   private final Object dataLock = new Object();
 
+  /**
+   * @deprecated use {@link AdapterDataLoaderAction(Matcher<? extends Object>, Integer,
+   *     AdapterViewProtocol)} instead.
+   */
+  @Deprecated
   public AdapterDataLoaderAction(
       Matcher<? extends Object> dataToLoadMatcher,
       EspressoOptional<Integer> atPosition,
       AdapterViewProtocol adapterViewProtocol) {
+    this(dataToLoadMatcher, atPosition.get(), adapterViewProtocol);
+  }
+
+  public AdapterDataLoaderAction(
+      Matcher<? extends Object> dataToLoadMatcher,
+      @Nullable Integer atPosition,
+      AdapterViewProtocol adapterViewProtocol) {
     this.dataToLoadMatcher = checkNotNull(dataToLoadMatcher);
-    this.atPosition = checkNotNull(atPosition);
+    this.atPosition = atPosition;
     this.adapterViewProtocol = checkNotNull(adapterViewProtocol);
   }
 
   public AdapterViewProtocol.AdaptedData getAdaptedData() {
     synchronized (dataLock) {
-      checkState(performed, "perform hasn't beenViewFinderImpl called yet!");
+      checkState(performed, "perform hasn't been called yet!");
       return adaptedData;
     }
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public Matcher<View> getConstraints() {
     return allOf(isAssignableFrom(AdapterView.class), isDisplayed());
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public void perform(UiController uiController, View view) {
     AdapterView<? extends Adapter> adapterView = (AdapterView<? extends Adapter>) view;
-    List<AdapterViewProtocol.AdaptedData> matchedDataItems = Lists.newArrayList();
+    List<AdapterViewProtocol.AdaptedData> matchedDataItems = new ArrayList<>();
 
     for (AdapterViewProtocol.AdaptedData data :
         adapterViewProtocol.getDataInAdapterView(adapterView)) {
@@ -102,9 +113,9 @@ public void perform(UiController uiController, View view) {
     synchronized (dataLock) {
       checkState(!performed, "perform called 2x!");
       performed = true;
-      if (atPosition.isPresent()) {
+      if (atPosition != null) {
         int matchedDataItemsSize = matchedDataItems.size() - 1;
-        if (atPosition.get() > matchedDataItemsSize) {
+        if (atPosition > matchedDataItemsSize) {
           throw new PerformException.Builder()
               .withActionDescription(this.getDescription())
               .withViewDescription(HumanReadables.describe(view))
@@ -114,10 +125,10 @@ public void perform(UiController uiController, View view) {
                           Locale.ROOT,
                           "There are only %d elements that matched but requested %d element.",
                           matchedDataItemsSize,
-                          atPosition.get())))
+                          atPosition)))
               .build();
         } else {
-          adaptedData = matchedDataItems.get(atPosition.get());
+          adaptedData = matchedDataItems.get(atPosition);
         }
       } else {
         if (matchedDataItems.size() != 1) {
diff --git a/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocol.java b/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocol.java
index 1f130143c..57547d897 100644
--- a/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocol.java
+++ b/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocol.java
@@ -16,16 +16,16 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.database.Cursor;
 import android.view.View;
 import android.widget.Adapter;
 import android.widget.AdapterView;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.util.EspressoOptional;
 import androidx.test.espresso.util.HumanReadables;
 import java.util.Locale;
-import javax.annotation.Nullable;
 
 /**
  * A sadly necessary layer of indirection to interact with AdapterViews.
@@ -63,6 +63,13 @@ public interface AdapterViewProtocol {
    */
   Iterable<AdaptedData> getDataInAdapterView(AdapterView<? extends Adapter> adapterView);
 
+  /**
+   * @deprecated use {@link #getDataRenderedByView2(AdapterView, View)}
+   */
+  @Deprecated
+  EspressoOptional<AdaptedData> getDataRenderedByView(
+      AdapterView<? extends Adapter> adapterView, View descendantView);
+
   /**
    * Returns the data object this particular view is rendering if possible.
    *
@@ -91,8 +98,11 @@ public interface AdapterViewProtocol {
    * @return an optional data object the descendant view is rendering.
    * @throws IllegalArgumentException if this protocol cannot interrogate this class of adapterView
    */
-  EspressoOptional<AdaptedData> getDataRenderedByView(
-      AdapterView<? extends Adapter> adapterView, View descendantView);
+  @Nullable
+  default AdaptedData getDataRenderedByView2(
+      AdapterView<? extends Adapter> adapterView, View descendantView) {
+    return getDataRenderedByView(adapterView, descendantView).get();
+  }
 
   /**
    * Requests that a particular piece of data held in this AdapterView is actually rendered by it.
diff --git a/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocols.java b/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocols.java
index 95bdb10d7..0bb40b974 100644
--- a/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocols.java
+++ b/espresso/core/java/androidx/test/espresso/action/AdapterViewProtocols.java
@@ -17,10 +17,9 @@
 package androidx.test.espresso.action;
 
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayingAtLeast;
-import static com.google.common.base.Preconditions.checkArgument;
+import static androidx.test.internal.util.Checks.checkArgument;
 
 import android.database.Cursor;
-import android.os.Build;
 import android.util.Log;
 import android.view.View;
 import android.widget.AbsListView;
@@ -28,9 +27,9 @@
 import android.widget.AdapterView;
 import android.widget.AdapterViewAnimator;
 import android.widget.AdapterViewFlipper;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.util.EspressoOptional;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Range;
+import java.util.ArrayList;
 import java.util.List;
 
 /** Implementations of {@link AdapterViewProtocol} for standard SDK Widgets. */
@@ -84,7 +83,7 @@ public Object getData() {
 
     @Override
     public Iterable<AdaptedData> getDataInAdapterView(AdapterView<? extends Adapter> adapterView) {
-      List<AdaptedData> datas = Lists.newArrayList();
+      List<AdaptedData> datas = new ArrayList<>();
       for (int i = 0; i < adapterView.getCount(); i++) {
         int position = i;
         Object dataAtPosition = adapterView.getItemAtPosition(position);
@@ -97,21 +96,31 @@ public Iterable<AdaptedData> getDataInAdapterView(AdapterView<? extends Adapter>
       return datas;
     }
 
+    /**
+     * @deprecated use {@link #getDataRenderedByView2(AdapterView, View)}
+     */
     @Override
+    @Deprecated
     public EspressoOptional<AdaptedData> getDataRenderedByView(
         AdapterView<? extends Adapter> adapterView, View descendantView) {
+      return EspressoOptional.of(getDataRenderedByView2(adapterView, descendantView));
+    }
+
+    @Override
+    @Nullable
+    public AdaptedData getDataRenderedByView2(
+        AdapterView<? extends Adapter> adapterView, View descendantView) {
       if (adapterView == descendantView.getParent()) {
         int position = adapterView.getPositionForView(descendantView);
         if (position != AdapterView.INVALID_POSITION) {
-          return EspressoOptional.of(
-              new AdaptedData.Builder()
-                  .withDataFunction(
-                      new StandardDataFunction(adapterView.getItemAtPosition(position), position))
-                  .withOpaqueToken(Integer.valueOf(position))
-                  .build());
+          return new AdaptedData.Builder()
+              .withDataFunction(
+                  new StandardDataFunction(adapterView.getItemAtPosition(position), position))
+              .withOpaqueToken(Integer.valueOf(position))
+              .build();
         }
       }
-      return EspressoOptional.absent();
+      return null;
     }
 
     @Override
@@ -123,25 +132,19 @@ public void makeDataRenderedWithinAdapterView(
       boolean moved = false;
       // set selection should always work, we can give a little better experience if per subtype
       // though.
-      if (Build.VERSION.SDK_INT > 7) {
-        if (adapterView instanceof AbsListView) {
-          if (Build.VERSION.SDK_INT > 10) {
-            ((AbsListView) adapterView)
-                .smoothScrollToPositionFromTop(position, adapterView.getPaddingTop(), 0);
-          } else {
-            ((AbsListView) adapterView).smoothScrollToPosition(position);
-          }
-          moved = true;
-        }
-        if (Build.VERSION.SDK_INT > 10) {
-          if (adapterView instanceof AdapterViewAnimator) {
-            if (adapterView instanceof AdapterViewFlipper) {
-              ((AdapterViewFlipper) adapterView).stopFlipping();
-            }
-            ((AdapterViewAnimator) adapterView).setDisplayedChild(position);
-            moved = true;
-          }
+      if (adapterView instanceof AbsListView) {
+        ((AbsListView) adapterView)
+            .smoothScrollToPositionFromTop(position, adapterView.getPaddingTop(), 0);
+
+        moved = true;
+      }
+
+      if (adapterView instanceof AdapterViewAnimator) {
+        if (adapterView instanceof AdapterViewFlipper) {
+          ((AdapterViewFlipper) adapterView).stopFlipping();
         }
+        ((AdapterViewAnimator) adapterView).setDisplayedChild(position);
+        moved = true;
       }
       if (!moved) {
         adapterView.setSelection(position);
@@ -155,8 +158,8 @@ public boolean isDataRenderedWithinAdapterView(
       int dataPosition = ((Integer) adaptedData.opaqueToken).intValue();
       boolean inView = false;
 
-      if (Range.closed(adapterView.getFirstVisiblePosition(), adapterView.getLastVisiblePosition())
-          .contains(dataPosition)) {
+      if (dataPosition >= adapterView.getFirstVisiblePosition()
+          && dataPosition <= adapterView.getLastVisiblePosition()) {
         if (adapterView.getFirstVisiblePosition() == adapterView.getLastVisiblePosition()) {
           // thats a huge element.
           inView = true;
diff --git a/espresso/core/java/androidx/test/espresso/action/BUILD b/espresso/core/java/androidx/test/espresso/action/BUILD
new file mode 100644
index 000000000..a77ebc35e
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/action/BUILD
@@ -0,0 +1,60 @@
+# Description:
+#  View Actions for espresso.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+ADAPTER_VIEW_PROTOCOL = [
+    "AdapterViewProtocols.java",
+    "AdapterViewProtocol.java",
+]
+
+COMMON_JAVACOPTS = [
+    "-Xep:ObjectToString:OFF",  # See http://go/objecttostring-lsc
+]
+
+android_library(
+    name = "adapter_view_protocol",
+    srcs = ADAPTER_VIEW_PROTOCOL,
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
+
+kt_android_library(
+    name = "action",
+    srcs = glob(
+        [
+            "*.java",
+            "*.kt",
+        ],
+        exclude = ADAPTER_VIEW_PROTOCOL,
+    ),
+    javacopts = COMMON_JAVACOPTS,
+    deps = [
+        ":adapter_view_protocol",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/action/BUILD.bazel b/espresso/core/java/androidx/test/espresso/action/BUILD.bazel
deleted file mode 100644
index f7bbe237a..000000000
--- a/espresso/core/java/androidx/test/espresso/action/BUILD.bazel
+++ /dev/null
@@ -1,76 +0,0 @@
-# View Actions for espresso.
-
-licenses(["notice"])
-
-package(default_visibility = ["//visibility:public"])
-
-ADAPTER_VIEW_PROTOCOL = [
-    "AdapterViewProtocols.java",
-    "AdapterViewProtocol.java",
-]
-
-android_library(
-    name = "adapter_view_protocol",
-    srcs = ADAPTER_VIEW_PROTOCOL,
-    deps = [
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
-)
-
-REMOTE_VIEW_ACTIONS = [
-    "RemoteViewActions.java",
-    # TODO(b/33047831): rename all RemoteMessages to *RemoteMsg
-    "*RemoteMessage.java",
-    "*RemoteMsg.java",
-]
-
-android_library(
-    name = "action",
-    srcs = glob(
-        ["*.java"],
-        exclude = ADAPTER_VIEW_PROTOCOL + REMOTE_VIEW_ACTIONS,
-    ),
-    deps = [
-        ":adapter_view_protocol",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
-        "//espresso/core/java/androidx/test/espresso/base:idling_uicontroller_interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//runner/android_junit_runner",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
-)
-
-android_library(
-    name = "remote_view_actions",
-    srcs = glob(
-        REMOTE_VIEW_ACTIONS,
-    ),
-    deps = [
-        ":action",
-        ":adapter_view_protocol",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso/proto/action:ui_interaction_view_actions_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/action/CaptureToBitmapAction.kt b/espresso/core/java/androidx/test/espresso/action/CaptureToBitmapAction.kt
new file mode 100644
index 000000000..0f22d94c7
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/action/CaptureToBitmapAction.kt
@@ -0,0 +1,44 @@
+package androidx.test.espresso.action
+
+import android.os.Handler
+import android.os.Looper
+import android.view.View
+import androidx.test.core.internal.os.HandlerExecutor
+import androidx.test.core.view.captureToBitmapAsync
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.UiController
+import androidx.test.espresso.ViewAction
+import java.util.Locale
+import java.util.concurrent.TimeUnit
+import org.hamcrest.Matcher
+import org.hamcrest.Matchers.any
+
+class CaptureToBitmapAction(val bitmapReceiver: ViewActions.BitmapReceiver) : ViewAction {
+  override fun getConstraints(): Matcher<View> {
+    return any(View::class.java)
+  }
+
+  override fun getDescription(): String {
+    return String.format(Locale.ROOT, "capture view to Bitmap")
+  }
+
+  override fun perform(uiController: UiController, view: View) {
+    uiController.loopMainThreadUntilIdle()
+    // Create an idling resource for the bitmap creation work.
+    val captureIdlingResource = RunnableIdlingResource()
+    IdlingRegistry.getInstance().register(captureIdlingResource)
+
+    // Have the bitmap mark the idling resource as idle when it completes.
+    val futureBitmap = view.captureToBitmapAsync()
+    val mainExecutor = HandlerExecutor(Handler(Looper.getMainLooper()))
+    futureBitmap.addListener(captureIdlingResource, mainExecutor)
+
+    // Wait for it to complete and unregister
+    uiController.loopMainThreadUntilIdle()
+    IdlingRegistry.getInstance().unregister(captureIdlingResource)
+
+    // Acquire the bitmap (should be instant)
+    val destBitmap = futureBitmap.get(1, TimeUnit.MILLISECONDS)
+    bitmapReceiver.onBitmapCaptured(destBitmap)
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/action/CloseKeyboardAction.java b/espresso/core/java/androidx/test/espresso/action/CloseKeyboardAction.java
index 748001e6e..7436d1c10 100644
--- a/espresso/core/java/androidx/test/espresso/action/CloseKeyboardAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/CloseKeyboardAction.java
@@ -16,8 +16,7 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.getOnlyElement;
+import static androidx.test.internal.util.Checks.checkState;
 import static org.hamcrest.Matchers.any;
 
 import android.app.Activity;
@@ -93,6 +92,13 @@ private void tryToCloseKeyboard(View view, UiController uiController) throws Tim
         Log.w(TAG, "Attempting to close soft keyboard, while it is not shown.");
         return;
       }
+      // If we received the result synchronously we're running in Robolectric
+      // (see ShadowInputMethodManager), return immediately.
+      // TODO(b/223190122): Don't infer the environment, this is a hack to workaround that
+      //  Robolectric does not advance the looper when idling resources so the timeouts don't work.
+      if (idlingResult.receivedResult) {
+        return;
+      }
       // set 2 second timeout
       idlingResult.scheduleTimeout(2000);
       uiController.loopMainThreadUntilIdle();
@@ -131,7 +137,7 @@ private static Activity getRootActivity(UiController uiController) {
         "More than one activity is in RESUMED stage."
             + " There may have been an error during the activity creation/startup process,"
             + " please check your logs.");
-    return getOnlyElement(resumedActivities);
+    return resumedActivities.iterator().next();
   }
 
   @Override
diff --git a/espresso/core/java/androidx/test/espresso/action/EspressoKey.java b/espresso/core/java/androidx/test/espresso/action/EspressoKey.java
index 44ba92c37..fa085abdb 100644
--- a/espresso/core/java/androidx/test/espresso/action/EspressoKey.java
+++ b/espresso/core/java/androidx/test/espresso/action/EspressoKey.java
@@ -16,9 +16,8 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkState;
 
-import android.os.Build;
 import android.view.KeyEvent;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
@@ -73,10 +72,7 @@ public Builder withShiftPressed(boolean shiftPressed) {
       return this;
     }
 
-    /**
-     * On Honeycomb and above, sets the CTRL_ON meta state of the resulting key. On Gingerbread and
-     * below, this is a noop.
-     */
+    /** Sets the CTRL_ON meta state of the resulting key. */
     public Builder withCtrlPressed(boolean ctrlPressed) {
       isCtrlPressed = ctrlPressed;
       return this;
@@ -98,7 +94,7 @@ private int getMetaState() {
         metaState |= KeyEvent.META_ALT_ON;
       }
 
-      if (isCtrlPressed && Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+      if (isCtrlPressed) {
         metaState |= KeyEvent.META_CTRL_ON;
       }
 
diff --git a/espresso/core/java/androidx/test/espresso/action/GeneralClickAction.java b/espresso/core/java/androidx/test/espresso/action/GeneralClickAction.java
index e69152b26..1dc25a2fa 100644
--- a/espresso/core/java/androidx/test/espresso/action/GeneralClickAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/GeneralClickAction.java
@@ -23,11 +23,11 @@
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.webkit.WebView;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.base.Optional;
 import java.util.Locale;
 import org.hamcrest.Matcher;
 
@@ -38,14 +38,13 @@ public final class GeneralClickAction implements ViewAction {
   final CoordinatesProvider coordinatesProvider;
   final Tapper tapper;
   final PrecisionDescriber precisionDescriber;
-  private final Optional<ViewAction> rollbackAction;
+  @Nullable private final ViewAction rollbackAction;
   private final int inputDevice;
   private final int buttonState;
 
-  /*
-   * @deprecated
-   * Use {@link #GeneralClickAction(Tapper, CoordinatesProvider, PrecisionDescriber, int, int)}
-   * instead
+  /**
+   * @deprecated Use {@link #GeneralClickAction(Tapper, CoordinatesProvider, PrecisionDescriber,
+   *     int, int)} instead.
    */
   @Deprecated
   public GeneralClickAction(
@@ -64,10 +63,9 @@ public GeneralClickAction(
     this(tapper, coordinatesProvider, precisionDescriber, inputDevice, buttonState, null);
   }
 
-  /*
-   * @deprecated
-   * Use {@link #GeneralClickAction(Tapper, CoordinatesProvider, PrecisionDescriber, int, int,
-   * ViewAction)} instead
+  /**
+   * @deprecated Use {@link #GeneralClickAction(Tapper, CoordinatesProvider, PrecisionDescriber,
+   *     int, int, ViewAction)} instead.
    */
   @Deprecated
   public GeneralClickAction(
@@ -90,15 +88,14 @@ public GeneralClickAction(
     this.precisionDescriber = precisionDescriber;
     this.inputDevice = inputDevice;
     this.buttonState = buttonState;
-    this.rollbackAction = Optional.fromNullable(rollbackAction);
+    this.rollbackAction = rollbackAction;
   }
 
   @Override
-  @SuppressWarnings("unchecked")
   public Matcher<View> getConstraints() {
     Matcher<View> standardConstraint = isDisplayingAtLeast(90);
-    if (rollbackAction.isPresent()) {
-      return allOf(standardConstraint, rollbackAction.get().getConstraints());
+    if (rollbackAction != null) {
+      return allOf(standardConstraint, rollbackAction.getConstraints());
     } else {
       return standardConstraint;
     }
@@ -170,8 +167,8 @@ public void perform(UiController uiController, View view) {
         uiController.loopMainThreadForAtLeast(duration);
       }
       if (status == Tapper.Status.WARNING) {
-        if (rollbackAction.isPresent()) {
-          rollbackAction.get().perform(uiController, view);
+        if (rollbackAction != null) {
+          rollbackAction.perform(uiController, view);
         } else {
           break;
         }
@@ -197,7 +194,7 @@ public void perform(UiController uiController, View view) {
                       coordinatesProvider,
                       precisionDescriber,
                       loopCount,
-                      rollbackAction.isPresent())))
+                      rollbackAction != null)))
           .build();
     }
 
@@ -210,6 +207,7 @@ public void perform(UiController uiController, View view) {
 
   @Override
   public String getDescription() {
+    // TODO(brettchabot): Implicitly using the default locale is a common source of bugs:
     return tapper.toString().toLowerCase() + " click";
   }
 }
diff --git a/espresso/core/java/androidx/test/espresso/action/GeneralLocation.java b/espresso/core/java/androidx/test/espresso/action/GeneralLocation.java
index 9e77b687f..69d11bac8 100644
--- a/espresso/core/java/androidx/test/espresso/action/GeneralLocation.java
+++ b/espresso/core/java/androidx/test/espresso/action/GeneralLocation.java
@@ -18,6 +18,7 @@
 
 import android.graphics.Rect;
 import android.view.View;
+import androidx.annotation.NonNull;
 
 /** Calculates coordinate position for general locations. */
 public enum GeneralLocation implements CoordinatesProvider {
@@ -85,9 +86,14 @@ public float[] calculateCoordinates(View view) {
   /**
    * Translates the given coordinates by the given distances. The distances are given in term of the
    * view's size -- 1.0 means to translate by an amount equivalent to the view's length.
+   *
+   * @param coords the {@link CoordinatesProvider} to translate
+   * @param dx the distance in x direction
+   * @param dy the distance in y direction
    */
-  static CoordinatesProvider translate(
-      final CoordinatesProvider coords, final float dx, final float dy) {
+  @NonNull
+  public static CoordinatesProvider translate(
+      @NonNull final CoordinatesProvider coords, final float dx, final float dy) {
     return new TranslatedCoordinatesProvider(coords, dx, dy);
   }
 
diff --git a/espresso/core/java/androidx/test/espresso/action/KeyEventActionBase.java b/espresso/core/java/androidx/test/espresso/action/KeyEventActionBase.java
index d3baca326..4810b12eb 100644
--- a/espresso/core/java/androidx/test/espresso/action/KeyEventActionBase.java
+++ b/espresso/core/java/androidx/test/espresso/action/KeyEventActionBase.java
@@ -19,8 +19,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.util.ActivityLifecycles.hasForegroundActivities;
 import static androidx.test.espresso.util.ActivityLifecycles.hasTransitioningActivities;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.collect.Iterables.getOnlyElement;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.app.Activity;
 import android.os.SystemClock;
@@ -128,7 +128,8 @@ private boolean sendKeyEvent(UiController controller) throws InjectEventSecurity
   static Activity getCurrentActivity() {
     Collection<Activity> resumedActivities =
         ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED);
-    return getOnlyElement(resumedActivities);
+    checkState(resumedActivities.size() == 1, "There is not a single resumed Activity");
+    return resumedActivities.iterator().next();
   }
 
   static void waitForStageChangeInitialActivity(UiController controller, Activity initialActivity) {
diff --git a/espresso/core/java/androidx/test/espresso/action/MotionEvents.java b/espresso/core/java/androidx/test/espresso/action/MotionEvents.java
index 3e87a1922..067264df8 100644
--- a/espresso/core/java/androidx/test/espresso/action/MotionEvents.java
+++ b/espresso/core/java/androidx/test/espresso/action/MotionEvents.java
@@ -16,18 +16,18 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
-import android.os.Build;
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.InjectEventSecurityException;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
-import com.google.common.annotations.VisibleForTesting;
 import java.util.Locale;
 
 /** Facilitates sending of motion events to a {@link UiController}. */
@@ -57,16 +57,16 @@ public static MotionEvent obtainDownEvent(
     checkNotNull(coordinates);
     checkNotNull(precision);
 
-    // Algorithm of sending click event adopted from android.test.TouchUtils.
-    // When the click event was first initiated. Needs to be same for both down and up press
-    // events.
     long downTime = SystemClock.uptimeMillis();
-    // Down press.
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      return downPressGingerBread(downTime, coordinates, precision);
-    } else {
-      return downPressICS(downTime, coordinates, precision, inputDevice, buttonState);
-    }
+    return obtain(
+        downTime,
+        downTime,
+        MotionEvent.ACTION_DOWN,
+        coordinates,
+        precision[0],
+        precision[1],
+        inputDevice,
+        buttonState);
   }
 
   public static MotionEvent obtainDownEvent(float[] coordinates, float[] precision) {
@@ -85,7 +85,7 @@ public static DownResultHolder sendDown(
     checkNotNull(precision);
 
     for (int retry = 0; retry < MAX_CLICK_ATTEMPTS; retry++) {
-      MotionEvent motionEvent = null;
+      MotionEvent motionEvent;
       try {
         motionEvent = obtainDownEvent(coordinates, precision, inputDevice, buttonState);
         // The down event should be considered a tap if it is long enough to be detected
@@ -115,7 +115,6 @@ public static DownResultHolder sendDown(
 
         if (!injectEventSucceeded) {
           motionEvent.recycle();
-          motionEvent = null;
           continue;
         }
 
@@ -139,15 +138,29 @@ public static boolean sendUp(UiController uiController, MotionEvent downEvent) {
     return sendUp(uiController, downEvent, new float[] {downEvent.getX(), downEvent.getY()});
   }
 
+  /**
+   * Create a new finger up motion event associated with the specified down motion event, at the
+   * current time.
+   *
+   * @param downEvent the finger down motion event assoicated with this event.
+   * @param coordinates The coordinates of the event
+   */
   public static MotionEvent obtainUpEvent(MotionEvent downEvent, float[] coordinates) {
+    return obtainUpEvent(downEvent, SystemClock.uptimeMillis(), coordinates);
+  }
+
+  /**
+   * Create a new finger up motion event associated with the specified down motion event.
+   *
+   * @param downEvent the finger down motion event assoicated with this event.
+   * @param eventTime The the time (in ms) when this specific event was generated.
+   * @param coordinates The coordinates of the event
+   */
+  public static MotionEvent obtainUpEvent(
+      MotionEvent downEvent, long eventTime, float[] coordinates) {
     checkNotNull(downEvent);
     checkNotNull(coordinates);
-    // Up press.
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      return upPressGingerBread(downEvent, coordinates);
-    } else {
-      return upPressICS(downEvent, coordinates);
-    }
+    return obtain(downEvent, eventTime, MotionEvent.ACTION_UP, coordinates);
   }
 
   public static boolean sendUp(
@@ -181,7 +194,6 @@ public static boolean sendUp(
     } finally {
       if (null != motionEvent) {
         motionEvent.recycle();
-        motionEvent = null;
       }
     }
     return true;
@@ -194,14 +206,9 @@ public static void sendCancel(UiController uiController, MotionEvent downEvent)
     MotionEvent motionEvent = null;
     try {
       // Up press.
+      final float[] coordinates = new float[] {downEvent.getX(), downEvent.getY()};
       motionEvent =
-          MotionEvent.obtain(
-              downEvent.getDownTime(),
-              SystemClock.uptimeMillis(),
-              MotionEvent.ACTION_CANCEL,
-              downEvent.getX(),
-              downEvent.getY(),
-              0);
+          obtain(downEvent, SystemClock.uptimeMillis(), MotionEvent.ACTION_CANCEL, coordinates);
       boolean injectEventSucceeded = uiController.injectMotionEvent(motionEvent);
 
       if (!injectEventSucceeded) {
@@ -224,11 +231,42 @@ public static void sendCancel(UiController uiController, MotionEvent downEvent)
     } finally {
       if (null != motionEvent) {
         motionEvent.recycle();
-        motionEvent = null;
       }
     }
   }
 
+  /**
+   * Create a new move motion event associated with the specified down motion event, at the current
+   * time.
+   *
+   * @param downEvent the finger down motion event assoicated with this event.
+   * @param coordinates The coordinates of the event
+   */
+  @NonNull
+  public static MotionEvent obtainMovement(
+      @NonNull MotionEvent downEvent, @NonNull float[] coordinates) {
+    return obtainMovement(downEvent, SystemClock.uptimeMillis(), coordinates);
+  }
+
+  /**
+   * Create a new move motion event associated with the specified down motion event.
+   *
+   * @param downEvent the finger down motion event assoicated with this event.
+   * @param eventTime The the time (in ms) when this specific event was generated.
+   * @param coordinates The coordinates of the event
+   */
+  @NonNull
+  public static MotionEvent obtainMovement(
+      @NonNull MotionEvent downEvent, long eventTime, @NonNull float[] coordinates) {
+    checkNotNull(downEvent);
+    checkNotNull(coordinates);
+    return obtain(downEvent, eventTime, MotionEvent.ACTION_MOVE, coordinates);
+  }
+
+  /**
+   * @deprecated Use {@link #obtainMovement(MotionEvent, float[])} instead.
+   */
+  @Deprecated
   public static MotionEvent obtainMovement(long downTime, float[] coordinates) {
     return MotionEvent.obtain(
         downTime,
@@ -239,6 +277,10 @@ public static MotionEvent obtainMovement(long downTime, float[] coordinates) {
         0);
   }
 
+  /**
+   * @deprecated Use {@link #obtainMovement(MotionEvent, long, float[])} instead.
+   */
+  @Deprecated
   public static MotionEvent obtainMovement(long downTime, long eventTime, float[] coordinates) {
     return MotionEvent.obtain(
         downTime, eventTime, MotionEvent.ACTION_MOVE, coordinates[0], coordinates[1], 0);
@@ -252,7 +294,7 @@ public static boolean sendMovement(
 
     MotionEvent motionEvent = null;
     try {
-      motionEvent = obtainMovement(downEvent.getDownTime(), coordinates);
+      motionEvent = obtainMovement(downEvent, coordinates);
       boolean injectEventSucceeded = uiController.injectMotionEvent(motionEvent);
 
       if (!injectEventSucceeded) {
@@ -275,70 +317,59 @@ public static boolean sendMovement(
     } finally {
       if (null != motionEvent) {
         motionEvent.recycle();
-        motionEvent = null;
       }
     }
 
     return true;
   }
 
-  private static MotionEvent downPressGingerBread(
-      long downTime, float[] coordinates, float[] precision) {
-    return MotionEvent.obtain(
-        downTime,
-        SystemClock.uptimeMillis(),
-        MotionEvent.ACTION_DOWN,
-        coordinates[0],
-        coordinates[1],
-        0, // pressure
-        1, // size
-        0, // metaState
-        precision[0], // xPrecision
-        precision[1], // yPrecision
-        0, // deviceId
-        0); // edgeFlags
+  private static MotionEvent obtain(
+      MotionEvent downEvent, long eventTime, int action, float[] coordinates) {
+    return obtain(
+        downEvent.getDownTime(),
+        eventTime,
+        action,
+        coordinates,
+        downEvent.getXPrecision(),
+        downEvent.getYPrecision(),
+        downEvent.getSource(),
+        downEvent.getToolType(0),
+        downEvent.getButtonState());
   }
 
-  private static MotionEvent downPressICS(
-      long downTime, float[] coordinates, float[] precision, int inputDevice, int buttonState) {
-    MotionEvent.PointerCoords[] pointerCoords = {new MotionEvent.PointerCoords()};
-    MotionEvent.PointerProperties[] pointerProperties = getPointerProperties(inputDevice);
-    pointerCoords[0].clear();
-    pointerCoords[0].x = coordinates[0];
-    pointerCoords[0].y = coordinates[1];
-    pointerCoords[0].pressure = 0;
-    pointerCoords[0].size = 1;
-
-    return MotionEvent.obtain(
+  private static MotionEvent obtain(
+      long downTime,
+      long eventTime,
+      int action,
+      float[] coordinates,
+      float xPrecision,
+      float yPrecision,
+      int source,
+      int buttonState) {
+    return obtain(
         downTime,
-        SystemClock.uptimeMillis(),
-        MotionEvent.ACTION_DOWN,
-        1, // pointerCount
-        pointerProperties,
-        pointerCoords,
-        0, // metaState
-        buttonState,
-        precision[0],
-        precision[1],
-        0, // deviceId
-        0, // edgeFlags
-        inputDevice,
-        0); // flags
-  }
-
-  private static MotionEvent upPressGingerBread(MotionEvent downEvent, float[] coordinates) {
-    return MotionEvent.obtain(
-        downEvent.getDownTime(),
-        SystemClock.uptimeMillis(),
-        MotionEvent.ACTION_UP,
-        coordinates[0],
-        coordinates[1],
-        0);
+        eventTime,
+        action,
+        coordinates,
+        xPrecision,
+        yPrecision,
+        source,
+        mapInputDeviceToToolType(source),
+        buttonState);
   }
 
-  private static MotionEvent upPressICS(MotionEvent downEvent, float[] coordinates) {
-    MotionEvent.PointerCoords[] pointerCoords = {new MotionEvent.PointerCoords()};
-    MotionEvent.PointerProperties[] pointerProperties = getPointerProperties(downEvent.getSource());
+  private static MotionEvent obtain(
+      long downTime,
+      long eventTime,
+      int action,
+      float[] coordinates,
+      float xPrecision,
+      float yPrecision,
+      int source,
+      int toolType,
+      int buttonState) {
+    final MotionEvent.PointerCoords[] pointerCoords = {new MotionEvent.PointerCoords()};
+    final MotionEvent.PointerProperties[] pointerProperties = getPointerProperties(toolType);
     pointerCoords[0].clear();
     pointerCoords[0].x = coordinates[0];
     pointerCoords[0].y = coordinates[1];
@@ -346,41 +377,47 @@ private static MotionEvent upPressICS(MotionEvent downEvent, float[] coordinates
     pointerCoords[0].size = 1;
 
     return MotionEvent.obtain(
-        downEvent.getDownTime(),
-        SystemClock.uptimeMillis(),
-        MotionEvent.ACTION_UP,
+        downTime,
+        eventTime,
+        action,
         1, // pointerCount
         pointerProperties,
         pointerCoords,
         0, // metaState
-        downEvent.getButtonState(),
-        downEvent.getXPrecision(),
-        downEvent.getYPrecision(),
+        buttonState,
+        xPrecision,
+        yPrecision,
         0, // deviceId
         0, // edgeFlags
-        downEvent.getSource(),
+        source,
         0); // flags
   }
 
-  private static MotionEvent.PointerProperties[] getPointerProperties(int inputDevice) {
+  private static MotionEvent.PointerProperties[] getPointerProperties(int toolType) {
     MotionEvent.PointerProperties[] pointerProperties = {new MotionEvent.PointerProperties()};
     pointerProperties[0].clear();
     pointerProperties[0].id = 0;
+    pointerProperties[0].toolType = toolType;
+    return pointerProperties;
+  }
+
+  private static int mapInputDeviceToToolType(int inputDevice) {
+    int toolType;
     switch (inputDevice) {
       case InputDevice.SOURCE_MOUSE:
-        pointerProperties[0].toolType = MotionEvent.TOOL_TYPE_MOUSE;
+        toolType = MotionEvent.TOOL_TYPE_MOUSE;
         break;
       case InputDevice.SOURCE_STYLUS:
-        pointerProperties[0].toolType = MotionEvent.TOOL_TYPE_STYLUS;
+        toolType = MotionEvent.TOOL_TYPE_STYLUS;
         break;
       case InputDevice.SOURCE_TOUCHSCREEN:
-        pointerProperties[0].toolType = MotionEvent.TOOL_TYPE_FINGER;
+        toolType = MotionEvent.TOOL_TYPE_FINGER;
         break;
       default:
-        pointerProperties[0].toolType = MotionEvent.TOOL_TYPE_UNKNOWN;
+        toolType = MotionEvent.TOOL_TYPE_UNKNOWN;
         break;
     }
-    return pointerProperties;
+    return toolType;
   }
 
   /** Holds the result of a down motion. */
diff --git a/espresso/core/java/androidx/test/espresso/action/OpenLinkAction.java b/espresso/core/java/androidx/test/espresso/action/OpenLinkAction.java
index eabfcaac1..8bf657192 100644
--- a/espresso/core/java/androidx/test/espresso/action/OpenLinkAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/OpenLinkAction.java
@@ -19,8 +19,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.hasLinks;
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 import static org.hamcrest.Matchers.allOf;
 
 import android.net.Uri;
@@ -32,7 +32,7 @@
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
@@ -72,7 +72,7 @@ public void perform(UiController uiController, View view) {
 
     // TODO: what if we get more than one hit? For now, take the first one...
     // In the future, we may want to support a way to disambiguate (e.g using text around the link).
-    List<String> allLinks = Lists.newArrayList();
+    List<String> allLinks = new ArrayList<>();
     for (URLSpan url : urls) {
       int start = spanned.getSpanStart(url);
       checkState(start != -1, "Unable to get start of text associated with url: " + url);
diff --git a/espresso/core/java/androidx/test/espresso/action/RepeatActionUntilViewState.java b/espresso/core/java/androidx/test/espresso/action/RepeatActionUntilViewState.java
index fe178abeb..8cb90e909 100644
--- a/espresso/core/java/androidx/test/espresso/action/RepeatActionUntilViewState.java
+++ b/espresso/core/java/androidx/test/espresso/action/RepeatActionUntilViewState.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.view.View;
 import android.widget.ViewFlipper;
diff --git a/espresso/core/java/androidx/test/espresso/action/ReplaceTextAction.java b/espresso/core/java/androidx/test/espresso/action/ReplaceTextAction.java
index 84c7c623f..aaae94589 100644
--- a/espresso/core/java/androidx/test/espresso/action/ReplaceTextAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/ReplaceTextAction.java
@@ -18,7 +18,7 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.allOf;
 
 import android.view.View;
diff --git a/espresso/core/java/androidx/test/espresso/action/RunnableIdlingResource.kt b/espresso/core/java/androidx/test/espresso/action/RunnableIdlingResource.kt
new file mode 100644
index 000000000..fec3439c4
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/action/RunnableIdlingResource.kt
@@ -0,0 +1,28 @@
+package androidx.test.espresso.action
+
+import androidx.test.espresso.IdlingResource
+import java.util.concurrent.atomic.AtomicBoolean
+
+/** An idling resource that waits for a callback to mark it as idle. */
+internal class RunnableIdlingResource : IdlingResource, Runnable {
+
+  private var idle: AtomicBoolean = AtomicBoolean(false)
+  private var resourceCallback: IdlingResource.ResourceCallback? = null
+
+  override fun getName(): String {
+    return "RunnableIdlingResource"
+  }
+
+  override fun isIdleNow(): Boolean {
+    return idle.get()
+  }
+
+  override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
+    this.resourceCallback = callback
+  }
+
+  override fun run() {
+    idle.set(true)
+    resourceCallback?.onTransitionToIdle()
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/action/ScrollToAction.java b/espresso/core/java/androidx/test/espresso/action/ScrollToAction.java
index 44a5172dc..8126e0a84 100644
--- a/espresso/core/java/androidx/test/espresso/action/ScrollToAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/ScrollToAction.java
@@ -34,13 +34,24 @@
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.matcher.ViewMatchers.Visibility;
 import androidx.test.espresso.util.HumanReadables;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 
 /** Enables scrolling to the given view. View must be a descendant of a ScrollView or ListView. */
 public final class ScrollToAction implements ViewAction {
   private static final String TAG = ScrollToAction.class.getSimpleName();
 
-  @SuppressWarnings("unchecked")
+  private final int isDisplayingAtLeastThreshold;
+
+  public ScrollToAction() {
+    this(90);
+  }
+
+  public ScrollToAction(int isDisplayingAtLeastThreshold) {
+    this.isDisplayingAtLeastThreshold = isDisplayingAtLeastThreshold;
+  }
+
   @Override
   public Matcher<View> getConstraints() {
     return allOf(
@@ -49,12 +60,33 @@ public Matcher<View> getConstraints() {
             anyOf(
                 isAssignableFrom(ScrollView.class),
                 isAssignableFrom(HorizontalScrollView.class),
-                isAssignableFrom(ListView.class))));
+                isAssignableFrom(ListView.class),
+                isAssignableFromClassName("androidx.core.widget.NestedScrollView"),
+                isAssignableFromClassName("android.support.v7.widget.RecyclerView"),
+                isAssignableFromClassName("androidx.recyclerview.widget.RecyclerView"))));
+  }
+
+  private static Matcher<View> isAssignableFromClassName(String className) {
+    try {
+      Class<? extends View> clazz = (Class<? extends View>) Class.forName(className);
+      return isAssignableFrom(clazz);
+    } catch (ClassNotFoundException e) {
+      // ignore the exception and return an empty matcher: androidx is not on classpath.
+      return new BaseMatcher<View>() {
+        @Override
+        public void describeTo(Description description) {
+        }
+        @Override
+        public boolean matches(Object o) {
+          return false;
+        }
+      };
+    }
   }
 
   @Override
   public void perform(UiController uiController, View view) {
-    if (isDisplayingAtLeast(90).matches(view)) {
+    if (isDisplayingAtLeast(isDisplayingAtLeastThreshold).matches(view)) {
       Log.i(TAG, "View is already displayed. Returning.");
       return;
     }
@@ -64,7 +96,7 @@ public void perform(UiController uiController, View view) {
       Log.w(TAG, "Scrolling to view was requested, but none of the parents scrolled.");
     }
     uiController.loopMainThreadUntilIdle();
-    if (!isDisplayingAtLeast(90).matches(view)) {
+    if (!isDisplayingAtLeast(isDisplayingAtLeastThreshold).matches(view)) {
       throw new PerformException.Builder()
           .withActionDescription(this.getDescription())
           .withViewDescription(HumanReadables.describe(view))
diff --git a/espresso/core/java/androidx/test/espresso/action/Swipe.java b/espresso/core/java/androidx/test/espresso/action/Swipe.java
index 91cfd7b0e..229f0528f 100644
--- a/espresso/core/java/androidx/test/espresso/action/Swipe.java
+++ b/espresso/core/java/androidx/test/espresso/action/Swipe.java
@@ -16,11 +16,11 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkElementIndex;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.MotionEvent;
 import androidx.test.espresso.UiController;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -100,17 +100,10 @@ private static Swiper.Status sendLinearSwipe(
       long eventTime = downEvent.getDownTime();
       for (float[] step : steps) {
         eventTime += intervalMS;
-        events.add(MotionEvents.obtainMovement(downEvent.getDownTime(), eventTime, step));
+        events.add(MotionEvents.obtainMovement(downEvent, eventTime, step));
       }
       eventTime += intervalMS;
-      events.add(
-          MotionEvent.obtain(
-              downEvent.getDownTime(),
-              eventTime,
-              MotionEvent.ACTION_UP,
-              endCoordinates[0],
-              endCoordinates[1],
-              0));
+      events.add(MotionEvents.obtainUpEvent(downEvent, eventTime, endCoordinates));
       uiController.injectMotionEventSequence(events);
     } catch (Exception e) {
       return Swiper.Status.FAILURE;
@@ -121,4 +114,28 @@ private static Swiper.Status sendLinearSwipe(
     }
     return Swiper.Status.SUCCESS;
   }
+
+  // copy of Guava's method to avoid the extra dependency
+  private static int checkElementIndex(int index, int size) {
+    return checkElementIndex(index, size, "index");
+  }
+
+  @CanIgnoreReturnValue
+  private static int checkElementIndex(int index, int size, String desc) {
+    // Carefully optimized for execution by hotspot (explanatory comment above)
+    if (index < 0 || index >= size) {
+      throw new IndexOutOfBoundsException(badElementIndex(index, size, desc));
+    }
+    return index;
+  }
+
+  private static String badElementIndex(int index, int size, String desc) {
+    if (index < 0) {
+      return String.format("%s (%s) must not be negative", desc, index);
+    } else if (size < 0) {
+      throw new IllegalArgumentException("negative size: " + size);
+    } else { // index >= size
+      return String.format("%s (%s) must be less than size (%s)", desc, index, size);
+    }
+  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/action/Tap.java b/espresso/core/java/androidx/test/espresso/action/Tap.java
index 85844481f..de11dbaeb 100644
--- a/espresso/core/java/androidx/test/espresso/action/Tap.java
+++ b/espresso/core/java/androidx/test/espresso/action/Tap.java
@@ -16,9 +16,8 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
-import android.os.Build;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.ViewConfiguration;
@@ -139,7 +138,6 @@ public Tapper.Status sendTap(
 
   static {
     int timeVal = 0;
-    if (Build.VERSION.SDK_INT > 18) {
       try {
         Method getDoubleTapMinTimeMethod =
             ViewConfiguration.class.getDeclaredMethod("getDoubleTapMinTime");
@@ -151,7 +149,7 @@ public Tapper.Status sendTap(
       } catch (IllegalAccessException iae) {
         Log.w(TAG, "Unable to query double tap min time!", iae);
       }
-    }
+
     DOUBLE_TAP_MIN_TIMEOUT = timeVal;
   }
 
diff --git a/espresso/core/java/androidx/test/espresso/action/TypeTextAction.java b/espresso/core/java/androidx/test/espresso/action/TypeTextAction.java
index 896af6fee..b57ba408a 100644
--- a/espresso/core/java/androidx/test/espresso/action/TypeTextAction.java
+++ b/espresso/core/java/androidx/test/espresso/action/TypeTextAction.java
@@ -20,16 +20,16 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.supportsInputMethods;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 
-import android.os.Build;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.SearchView;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.InjectEventSecurityException;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
@@ -38,7 +38,6 @@
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
 import androidx.test.espresso.util.HumanReadables;
 import java.util.Locale;
-import javax.annotation.Nullable;
 import org.hamcrest.Matcher;
 
 /** Enables typing text on views. */
@@ -102,14 +101,9 @@ public Matcher<View> getConstraints() {
     if (!tapToFocus) {
       matchers = allOf(matchers, hasFocus());
     }
-
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-      return allOf(matchers, supportsInputMethods());
-    } else {
-      // SearchView does not support input methods itself (rather it delegates to an internal text
-      // view for input).
-      return allOf(matchers, anyOf(supportsInputMethods(), isAssignableFrom(SearchView.class)));
-    }
+    // SearchView does not support input methods itself (rather it delegates to an internal text
+    // view for input).
+    return allOf(matchers, anyOf(supportsInputMethods(), isAssignableFrom(SearchView.class)));
   }
 
   @Override
diff --git a/espresso/core/java/androidx/test/espresso/action/ViewActions.java b/espresso/core/java/androidx/test/espresso/action/ViewActions.java
index efec53e88..352dc29c5 100644
--- a/espresso/core/java/androidx/test/espresso/action/ViewActions.java
+++ b/espresso/core/java/androidx/test/espresso/action/ViewActions.java
@@ -16,29 +16,31 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.any;
 import static org.hamcrest.Matchers.is;
 
+import android.graphics.Bitmap;
 import android.net.Uri;
-import android.os.Build;
 import android.util.Log;
 import android.util.Pair;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.ViewAssertion;
+import com.google.errorprone.annotations.CheckReturnValue;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
-import javax.annotation.Nonnull;
 import org.hamcrest.Matcher;
 
 /** A collection of common {@link ViewActions}. */
+@CheckReturnValue
 public final class ViewActions {
 
   private ViewActions() {}
@@ -141,7 +143,7 @@ public void perform(UiController uic, View view) {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction clearText() {
     return actionWithAssertions(new ReplaceTextAction(""));
@@ -157,16 +159,13 @@ public static ViewAction clearText() {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    *
    * @param inputDevice source input device of the click. Example: {@link InputDevice#SOURCE_MOUSE}
    * @param buttonState buttonState associated with the click. Example: {@link
    *     MotionEvent#BUTTON_PRIMARY}
    */
   public static ViewAction click(int inputDevice, int buttonState) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      throw new UnsupportedOperationException();
-    }
     return actionWithAssertions(
         new GeneralClickAction(
             Tap.SINGLE, GeneralLocation.VISIBLE_CENTER, Press.FINGER, inputDevice, buttonState));
@@ -203,7 +202,7 @@ public static ViewAction click() {
    * <ul>
    *   <li>must be displayed on screen
    *   <li>any constraints of the rollbackAction
-   *       <ul>
+   * </ul>
    */
   public static ViewAction click(ViewAction rollbackAction) {
     checkNotNull(rollbackAction);
@@ -218,14 +217,16 @@ public static ViewAction click(ViewAction rollbackAction) {
   }
 
   /**
-   * Returns an action that performs a swipe right-to-left across the vertical center of the view.
-   * The swipe doesn't start at the very edge of the view, but is a bit offset.<br>
+   * Returns an action that performs a fast swipe right-to-left across the vertical center of the
+   * view. {@link #slowSwipeLeft()} should be used instead if a slow deliberate swipe is needed
+   * (e.g. to avoid fling). The swipe doesn't start at the very edge of the view, but is a bit
+   * offset.<br>
    * <br>
    * View constraints:
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction swipeLeft() {
     return actionWithAssertions(
@@ -236,6 +237,25 @@ public static ViewAction swipeLeft() {
             Press.FINGER));
   }
 
+  /**
+   * Similar to {@link #swipeLeft()} but performs a slow and deliberate swipe instead. This is
+   * useful, for example, to avoid fling. <br>
+   * <br>
+   * View constraints:
+   *
+   * <ul>
+   *   <li>must be displayed on screen
+   * </ul>
+   */
+  public static ViewAction slowSwipeLeft() {
+    return actionWithAssertions(
+        new GeneralSwipeAction(
+            Swipe.SLOW,
+            GeneralLocation.translate(GeneralLocation.CENTER_RIGHT, -EDGE_FUZZ_FACTOR, 0),
+            GeneralLocation.CENTER_LEFT,
+            Press.FINGER));
+  }
+
   /**
    * Returns an action that performs a swipe left-to-right across the vertical center of the view.
    * The swipe doesn't start at the very edge of the view, but is a bit offset.<br>
@@ -244,7 +264,7 @@ public static ViewAction swipeLeft() {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction swipeRight() {
     return actionWithAssertions(
@@ -263,7 +283,7 @@ public static ViewAction swipeRight() {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction swipeDown() {
     return actionWithAssertions(
@@ -282,7 +302,7 @@ public static ViewAction swipeDown() {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction swipeUp() {
     return actionWithAssertions(
@@ -350,7 +370,7 @@ public static ViewAction pressKey(EspressoKey key) {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction doubleClick() {
     return actionWithAssertions(
@@ -369,7 +389,7 @@ public static ViewAction doubleClick() {
    *
    * <ul>
    *   <li>must be displayed on screen
-   *       <ul>
+   * </ul>
    */
   public static ViewAction longClick() {
     return actionWithAssertions(
@@ -389,12 +409,47 @@ public static ViewAction longClick() {
    * <ul>
    *   <li>must be a descendant of ScrollView
    *   <li>must have visibility set to View.VISIBLE
-   *       <ul>
+   * </ul>
    */
   public static ViewAction scrollTo() {
     return actionWithAssertions(new ScrollToAction());
   }
 
+  /**
+   * Returns an action that scrolls to the view.<br>
+   * <br>
+   * In order for the scroll to be considered to have succeeded, the target view must match {@link
+   * androidx.test.espresso.matcher.ViewMatchers#isDisplayingAtLeast(int)} for the specified value.
+   * <br>
+   * <br>
+   * View preconditions:
+   *
+   * <ul>
+   *   <li>must be a descendant of ScrollView
+   *   <li>must have visibility set to View.VISIBLE
+   * </ul>
+   */
+  public static ViewAction scrollTo(int isDisplayingAtLeastThreshold) {
+    return actionWithAssertions(new ScrollToAction(isDisplayingAtLeastThreshold));
+  }
+
+  /**
+   * Returns an action that scrolls to the view.<br>
+   * <br>
+   * In order for the scroll to be considered to have succeeded, the target view must match {@link
+   * androidx.test.espresso.matcher.ViewMatchers#isDisplayingAtLeast()} for the specified value.
+   * <br>
+   * View preconditions:
+   *
+   * <ul>
+   *   <li>must be a descendant of ScrollView
+   *   <li>must have visibility set to View.VISIBLE
+   * </ul>
+   */
+  public static ViewAction scrollCompletelyTo() {
+    return scrollTo(100);
+  }
+
   /**
    * Returns an action that types the provided string into the view. Appending a \n to the end of
    * the string translates to a ENTER key event. Note: this method does not change cursor position
@@ -407,7 +462,7 @@ public static ViewAction scrollTo() {
    *   <li>must be displayed on screen
    *   <li>must support input methods
    *   <li>must be already focused
-   *       <ul>
+   * </ul>
    */
   public static ViewAction typeTextIntoFocusedView(String stringToBeTyped) {
     return actionWithAssertions(new TypeTextAction(stringToBeTyped, false /* tapToFocus */));
@@ -425,7 +480,7 @@ public static ViewAction typeTextIntoFocusedView(String stringToBeTyped) {
    * <ul>
    *   <li>must be displayed on screen
    *   <li>must support input methods
-   *       <ul>
+   * </ul>
    */
   public static ViewAction typeText(String stringToBeTyped) {
     return actionWithAssertions(new TypeTextAction(stringToBeTyped));
@@ -439,9 +494,9 @@ public static ViewAction typeText(String stringToBeTyped) {
    * <ul>
    *   <li>must be displayed on screen
    *   <li>must be assignable from EditText
-   *       <ul>
+   * </ul>
    */
-  public static ViewAction replaceText(@Nonnull String stringToBeSet) {
+  public static ViewAction replaceText(@NonNull String stringToBeSet) {
     return actionWithAssertions(new ReplaceTextAction(stringToBeSet));
   }
 
@@ -488,7 +543,7 @@ public static ViewAction openLinkWithUri(Matcher<Uri> uriMatcher) {
    *   <li>must be displayed on screen
    *   <li>must be assignable from TextView
    *   <li>must have links
-   *       <ul>
+   * </ul>
    */
   public static ViewAction openLink(Matcher<String> linkTextMatcher, Matcher<Uri> uriMatcher) {
     checkNotNull(linkTextMatcher);
@@ -514,4 +569,21 @@ public static ViewAction repeatedlyUntil(
     return actionWithAssertions(
         new RepeatActionUntilViewState(action, desiredStateMatcher, maxAttempts));
   }
+
+  public interface BitmapReceiver {
+    void onBitmapCaptured(Bitmap bitmap);
+  }
+
+  /**
+   * Returns an action that captures an image of the desired View and performs some other operation
+   * on the result.
+   *
+   * @see androidx.test.core.view.ViewCapture.captureToBitmap
+   * @param bitmapReceiver the BitmapReceiver that receives the result. This will be called on main
+   *     thread.
+   * @return the ViewAction
+   */
+  public static ViewAction captureToBitmap(BitmapReceiver bitmapReceiver) {
+    return new CaptureToBitmapAction(bitmapReceiver);
+  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/api/1.1.0_internal.txt b/espresso/core/java/androidx/test/espresso/api/1.1.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/1.1.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/core/java/androidx/test/espresso/api/1.1.0_public.txt b/espresso/core/java/androidx/test/espresso/api/1.1.0_public.txt
new file mode 100644
index 000000000..0c389ac5a
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/1.1.0_public.txt
@@ -0,0 +1,8 @@
+// Signature format: 3.0
+package androidx.test.annotation {
+
+  @RequiresOptIn @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface ExperimentalTestApi {
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/3.4.0_public.txt b/espresso/core/java/androidx/test/espresso/api/3.4.0_public.txt
new file mode 100644
index 000000000..3070de060
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.4.0_public.txt
@@ -0,0 +1,904 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class AmbiguousViewMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+  }
+
+  public static class AmbiguousViewMatcherException.Builder {
+    ctor public AmbiguousViewMatcherException.Builder();
+    method public androidx.test.espresso.AmbiguousViewMatcherException! build();
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! from(androidx.test.espresso.AmbiguousViewMatcherException!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! includeViewHierarchy(boolean);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView1(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView2(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View>!);
+  }
+
+  public final class AppNotIdleException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method @Deprecated public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, int, int);
+    method public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public class DataInteraction {
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! atPosition(Integer!);
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inAdapterView(org.hamcrest.Matcher<android.view.View!>!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! onChildView(org.hamcrest.Matcher<android.view.View!>!);
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!);
+  }
+
+  public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<?>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
+    method public boolean matchesSafely(android.view.View!);
+  }
+
+  public final class Espresso {
+    method public static void closeSoftKeyboard();
+    method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<?>!);
+    method public static <T> T! onIdle(java.util.concurrent.Callable<T!>!);
+    method public static void onIdle();
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
+    method public static void openActionBarOverflowOrOptionsMenu(android.content.Context!);
+    method public static void openContextualActionModeOverflowMenu();
+    method public static void pressBack();
+    method public static void pressBackUnconditionally();
+    method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!, boolean);
+    method public static void setFailureHandler(androidx.test.espresso.FailureHandler!);
+    method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...);
+  }
+
+  public interface EspressoException extends androidx.test.platform.TestFrameworkException {
+  }
+
+  public interface FailureHandler {
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class IdlingPolicies {
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceErrorPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceWarningPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getMasterIdlingPolicy();
+    method public static void setIdlingResourceTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeoutWhenDebuggerAttached(boolean);
+  }
+
+  public final class IdlingPolicy {
+    method public boolean getDisableOnTimeout();
+    method public long getIdleTimeout();
+    method public java.util.concurrent.TimeUnit! getIdleTimeoutUnit();
+    method public boolean getTimeoutIfDebuggerAttached();
+    method public void handleTimeout(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public final class IdlingResourceTimeoutException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public IdlingResourceTimeoutException(java.util.List<java.lang.String!>!);
+  }
+
+  public final class InjectEventSecurityException extends androidx.test.platform.ui.InjectEventSecurityException implements androidx.test.espresso.EspressoException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(Throwable!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+  }
+
+  public final class NoActivityResumedException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoActivityResumedException(String!);
+    ctor public NoActivityResumedException(String!, Throwable!);
+  }
+
+  public final class NoMatchingRootException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public static androidx.test.espresso.NoMatchingRootException! create(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, java.util.List<androidx.test.espresso.Root!>!);
+  }
+
+  public final class NoMatchingViewException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public String! getViewMatcherDescription();
+  }
+
+  public static class NoMatchingViewException.Builder {
+    ctor public NoMatchingViewException.Builder();
+    method public androidx.test.espresso.NoMatchingViewException! build();
+    method public androidx.test.espresso.NoMatchingViewException.Builder! from(androidx.test.espresso.NoMatchingViewException!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! includeViewHierarchy(boolean);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(androidx.test.espresso.util.EspressoOptional<java.lang.String!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViews(java.util.List<android.view.View!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View>!);
+  }
+
+  public final class PerformException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public String! getActionDescription();
+    method public String! getViewDescription();
+  }
+
+  public static class PerformException.Builder {
+    ctor public PerformException.Builder();
+    method public androidx.test.espresso.PerformException! build();
+    method public androidx.test.espresso.PerformException.Builder! from(androidx.test.espresso.PerformException!);
+    method public androidx.test.espresso.PerformException.Builder! withActionDescription(String!);
+    method public androidx.test.espresso.PerformException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.PerformException.Builder! withViewDescription(String!);
+  }
+
+  public final class Root {
+    method public android.view.View! getDecorView();
+    method public androidx.test.espresso.util.EspressoOptional<android.view.WindowManager.LayoutParams!>! getWindowLayoutParams();
+    method public boolean isReady();
+  }
+
+  public static class Root.Builder {
+    ctor public Root.Builder();
+    method public androidx.test.espresso.Root! build();
+    method public androidx.test.espresso.Root.Builder! withDecorView(android.view.View!);
+    method public androidx.test.espresso.Root.Builder! withWindowLayoutParams(android.view.WindowManager.LayoutParams!);
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public default boolean injectMotionEventSequence(Iterable<android.view.MotionEvent!>!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+  public interface ViewAction {
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface ViewAssertion {
+    method public void check(android.view.View!, androidx.test.espresso.NoMatchingViewException!);
+  }
+
+  public interface ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+  public final class ViewInteraction {
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method public androidx.test.espresso.ViewInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method public androidx.test.espresso.ViewInteraction! noActivity();
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...);
+    method public androidx.test.espresso.ViewInteraction! withFailureHandler(androidx.test.espresso.FailureHandler!);
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope public interface ViewInteractionComponent {
+    method public androidx.test.espresso.ViewInteraction! viewInteraction();
+  }
+
+}
+
+package androidx.test.espresso.action {
+
+  public final class AdapterDataLoaderAction implements androidx.test.espresso.ViewAction {
+    ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<?>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! getAdaptedData();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface AdapterViewProtocol {
+    method public Iterable<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataInAdapterView(android.widget.AdapterView<? extends android.widget.Adapter>!);
+    method public androidx.test.espresso.util.EspressoOptional<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataRenderedByView(android.widget.AdapterView<? extends android.widget.Adapter>!, android.view.View!);
+    method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+    method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+  }
+
+  public static class AdapterViewProtocol.AdaptedData {
+    method public Object! getData();
+    field @Deprecated public final Object? data;
+    field public final Object! opaqueToken;
+  }
+
+  public static class AdapterViewProtocol.AdaptedData.Builder {
+    ctor public AdapterViewProtocol.AdaptedData.Builder();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! build();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withData(Object?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withDataFunction(androidx.test.espresso.action.AdapterViewProtocol.DataFunction?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withOpaqueToken(Object?);
+  }
+
+  public static interface AdapterViewProtocol.DataFunction {
+    method public Object! getData();
+  }
+
+  public final class AdapterViewProtocols {
+    method public static androidx.test.espresso.action.AdapterViewProtocol! standardProtocol();
+  }
+
+  public final class CloseKeyboardAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public CloseKeyboardAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface CoordinatesProvider {
+    method public float[]! calculateCoordinates(android.view.View!);
+  }
+
+  public final class EditorAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public EditorAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class EspressoKey {
+    method public int getKeyCode();
+    method public int getMetaState();
+  }
+
+  public static class EspressoKey.Builder {
+    ctor public EspressoKey.Builder();
+    method public androidx.test.espresso.action.EspressoKey! build();
+    method public androidx.test.espresso.action.EspressoKey.Builder! withAltPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withCtrlPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withKeyCode(int);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withShiftPressed(boolean);
+  }
+
+  public final class GeneralClickAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int);
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, androidx.test.espresso.ViewAction!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int, androidx.test.espresso.ViewAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum GeneralLocation implements androidx.test.espresso.action.CoordinatesProvider {
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation VISIBLE_CENTER;
+  }
+
+  public final class GeneralSwipeAction implements androidx.test.espresso.ViewAction {
+    ctor public GeneralSwipeAction(androidx.test.espresso.action.Swiper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class KeyEventAction implements androidx.test.espresso.ViewAction {
+    ctor public KeyEventAction(androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class MotionEvents {
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!, int, int);
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!);
+    method public static android.view.MotionEvent! obtainMovement(long, float[]!);
+    method public static android.view.MotionEvent! obtainMovement(long, long, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, float[]!);
+    method public static void sendCancel(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method public static boolean sendMovement(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+  }
+
+  public static class MotionEvents.DownResultHolder {
+    field public final android.view.MotionEvent! down;
+    field public final boolean longPress;
+  }
+
+  public final class OpenLinkAction implements androidx.test.espresso.ViewAction {
+    ctor public OpenLinkAction(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface PrecisionDescriber {
+    method public float[]! describePrecision();
+  }
+
+  public enum Press implements androidx.test.espresso.action.PrecisionDescriber {
+    enum_constant public static final androidx.test.espresso.action.Press FINGER;
+    enum_constant public static final androidx.test.espresso.action.Press PINPOINT;
+    enum_constant public static final androidx.test.espresso.action.Press THUMB;
+  }
+
+  public final class PressBackAction implements androidx.test.espresso.ViewAction {
+    ctor public PressBackAction(boolean);
+    ctor public PressBackAction(boolean, androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class RepeatActionUntilViewState implements androidx.test.espresso.ViewAction {
+    ctor protected RepeatActionUntilViewState(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ReplaceTextAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public ReplaceTextAction(String!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ScrollToAction implements androidx.test.espresso.ViewAction {
+    ctor public ScrollToAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum Swipe implements androidx.test.espresso.action.Swiper {
+    enum_constant public static final androidx.test.espresso.action.Swipe FAST;
+    enum_constant public static final androidx.test.espresso.action.Swipe SLOW;
+  }
+
+  public interface Swiper {
+    method public androidx.test.espresso.action.Swiper.Status! sendSwipe(androidx.test.espresso.UiController!, float[]!, float[]!, float[]!);
+  }
+
+  public enum Swiper.Status {
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status SUCCESS;
+  }
+
+  public enum Tap implements androidx.test.espresso.action.Tapper {
+    enum_constant public static final androidx.test.espresso.action.Tap DOUBLE;
+    enum_constant public static final androidx.test.espresso.action.Tap LONG;
+    enum_constant public static final androidx.test.espresso.action.Tap SINGLE;
+  }
+
+  public interface Tapper {
+    method public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method @Deprecated public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!);
+  }
+
+  public enum Tapper.Status {
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status SUCCESS;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status WARNING;
+  }
+
+  public final class TypeTextAction implements androidx.test.espresso.ViewAction {
+    ctor public TypeTextAction(String!);
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TypeTextAction(String!, boolean);
+    ctor public TypeTextAction(String!, boolean, androidx.test.espresso.action.GeneralClickAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ViewActions {
+    method public static androidx.test.espresso.ViewAction! actionWithAssertions(androidx.test.espresso.ViewAction!);
+    method public static void addGlobalAssertion(String!, androidx.test.espresso.ViewAssertion!);
+    method public static void clearGlobalAssertions();
+    method public static androidx.test.espresso.ViewAction! clearText();
+    method public static androidx.test.espresso.ViewAction! click(int, int);
+    method public static androidx.test.espresso.ViewAction! click();
+    method public static androidx.test.espresso.ViewAction! click(androidx.test.espresso.ViewAction!);
+    method public static androidx.test.espresso.ViewAction! closeSoftKeyboard();
+    method public static androidx.test.espresso.ViewAction! doubleClick();
+    method public static androidx.test.espresso.ViewAction! longClick();
+    method public static androidx.test.espresso.ViewAction! openLink(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! pressBack();
+    method public static androidx.test.espresso.ViewAction! pressBackUnconditionally();
+    method public static androidx.test.espresso.ViewAction! pressImeActionButton();
+    method public static androidx.test.espresso.ViewAction! pressKey(int);
+    method public static androidx.test.espresso.ViewAction! pressKey(androidx.test.espresso.action.EspressoKey!);
+    method public static androidx.test.espresso.ViewAction! pressMenuKey();
+    method public static void removeGlobalAssertion(androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! repeatedlyUntil(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public static androidx.test.espresso.ViewAction! replaceText(String);
+    method public static androidx.test.espresso.ViewAction! scrollTo();
+    method public static androidx.test.espresso.ViewAction! swipeDown();
+    method public static androidx.test.espresso.ViewAction! swipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeRight();
+    method public static androidx.test.espresso.ViewAction! swipeUp();
+    method public static androidx.test.espresso.ViewAction! typeText(String!);
+    method public static androidx.test.espresso.ViewAction! typeTextIntoFocusedView(String!);
+  }
+
+}
+
+package androidx.test.espresso.assertion {
+
+  public final class LayoutAssertions {
+    method public static androidx.test.espresso.ViewAssertion! noEllipsizedText();
+    method public static androidx.test.espresso.ViewAssertion! noMultilineButtons();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps();
+  }
+
+  public final class PositionAssertions {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isBottomAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isLeftAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isRightAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isTopAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class ViewAssertions {
+    method public static androidx.test.espresso.ViewAssertion! doesNotExist();
+    method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher<? super android.view.View>!);
+    method public static androidx.test.espresso.ViewAssertion! selectedDescendantsMatch(org.hamcrest.Matcher<android.view.View!>!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+}
+
+package androidx.test.espresso.base {
+
+  public interface ActiveRootLister {
+    method public java.util.List<androidx.test.espresso.Root!>! listActiveRoots();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface Default {
+  }
+
+  public final class DefaultFailureHandler implements androidx.test.espresso.FailureHandler {
+    ctor public DefaultFailureHandler(@androidx.test.espresso.internal.inject.TargetContext android.content.Context!);
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class IdlingResourceRegistry {
+    ctor public IdlingResourceRegistry(android.os.Looper!);
+    method public java.util.List<androidx.test.espresso.IdlingResource!>! getResources();
+    method public void registerLooper(android.os.Looper!, boolean);
+    method public boolean registerResources(java.util.List<? extends androidx.test.espresso.IdlingResource>!);
+    method public void sync(Iterable<androidx.test.espresso.IdlingResource!>!, Iterable<android.os.Looper!>!);
+    method public boolean unregisterResources(java.util.List<? extends androidx.test.espresso.IdlingResource>!);
+  }
+
+  public interface IdlingUiController extends androidx.test.espresso.UiController {
+    method public androidx.test.espresso.base.IdlingResourceRegistry! getIdlingResourceRegistry();
+  }
+
+  public interface InterruptableUiController extends androidx.test.espresso.UiController {
+    method public void interruptEspressoTasks();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) public @interface MainThread {
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker {
+    method public android.view.View! get();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface RootViewPickerScope {
+  }
+
+  public final class ViewFinderImpl implements androidx.test.espresso.ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+}
+
+package androidx.test.espresso.matcher {
+
+  public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S> {
+    ctor public BoundedDiagnosingMatcher(Class<? extends S>!);
+    ctor public BoundedDiagnosingMatcher(Class<? extends S>!, Class<?>!, Class<?>!...);
+    method public final void describeMismatch(Object!, org.hamcrest.Description!);
+    method protected abstract void describeMoreTo(org.hamcrest.Description!);
+    method public final void describeTo(org.hamcrest.Description!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(T!, org.hamcrest.Description!);
+  }
+
+  public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T> {
+    ctor public BoundedMatcher(Class<? extends S>!);
+    ctor public BoundedMatcher(Class<?>!, Class<?>!, Class<?>!...);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(S!);
+  }
+
+  public final class CursorMatchers {
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object,android.database.Cursor> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public boolean matchesSafely(android.database.Cursor!);
+    method public androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withStrictColumnChecks(boolean);
+  }
+
+  public final class LayoutMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! hasEllipsizedText();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMultilineText();
+  }
+
+  public final class PreferenceMatchers {
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummary(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitle(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public final class RootMatchers {
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! hasWindowLayoutParams();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isDialog();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isFocusable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isPlatformPopup();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isSystemAlertWindow();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isTouchable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! withDecorView(org.hamcrest.Matcher<android.view.View!>!);
+    field public static final org.hamcrest.Matcher<androidx.test.espresso.Root!>! DEFAULT;
+  }
+
+  public final class ViewMatchers {
+    method public static <T> void assertThat(T!, org.hamcrest.Matcher<T!>!);
+    method public static <T> void assertThat(String!, T!, org.hamcrest.Matcher<T!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! doesNotHaveFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasContentDescription();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasDescendant(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasLinks();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMinimumChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasSibling(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isAssignableFrom(Class<? extends android.view.View>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isCompletelyDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDescendantOfA(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayingAtLeast(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isJavascriptEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! isRoot();
+    method public static org.hamcrest.Matcher<android.view.View!>! isSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! supportsInputMethods();
+    method public static org.hamcrest.Matcher<android.view.View!>! withAlpha(float);
+    method public static org.hamcrest.Matcher<android.view.View!>! withChild(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(org.hamcrest.Matcher<? extends java.lang.CharSequence>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withEffectiveVisibility(androidx.test.espresso.matcher.ViewMatchers.Visibility!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withInputType(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParent(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParentIndex(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSubstring(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagValue(org.hamcrest.Matcher<java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(int);
+  }
+
+  public enum ViewMatchers.Visibility {
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(android.view.View!);
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(int);
+    method public int getValue();
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility GONE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility INVISIBLE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility VISIBLE;
+  }
+
+}
+
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<?>, Class<? extends java.lang.annotation.Annotation>?, Class<?>!...);
+    method public Object! invokeConstructor(java.lang.Object!...);
+  }
+
+  public interface Converter<I, O> {
+    method public O! convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T! fromProto(M!);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M! toProto();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<?>, String, int);
+    field public final String! fieldName;
+    field public final Class<?>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<MessageLite> {
+    ctor public GenericRemoteMessage(Object);
+    method public MessageLite toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,MessageLite>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<MessageLite> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public MessageLite toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<MessageLite> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public MessageLite toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T! checkedGetEnumForProto(int, Class<T!>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<?>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<?>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<?>! getProtoBuilderClass();
+    method public Parser<?> getProtoParser();
+    method public Class<?>! getProtoType();
+    method public Class<?>![]! getRemoteConstrTypes();
+    method public Class<?>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(Parser<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<?>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<?>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T! anyToType(Any);
+    method public static android.os.Parcelable! byteStringToParcelable(ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T! byteStringToType(ByteString);
+    method public static ByteString parcelableToByteString(android.os.Parcelable);
+    method public static <T> Any typeToAny(T);
+    method public static ByteString typeToByteString(Object);
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class ActivityLifecycles {
+    method public static boolean hasForegroundActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasTransitioningActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasVisibleActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public final class EspressoOptional<T> {
+    method public static <T> androidx.test.espresso.util.EspressoOptional<T!>! absent();
+    method public java.util.Set<T!>! asSet();
+    method public static <T> androidx.test.espresso.util.EspressoOptional<T!>! fromNullable(T!);
+    method public T! get();
+    method public boolean isPresent();
+    method public static <T> androidx.test.espresso.util.EspressoOptional<T!>! of(T!);
+    method public com.google.common.base.Optional<T!>! or(com.google.common.base.Optional<? extends T>!);
+    method public T! or(com.google.common.base.Supplier<? extends T>!);
+    method public T! or(T!);
+    method public T! orNull();
+    method @com.google.common.annotations.Beta public static <T> Iterable<T!>! presentInstances(Iterable<? extends com.google.common.base.Optional<? extends T>>!);
+    method public <V> com.google.common.base.Optional<V!>! transform(com.google.common.base.Function<? super T,V!>!);
+  }
+
+  public final class HumanReadables {
+    method public static String! describe(android.database.Cursor!);
+    method public static String! describe(android.view.View!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!);
+  }
+
+  public final class TreeIterables {
+    method public static Iterable<android.view.View!>! breadthFirstViewTraversal(android.view.View!);
+    method public static Iterable<android.view.View!>! depthFirstViewTraversal(android.view.View!);
+    method public static Iterable<androidx.test.espresso.util.TreeIterables.ViewAndDistance!>! depthFirstViewTraversalWithDistance(android.view.View!);
+  }
+
+  public static class TreeIterables.ViewAndDistance {
+    method public int getDistanceFromRoot();
+    method public android.view.View! getView();
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/3.5.0_internal.txt b/espresso/core/java/androidx/test/espresso/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/core/java/androidx/test/espresso/api/3.5.0_public.txt b/espresso/core/java/androidx/test/espresso/api/3.5.0_public.txt
new file mode 100644
index 000000000..680456625
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.5.0_public.txt
@@ -0,0 +1,939 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class AmbiguousViewMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+  }
+
+  public static class AmbiguousViewMatcherException.Builder {
+    ctor public AmbiguousViewMatcherException.Builder();
+    method public androidx.test.espresso.AmbiguousViewMatcherException! build();
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! from(androidx.test.espresso.AmbiguousViewMatcherException!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! includeViewHierarchy(boolean);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView1(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView2(android.view.View!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View>!);
+  }
+
+  public final class AppNotIdleException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method @Deprecated public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, int, int);
+    method public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public class DataInteraction {
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! atPosition(Integer!);
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inAdapterView(org.hamcrest.Matcher<android.view.View!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! onChildView(org.hamcrest.Matcher<android.view.View!>!);
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!);
+  }
+
+  public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<?>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
+    method public boolean matchesSafely(android.view.View!);
+  }
+
+  public final class Espresso {
+    method public static void closeSoftKeyboard();
+    method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<?>!);
+    method public static <T> T! onIdle(java.util.concurrent.Callable<T!>!);
+    method public static void onIdle();
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
+    method public static void openActionBarOverflowOrOptionsMenu(android.content.Context!);
+    method public static void openContextualActionModeOverflowMenu();
+    method public static void pressBack();
+    method public static void pressBackUnconditionally();
+    method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!, boolean);
+    method public static void setFailureHandler(androidx.test.espresso.FailureHandler!);
+    method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...);
+  }
+
+  public interface EspressoException extends androidx.test.platform.TestFrameworkException {
+  }
+
+  public interface FailureHandler {
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class IdlingPolicies {
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceErrorPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceWarningPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getMasterIdlingPolicy();
+    method public static void setIdlingResourceTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeoutWhenDebuggerAttached(boolean);
+  }
+
+  public final class IdlingPolicy {
+    method public boolean getDisableOnTimeout();
+    method public long getIdleTimeout();
+    method public java.util.concurrent.TimeUnit! getIdleTimeoutUnit();
+    method public boolean getTimeoutIfDebuggerAttached();
+    method public void handleTimeout(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public final class IdlingResourceTimeoutException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public IdlingResourceTimeoutException(java.util.List<java.lang.String!>!);
+  }
+
+  public final class InjectEventSecurityException extends androidx.test.platform.ui.InjectEventSecurityException implements androidx.test.espresso.EspressoException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(Throwable!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+  }
+
+  public final class NoActivityResumedException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoActivityResumedException(String!);
+    ctor public NoActivityResumedException(String!, Throwable!);
+  }
+
+  public final class NoMatchingRootException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public static androidx.test.espresso.NoMatchingRootException! create(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, java.util.List<androidx.test.espresso.Root!>!);
+  }
+
+  public final class NoMatchingViewException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+    method public String! getViewMatcherDescription();
+  }
+
+  public static class NoMatchingViewException.Builder {
+    ctor public NoMatchingViewException.Builder();
+    method public androidx.test.espresso.NoMatchingViewException! build();
+    method public androidx.test.espresso.NoMatchingViewException.Builder! from(androidx.test.espresso.NoMatchingViewException!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! includeViewHierarchy(boolean);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(androidx.test.espresso.util.EspressoOptional<java.lang.String!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViews(java.util.List<android.view.View!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View>!);
+  }
+
+  public final class PerformException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public String! getActionDescription();
+    method public String! getViewDescription();
+  }
+
+  public static class PerformException.Builder {
+    ctor public PerformException.Builder();
+    method public androidx.test.espresso.PerformException! build();
+    method public androidx.test.espresso.PerformException.Builder! from(androidx.test.espresso.PerformException!);
+    method public androidx.test.espresso.PerformException.Builder! withActionDescription(String!);
+    method public androidx.test.espresso.PerformException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.PerformException.Builder! withViewDescription(String!);
+  }
+
+  public final class Root {
+    method public android.view.View! getDecorView();
+    method public androidx.test.espresso.util.EspressoOptional<android.view.WindowManager.LayoutParams!>! getWindowLayoutParams();
+    method public boolean isReady();
+  }
+
+  public static class Root.Builder {
+    ctor public Root.Builder();
+    method public androidx.test.espresso.Root! build();
+    method public androidx.test.espresso.Root.Builder! withDecorView(android.view.View!);
+    method public androidx.test.espresso.Root.Builder! withWindowLayoutParams(android.view.WindowManager.LayoutParams!);
+  }
+
+  public interface RootViewException extends androidx.test.espresso.EspressoException {
+    method public android.view.View getRootView();
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public default boolean injectMotionEventSequence(Iterable<android.view.MotionEvent!>!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+  public interface ViewAction {
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface ViewAssertion {
+    method public void check(android.view.View!, androidx.test.espresso.NoMatchingViewException!);
+  }
+
+  public interface ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+  public final class ViewInteraction {
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method public androidx.test.espresso.ViewInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method public androidx.test.espresso.ViewInteraction! noActivity();
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...);
+    method public androidx.test.espresso.ViewInteraction! withFailureHandler(androidx.test.espresso.FailureHandler!);
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope @dagger.Subcomponent(modules=ViewInteractionModule.class) public interface ViewInteractionComponent {
+    method public androidx.test.espresso.ViewInteraction! viewInteraction();
+  }
+
+}
+
+package androidx.test.espresso.action {
+
+  public final class AdapterDataLoaderAction implements androidx.test.espresso.ViewAction {
+    ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<?>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! getAdaptedData();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface AdapterViewProtocol {
+    method public Iterable<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataInAdapterView(android.widget.AdapterView<? extends android.widget.Adapter>!);
+    method public androidx.test.espresso.util.EspressoOptional<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataRenderedByView(android.widget.AdapterView<? extends android.widget.Adapter>!, android.view.View!);
+    method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+    method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+  }
+
+  public static class AdapterViewProtocol.AdaptedData {
+    method public Object! getData();
+    field @Deprecated public final Object? data;
+    field public final Object! opaqueToken;
+  }
+
+  public static class AdapterViewProtocol.AdaptedData.Builder {
+    ctor public AdapterViewProtocol.AdaptedData.Builder();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! build();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withData(Object?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withDataFunction(androidx.test.espresso.action.AdapterViewProtocol.DataFunction?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withOpaqueToken(Object?);
+  }
+
+  public static interface AdapterViewProtocol.DataFunction {
+    method public Object! getData();
+  }
+
+  public final class AdapterViewProtocols {
+    method public static androidx.test.espresso.action.AdapterViewProtocol! standardProtocol();
+  }
+
+  public final class CloseKeyboardAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public CloseKeyboardAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface CoordinatesProvider {
+    method public float[]! calculateCoordinates(android.view.View!);
+  }
+
+  public final class EditorAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public EditorAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class EspressoKey {
+    method public int getKeyCode();
+    method public int getMetaState();
+  }
+
+  public static class EspressoKey.Builder {
+    ctor public EspressoKey.Builder();
+    method public androidx.test.espresso.action.EspressoKey! build();
+    method public androidx.test.espresso.action.EspressoKey.Builder! withAltPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withCtrlPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withKeyCode(int);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withShiftPressed(boolean);
+  }
+
+  public final class GeneralClickAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int);
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, androidx.test.espresso.ViewAction!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int, androidx.test.espresso.ViewAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum GeneralLocation implements androidx.test.espresso.action.CoordinatesProvider {
+    method public static androidx.test.espresso.action.CoordinatesProvider translate(androidx.test.espresso.action.CoordinatesProvider, float, float);
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation VISIBLE_CENTER;
+  }
+
+  public final class GeneralSwipeAction implements androidx.test.espresso.ViewAction {
+    ctor public GeneralSwipeAction(androidx.test.espresso.action.Swiper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class KeyEventAction implements androidx.test.espresso.ViewAction {
+    ctor public KeyEventAction(androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class MotionEvents {
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!, int, int);
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, float[]);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, long, float[]);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, float[]!);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, long, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, long, float[]!);
+    method public static void sendCancel(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method public static boolean sendMovement(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+  }
+
+  public static class MotionEvents.DownResultHolder {
+    field public final android.view.MotionEvent! down;
+    field public final boolean longPress;
+  }
+
+  public final class OpenLinkAction implements androidx.test.espresso.ViewAction {
+    ctor public OpenLinkAction(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface PrecisionDescriber {
+    method public float[]! describePrecision();
+  }
+
+  public enum Press implements androidx.test.espresso.action.PrecisionDescriber {
+    enum_constant public static final androidx.test.espresso.action.Press FINGER;
+    enum_constant public static final androidx.test.espresso.action.Press PINPOINT;
+    enum_constant public static final androidx.test.espresso.action.Press THUMB;
+  }
+
+  public final class PressBackAction implements androidx.test.espresso.ViewAction {
+    ctor public PressBackAction(boolean);
+    ctor public PressBackAction(boolean, androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class RepeatActionUntilViewState implements androidx.test.espresso.ViewAction {
+    ctor protected RepeatActionUntilViewState(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ReplaceTextAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public ReplaceTextAction(String!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ScrollToAction implements androidx.test.espresso.ViewAction {
+    ctor public ScrollToAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum Swipe implements androidx.test.espresso.action.Swiper {
+    enum_constant public static final androidx.test.espresso.action.Swipe FAST;
+    enum_constant public static final androidx.test.espresso.action.Swipe SLOW;
+  }
+
+  public interface Swiper {
+    method public androidx.test.espresso.action.Swiper.Status! sendSwipe(androidx.test.espresso.UiController!, float[]!, float[]!, float[]!);
+  }
+
+  public enum Swiper.Status {
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status SUCCESS;
+  }
+
+  public enum Tap implements androidx.test.espresso.action.Tapper {
+    enum_constant public static final androidx.test.espresso.action.Tap DOUBLE;
+    enum_constant public static final androidx.test.espresso.action.Tap LONG;
+    enum_constant public static final androidx.test.espresso.action.Tap SINGLE;
+  }
+
+  public interface Tapper {
+    method public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method @Deprecated public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!);
+  }
+
+  public enum Tapper.Status {
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status SUCCESS;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status WARNING;
+  }
+
+  public final class TypeTextAction implements androidx.test.espresso.ViewAction {
+    ctor public TypeTextAction(String!);
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TypeTextAction(String!, boolean);
+    ctor public TypeTextAction(String!, boolean, androidx.test.espresso.action.GeneralClickAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ViewActions {
+    method public static androidx.test.espresso.ViewAction! actionWithAssertions(androidx.test.espresso.ViewAction!);
+    method public static void addGlobalAssertion(String!, androidx.test.espresso.ViewAssertion!);
+    method public static void clearGlobalAssertions();
+    method public static androidx.test.espresso.ViewAction! clearText();
+    method public static androidx.test.espresso.ViewAction! click(int, int);
+    method public static androidx.test.espresso.ViewAction! click();
+    method public static androidx.test.espresso.ViewAction! click(androidx.test.espresso.ViewAction!);
+    method public static androidx.test.espresso.ViewAction! closeSoftKeyboard();
+    method public static androidx.test.espresso.ViewAction! doubleClick();
+    method public static androidx.test.espresso.ViewAction! longClick();
+    method public static androidx.test.espresso.ViewAction! openLink(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! pressBack();
+    method public static androidx.test.espresso.ViewAction! pressBackUnconditionally();
+    method public static androidx.test.espresso.ViewAction! pressImeActionButton();
+    method public static androidx.test.espresso.ViewAction! pressKey(int);
+    method public static androidx.test.espresso.ViewAction! pressKey(androidx.test.espresso.action.EspressoKey!);
+    method public static androidx.test.espresso.ViewAction! pressMenuKey();
+    method public static void removeGlobalAssertion(androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! repeatedlyUntil(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public static androidx.test.espresso.ViewAction! replaceText(String);
+    method public static androidx.test.espresso.ViewAction! scrollTo();
+    method public static androidx.test.espresso.ViewAction! slowSwipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeDown();
+    method public static androidx.test.espresso.ViewAction! swipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeRight();
+    method public static androidx.test.espresso.ViewAction! swipeUp();
+    method public static androidx.test.espresso.ViewAction! typeText(String!);
+    method public static androidx.test.espresso.ViewAction! typeTextIntoFocusedView(String!);
+  }
+
+}
+
+package androidx.test.espresso.assertion {
+
+  public final class LayoutAssertions {
+    method public static androidx.test.espresso.ViewAssertion! noEllipsizedText();
+    method public static androidx.test.espresso.ViewAssertion! noMultilineButtons();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps();
+  }
+
+  public final class PositionAssertions {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isBottomAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isLeftAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isRightAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isTopAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class ViewAssertions {
+    method public static androidx.test.espresso.ViewAssertion! doesNotExist();
+    method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher<? super android.view.View>!);
+    method public static androidx.test.espresso.ViewAssertion! selectedDescendantsMatch(org.hamcrest.Matcher<android.view.View!>!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+}
+
+package androidx.test.espresso.base {
+
+  public interface ActiveRootLister {
+    method public java.util.List<androidx.test.espresso.Root!>! listActiveRoots();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface Default {
+  }
+
+  public final class DefaultFailureHandler implements androidx.test.espresso.FailureHandler {
+    ctor public DefaultFailureHandler(@androidx.test.espresso.internal.inject.TargetContext android.content.Context!);
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  @javax.inject.Singleton public final class IdlingResourceRegistry {
+    ctor public IdlingResourceRegistry(android.os.Looper!);
+    method public java.util.List<androidx.test.espresso.IdlingResource!>! getResources();
+    method public void registerLooper(android.os.Looper!, boolean);
+    method public boolean registerResources(java.util.List<? extends androidx.test.espresso.IdlingResource>!);
+    method public void sync(Iterable<androidx.test.espresso.IdlingResource!>!, Iterable<android.os.Looper!>!);
+    method public boolean unregisterResources(java.util.List<? extends androidx.test.espresso.IdlingResource>!);
+  }
+
+  public interface IdlingUiController extends androidx.test.espresso.UiController {
+    method public androidx.test.espresso.base.IdlingResourceRegistry! getIdlingResourceRegistry();
+  }
+
+  public interface InterruptableUiController extends androidx.test.espresso.UiController {
+    method public void interruptEspressoTasks();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface MainThread {
+  }
+
+  @dagger.Module public class PlatformTestStorageModule {
+    ctor public PlatformTestStorageModule();
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker implements javax.inject.Provider<android.view.View> {
+    method public android.view.View! get();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @javax.inject.Scope public @interface RootViewPickerScope {
+  }
+
+  public final class ViewFinderImpl implements androidx.test.espresso.ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+}
+
+package androidx.test.espresso.matcher {
+
+  public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S> {
+    ctor public BoundedDiagnosingMatcher(Class<? extends S>!);
+    ctor public BoundedDiagnosingMatcher(Class<? extends S>!, Class<?>!, Class<?>!...);
+    method public final void describeMismatch(Object!, org.hamcrest.Description!);
+    method protected abstract void describeMoreTo(org.hamcrest.Description!);
+    method public final void describeTo(org.hamcrest.Description!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(T!, org.hamcrest.Description!);
+  }
+
+  public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T> {
+    ctor public BoundedMatcher(Class<? extends S>!);
+    ctor public BoundedMatcher(Class<?>!, Class<?>!, Class<?>!...);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(S!);
+  }
+
+  public final class CursorMatchers {
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object,android.database.Cursor> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public boolean matchesSafely(android.database.Cursor!);
+    method public androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withStrictColumnChecks(boolean);
+  }
+
+  public final class HasBackgroundMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
+    ctor public HasBackgroundMatcher(int);
+    method public void describeTo(org.hamcrest.Description!);
+    method protected boolean matchesSafely(android.view.View!);
+  }
+
+  public final class LayoutMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! hasEllipsizedText();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMultilineText();
+  }
+
+  public final class PreferenceMatchers {
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummary(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitle(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public final class RootMatchers {
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! hasWindowLayoutParams();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isDialog();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isFocusable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isPlatformPopup();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isSystemAlertWindow();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isTouchable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! withDecorView(org.hamcrest.Matcher<android.view.View!>!);
+    field public static final org.hamcrest.Matcher<androidx.test.espresso.Root!>! DEFAULT;
+  }
+
+  public final class ViewMatchers {
+    method public static <T> void assertThat(T!, org.hamcrest.Matcher<T!>!);
+    method public static <T> void assertThat(String!, T!, org.hamcrest.Matcher<T!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! doesNotHaveFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasBackground(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasContentDescription();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasDescendant(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasLinks();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMinimumChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasSibling(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasTextColor(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isAssignableFrom(Class<? extends android.view.View>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isCompletelyDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDescendantOfA(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayingAtLeast(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isJavascriptEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! isRoot();
+    method public static org.hamcrest.Matcher<android.view.View!>! isSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! supportsInputMethods();
+    method public static org.hamcrest.Matcher<android.view.View!>! withAlpha(float);
+    method public static org.hamcrest.Matcher<android.view.View!>! withChild(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(org.hamcrest.Matcher<? extends java.lang.CharSequence>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withEffectiveVisibility(androidx.test.espresso.matcher.ViewMatchers.Visibility!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withInputType(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParent(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParentIndex(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSubstring(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagValue(org.hamcrest.Matcher<java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(int);
+  }
+
+  public enum ViewMatchers.Visibility {
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(android.view.View!);
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(int);
+    method public int getValue();
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility GONE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility INVISIBLE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility VISIBLE;
+  }
+
+}
+
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<?>, Class<? extends java.lang.annotation.Annotation>?, Class<?>!...);
+    method public Object! invokeConstructor(java.lang.Object!...);
+  }
+
+  public interface Converter<I, O> {
+    method public O! convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T! fromProto(M!);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M! toProto();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<?>, String, int);
+    field public final String! fieldName;
+    field public final Class<?>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<MessageLite> {
+    ctor public GenericRemoteMessage(Object);
+    method public MessageLite toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,MessageLite>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<MessageLite> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public MessageLite toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<MessageLite> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public MessageLite toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T! checkedGetEnumForProto(int, Class<T!>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<?>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<?>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<?>! getProtoBuilderClass();
+    method public Parser<?> getProtoParser();
+    method public Class<?>! getProtoType();
+    method public Class<?>![]! getRemoteConstrTypes();
+    method public Class<?>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(Parser<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<?>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<?>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T! anyToType(Any);
+    method public static android.os.Parcelable! byteStringToParcelable(ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T! byteStringToType(ByteString);
+    method public static ByteString parcelableToByteString(android.os.Parcelable);
+    method public static <T> Any typeToAny(T);
+    method public static ByteString typeToByteString(Object);
+  }
+
+}
+
+package androidx.test.espresso.screenshot {
+
+  public final class ViewInteractionCapture {
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class ActivityLifecycles {
+    method public static boolean hasForegroundActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasTransitioningActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasVisibleActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public final class EspressoOptional<T> {
+    method public static <T> androidx.test.espresso.util.EspressoOptional<T!>! absent();
+    method public java.util.Set<T!>! asSet();
+    method public static <T> androidx.test.espresso.util.EspressoOptional<T!>! fromNullable(T!);
+    method public T! get();
+    method public boolean isPresent();
+    method public static <T> androidx.test.espresso.util.EspressoOptional<T!>! of(T!);
+    method public com.google.common.base.Optional<T!>! or(com.google.common.base.Optional<? extends T>!);
+    method public T! or(com.google.common.base.Supplier<? extends T>!);
+    method public T! or(T!);
+    method public T! orNull();
+    method @com.google.common.annotations.Beta public static <T> Iterable<T!>! presentInstances(Iterable<? extends com.google.common.base.Optional<? extends T>>!);
+    method public <V> com.google.common.base.Optional<V!>! transform(com.google.common.base.Function<? super T,V!>!);
+  }
+
+  public final class HumanReadables {
+    method public static String! describe(android.database.Cursor!);
+    method public static String! describe(android.view.View!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!, int);
+  }
+
+  public final class TreeIterables {
+    method public static Iterable<android.view.View!>! breadthFirstViewTraversal(android.view.View!);
+    method public static Iterable<android.view.View!>! depthFirstViewTraversal(android.view.View!);
+    method public static Iterable<androidx.test.espresso.util.TreeIterables.ViewAndDistance!>! depthFirstViewTraversalWithDistance(android.view.View!);
+  }
+
+  public static class TreeIterables.ViewAndDistance {
+    method public int getDistanceFromRoot();
+    method public android.view.View! getView();
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/3.6.0_internal.txt b/espresso/core/java/androidx/test/espresso/api/3.6.0_internal.txt
new file mode 100644
index 000000000..9c26c4f50
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.6.0_internal.txt
@@ -0,0 +1,49 @@
+// Signature format: 3.0
+package androidx.test.espresso.remote {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface IInteractionExecutionStatus extends android.os.IInterface {
+    method public boolean canExecute() throws android.os.RemoteException;
+    field public static final String DESCRIPTOR = "androidx.test.espresso.remote.IInteractionExecutionStatus";
+  }
+
+  public static class IInteractionExecutionStatus.Default implements androidx.test.espresso.remote.IInteractionExecutionStatus {
+    ctor public IInteractionExecutionStatus.Default();
+    method public android.os.IBinder! asBinder();
+    method public boolean canExecute() throws android.os.RemoteException;
+  }
+
+  public abstract static class IInteractionExecutionStatus.Stub extends android.os.Binder implements androidx.test.espresso.remote.IInteractionExecutionStatus {
+    ctor public IInteractionExecutionStatus.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.espresso.remote.IInteractionExecutionStatus! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class IterablesKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> Iterable<T> filter(Iterable<? extends T> iterable, org.hamcrest.Matcher<T> matcher);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> java.util.List<T> filterToList(Iterable<? extends T> iterable, org.hamcrest.Matcher<T> matcher);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Iterators {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> T![]! toArray(java.util.Iterator<T!>!, Class<T!>!);
+  }
+
+  public final class StringJoinerKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static String joinToString(Iterable<?> iterable, String delimiter);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Throwables {
+    method public static void throwIfUnchecked(Throwable!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ToStringHelper {
+    ctor public ToStringHelper(Object obj);
+    method public androidx.test.espresso.util.ToStringHelper add(String name, Object? obj);
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/3.6.0_public.txt b/espresso/core/java/androidx/test/espresso/api/3.6.0_public.txt
new file mode 100644
index 000000000..2c1c3e8bb
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.6.0_public.txt
@@ -0,0 +1,881 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class AmbiguousViewMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+  }
+
+  public static class AmbiguousViewMatcherException.Builder {
+    ctor public AmbiguousViewMatcherException.Builder();
+    method public androidx.test.espresso.AmbiguousViewMatcherException! build();
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! from(androidx.test.espresso.AmbiguousViewMatcherException!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! includeViewHierarchy(boolean);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView1(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView2(android.view.View!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View!>!);
+  }
+
+  public final class AppNotIdleException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method @Deprecated public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, int, int);
+    method public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public class DataInteraction {
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! atPosition(Integer!);
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inAdapterView(org.hamcrest.Matcher<android.view.View!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! onChildView(org.hamcrest.Matcher<android.view.View!>!);
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!);
+  }
+
+  public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
+    method public void describeTo(org.hamcrest.Description!);
+    method @Deprecated public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<?>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
+    method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<?>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, Integer?, androidx.test.espresso.action.AdapterViewProtocol);
+    method public boolean matchesSafely(android.view.View!);
+  }
+
+  public final class Espresso {
+    method public static void closeSoftKeyboard();
+    method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<?>!);
+    method public static void onIdle();
+    method public static <T> T! onIdle(java.util.concurrent.Callable<T!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
+    method public static void openActionBarOverflowOrOptionsMenu(android.content.Context!);
+    method public static void openContextualActionModeOverflowMenu();
+    method public static void pressBack();
+    method public static void pressBackUnconditionally();
+    method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!, boolean);
+    method public static void setFailureHandler(androidx.test.espresso.FailureHandler!);
+    method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...!);
+  }
+
+  public interface EspressoException extends androidx.test.platform.TestFrameworkException {
+  }
+
+  public interface FailureHandler {
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class GraphHolder {
+  }
+
+  public final class IdlingPolicies {
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceErrorPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceWarningPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getMasterIdlingPolicy();
+    method public static void setIdlingResourceTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeoutWhenDebuggerAttached(boolean);
+  }
+
+  public final class IdlingPolicy {
+    method public boolean getDisableOnTimeout();
+    method public long getIdleTimeout();
+    method public java.util.concurrent.TimeUnit! getIdleTimeoutUnit();
+    method public boolean getTimeoutIfDebuggerAttached();
+    method public void handleTimeout(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public final class IdlingResourceTimeoutException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public IdlingResourceTimeoutException(java.util.List<java.lang.String!>!);
+  }
+
+  public final class InjectEventSecurityException extends androidx.test.platform.ui.InjectEventSecurityException implements androidx.test.espresso.EspressoException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+    ctor public InjectEventSecurityException(Throwable!);
+  }
+
+  public final class NoActivityResumedException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoActivityResumedException(String!);
+    ctor public NoActivityResumedException(String!, Throwable!);
+  }
+
+  public final class NoMatchingRootException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public static androidx.test.espresso.NoMatchingRootException! create(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, java.util.List<androidx.test.espresso.Root!>!);
+  }
+
+  public final class NoMatchingViewException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+    method public String! getViewMatcherDescription();
+  }
+
+  public static class NoMatchingViewException.Builder {
+    ctor public NoMatchingViewException.Builder();
+    method public androidx.test.espresso.NoMatchingViewException! build();
+    method public androidx.test.espresso.NoMatchingViewException.Builder! from(androidx.test.espresso.NoMatchingViewException!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! includeViewHierarchy(boolean);
+    method @Deprecated public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(androidx.test.espresso.util.EspressoOptional<java.lang.String!>!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(String!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViews(java.util.List<android.view.View!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View!>!);
+  }
+
+  public final class PerformException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public String! getActionDescription();
+    method public String! getViewDescription();
+  }
+
+  public static class PerformException.Builder {
+    ctor public PerformException.Builder();
+    method public androidx.test.espresso.PerformException! build();
+    method public androidx.test.espresso.PerformException.Builder! from(androidx.test.espresso.PerformException!);
+    method public androidx.test.espresso.PerformException.Builder! withActionDescription(String!);
+    method public androidx.test.espresso.PerformException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.PerformException.Builder! withViewDescription(String!);
+  }
+
+  public final class Root {
+    method public android.view.View! getDecorView();
+    method @Deprecated public androidx.test.espresso.util.EspressoOptional<android.view.WindowManager.LayoutParams!>! getWindowLayoutParams();
+    method public android.view.WindowManager.LayoutParams! getWindowLayoutParams2();
+    method public boolean isReady();
+  }
+
+  public static class Root.Builder {
+    ctor public Root.Builder();
+    method public androidx.test.espresso.Root! build();
+    method public androidx.test.espresso.Root.Builder! withDecorView(android.view.View!);
+    method public androidx.test.espresso.Root.Builder! withWindowLayoutParams(android.view.WindowManager.LayoutParams!);
+  }
+
+  public interface RootViewException extends androidx.test.espresso.EspressoException {
+    method public android.view.View getRootView();
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public default boolean injectMotionEventSequence(Iterable<android.view.MotionEvent!>!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+  public interface ViewAction {
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface ViewAssertion {
+    method public void check(android.view.View!, androidx.test.espresso.NoMatchingViewException!);
+  }
+
+  public interface ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+  public final class ViewInteraction {
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method public androidx.test.espresso.ViewInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method public androidx.test.espresso.ViewInteraction! noActivity();
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!);
+    method public androidx.test.espresso.ViewInteraction! withFailureHandler(androidx.test.espresso.FailureHandler!);
+  }
+
+}
+
+package androidx.test.espresso.action {
+
+  public final class AdapterDataLoaderAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public AdapterDataLoaderAction(org.hamcrest.Matcher<?>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
+    ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<?>!, Integer?, androidx.test.espresso.action.AdapterViewProtocol!);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! getAdaptedData();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface AdapterViewProtocol {
+    method public Iterable<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataInAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!);
+    method @Deprecated public androidx.test.espresso.util.EspressoOptional<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataRenderedByView(android.widget.AdapterView<? extends android.widget.Adapter!>!, android.view.View!);
+    method public default androidx.test.espresso.action.AdapterViewProtocol.AdaptedData? getDataRenderedByView2(android.widget.AdapterView<? extends android.widget.Adapter!>!, android.view.View!);
+    method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+    method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+  }
+
+  public static class AdapterViewProtocol.AdaptedData {
+    method public Object! getData();
+    field @Deprecated public final Object? data;
+    field public final Object! opaqueToken;
+  }
+
+  public static class AdapterViewProtocol.AdaptedData.Builder {
+    ctor public AdapterViewProtocol.AdaptedData.Builder();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! build();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withData(Object?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withDataFunction(androidx.test.espresso.action.AdapterViewProtocol.DataFunction?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withOpaqueToken(Object?);
+  }
+
+  public static interface AdapterViewProtocol.DataFunction {
+    method public Object! getData();
+  }
+
+  public final class AdapterViewProtocols {
+    method public static androidx.test.espresso.action.AdapterViewProtocol! standardProtocol();
+  }
+
+  public final class CaptureToBitmapAction implements androidx.test.espresso.ViewAction {
+    ctor public CaptureToBitmapAction(androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver);
+    method public androidx.test.espresso.action.ViewActions.BitmapReceiver getBitmapReceiver();
+    method public org.hamcrest.Matcher<android.view.View> getConstraints();
+    method public String getDescription();
+    method public void perform(androidx.test.espresso.UiController uiController, android.view.View view);
+    property public final androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver;
+  }
+
+  public final class CloseKeyboardAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public CloseKeyboardAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface CoordinatesProvider {
+    method public float[]! calculateCoordinates(android.view.View!);
+  }
+
+  public final class EditorAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public EditorAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class EspressoKey {
+    method public int getKeyCode();
+    method public int getMetaState();
+  }
+
+  public static class EspressoKey.Builder {
+    ctor public EspressoKey.Builder();
+    method public androidx.test.espresso.action.EspressoKey! build();
+    method public androidx.test.espresso.action.EspressoKey.Builder! withAltPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withCtrlPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withKeyCode(int);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withShiftPressed(boolean);
+  }
+
+  public final class GeneralClickAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, androidx.test.espresso.ViewAction!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int, androidx.test.espresso.ViewAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum GeneralLocation implements androidx.test.espresso.action.CoordinatesProvider {
+    method public static androidx.test.espresso.action.CoordinatesProvider translate(androidx.test.espresso.action.CoordinatesProvider, float, float);
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation VISIBLE_CENTER;
+  }
+
+  public final class GeneralSwipeAction implements androidx.test.espresso.ViewAction {
+    ctor public GeneralSwipeAction(androidx.test.espresso.action.Swiper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class KeyEventAction implements androidx.test.espresso.ViewAction {
+    ctor public KeyEventAction(androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class MotionEvents {
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!);
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!, int, int);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, float[]);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, long, float[]);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, float[]!);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, long, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, long, float[]!);
+    method public static void sendCancel(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method public static boolean sendMovement(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+  }
+
+  public static class MotionEvents.DownResultHolder {
+    field public final android.view.MotionEvent! down;
+    field public final boolean longPress;
+  }
+
+  public final class OpenLinkAction implements androidx.test.espresso.ViewAction {
+    ctor public OpenLinkAction(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface PrecisionDescriber {
+    method public float[]! describePrecision();
+  }
+
+  public enum Press implements androidx.test.espresso.action.PrecisionDescriber {
+    enum_constant public static final androidx.test.espresso.action.Press FINGER;
+    enum_constant public static final androidx.test.espresso.action.Press PINPOINT;
+    enum_constant public static final androidx.test.espresso.action.Press THUMB;
+  }
+
+  public final class PressBackAction implements androidx.test.espresso.ViewAction {
+    ctor public PressBackAction(boolean);
+    ctor public PressBackAction(boolean, androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class RepeatActionUntilViewState implements androidx.test.espresso.ViewAction {
+    ctor protected RepeatActionUntilViewState(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ReplaceTextAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public ReplaceTextAction(String!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ScrollToAction implements androidx.test.espresso.ViewAction {
+    ctor public ScrollToAction();
+    ctor public ScrollToAction(int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum Swipe implements androidx.test.espresso.action.Swiper {
+    enum_constant public static final androidx.test.espresso.action.Swipe FAST;
+    enum_constant public static final androidx.test.espresso.action.Swipe SLOW;
+  }
+
+  public interface Swiper {
+    method public androidx.test.espresso.action.Swiper.Status! sendSwipe(androidx.test.espresso.UiController!, float[]!, float[]!, float[]!);
+  }
+
+  public enum Swiper.Status {
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status SUCCESS;
+  }
+
+  public enum Tap implements androidx.test.espresso.action.Tapper {
+    enum_constant public static final androidx.test.espresso.action.Tap DOUBLE;
+    enum_constant public static final androidx.test.espresso.action.Tap LONG;
+    enum_constant public static final androidx.test.espresso.action.Tap SINGLE;
+  }
+
+  public interface Tapper {
+    method @Deprecated public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+  }
+
+  public enum Tapper.Status {
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status SUCCESS;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status WARNING;
+  }
+
+  public final class TypeTextAction implements androidx.test.espresso.ViewAction {
+    ctor public TypeTextAction(String!);
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TypeTextAction(String!, boolean);
+    ctor public TypeTextAction(String!, boolean, androidx.test.espresso.action.GeneralClickAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ViewActions {
+    method public static androidx.test.espresso.ViewAction! actionWithAssertions(androidx.test.espresso.ViewAction!);
+    method public static void addGlobalAssertion(String!, androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! captureToBitmap(androidx.test.espresso.action.ViewActions.BitmapReceiver!);
+    method public static void clearGlobalAssertions();
+    method public static androidx.test.espresso.ViewAction! clearText();
+    method public static androidx.test.espresso.ViewAction! click();
+    method public static androidx.test.espresso.ViewAction! click(androidx.test.espresso.ViewAction!);
+    method public static androidx.test.espresso.ViewAction! click(int, int);
+    method public static androidx.test.espresso.ViewAction! closeSoftKeyboard();
+    method public static androidx.test.espresso.ViewAction! doubleClick();
+    method public static androidx.test.espresso.ViewAction! longClick();
+    method public static androidx.test.espresso.ViewAction! openLink(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! pressBack();
+    method public static androidx.test.espresso.ViewAction! pressBackUnconditionally();
+    method public static androidx.test.espresso.ViewAction! pressImeActionButton();
+    method public static androidx.test.espresso.ViewAction! pressKey(androidx.test.espresso.action.EspressoKey!);
+    method public static androidx.test.espresso.ViewAction! pressKey(int);
+    method public static androidx.test.espresso.ViewAction! pressMenuKey();
+    method public static void removeGlobalAssertion(androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! repeatedlyUntil(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public static androidx.test.espresso.ViewAction! replaceText(String);
+    method public static androidx.test.espresso.ViewAction! scrollCompletelyTo();
+    method public static androidx.test.espresso.ViewAction! scrollTo();
+    method public static androidx.test.espresso.ViewAction! scrollTo(int);
+    method public static androidx.test.espresso.ViewAction! slowSwipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeDown();
+    method public static androidx.test.espresso.ViewAction! swipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeRight();
+    method public static androidx.test.espresso.ViewAction! swipeUp();
+    method public static androidx.test.espresso.ViewAction! typeText(String!);
+    method public static androidx.test.espresso.ViewAction! typeTextIntoFocusedView(String!);
+  }
+
+  public static interface ViewActions.BitmapReceiver {
+    method public void onBitmapCaptured(android.graphics.Bitmap!);
+  }
+
+}
+
+package androidx.test.espresso.assertion {
+
+  public final class LayoutAssertions {
+    method public static androidx.test.espresso.ViewAssertion! noEllipsizedText();
+    method public static androidx.test.espresso.ViewAssertion! noMultilineButtons();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class PositionAssertions {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isBottomAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isLeftAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isRightAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isTopAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class ViewAssertions {
+    method public static androidx.test.espresso.ViewAssertion! doesNotExist();
+    method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher<? super android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! selectedDescendantsMatch(org.hamcrest.Matcher<android.view.View!>!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+}
+
+package androidx.test.espresso.base {
+
+  public interface ActiveRootLister {
+    method public java.util.List<androidx.test.espresso.Root!>! listActiveRoots();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface Default {
+  }
+
+  public final class DefaultFailureHandler implements androidx.test.espresso.FailureHandler {
+    ctor public DefaultFailureHandler(android.content.Context!);
+    ctor public DefaultFailureHandler(android.content.Context!, boolean);
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  @javax.inject.Singleton public final class IdlingResourceRegistry {
+    ctor public IdlingResourceRegistry(android.os.Looper!);
+    method public java.util.List<androidx.test.espresso.IdlingResource!>! getResources();
+    method public void registerLooper(android.os.Looper!, boolean);
+    method public boolean registerResources(java.util.List<? extends androidx.test.espresso.IdlingResource!>!);
+    method public void sync(Iterable<androidx.test.espresso.IdlingResource!>!, Iterable<android.os.Looper!>!);
+    method public boolean unregisterResources(java.util.List<? extends androidx.test.espresso.IdlingResource!>!);
+  }
+
+  public interface IdlingUiController extends androidx.test.espresso.UiController {
+    method public androidx.test.espresso.base.IdlingResourceRegistry! getIdlingResourceRegistry();
+  }
+
+  public interface InterruptableUiController extends androidx.test.espresso.UiController {
+    method public void interruptEspressoTasks();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface MainThread {
+  }
+
+  @dagger.Module public class PlatformTestStorageModule {
+    ctor public PlatformTestStorageModule();
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker implements javax.inject.Provider<android.view.View> {
+    method public android.view.View! get();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @javax.inject.Scope public @interface RootViewPickerScope {
+  }
+
+  public final class ViewFinderImpl implements androidx.test.espresso.ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+}
+
+package androidx.test.espresso.core.internal.deps.guava.base {
+
+  @Deprecated public interface Function<F, T> {
+    method @Deprecated public T! apply(F!);
+  }
+
+  @Deprecated public class Optional<T> implements java.io.Serializable {
+    method @Deprecated public java.util.Set<T!>! asSet();
+    method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! fromNullable(T?);
+    method @Deprecated public T! get();
+    method @Deprecated public boolean isPresent();
+    method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! of(T!);
+    method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>!);
+    method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<T!>!);
+    method @Deprecated public T! or(T!);
+    method @Deprecated public T! orNull();
+    method @Deprecated public static <T> Iterable<T!>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!>!);
+    method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V!>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T!,V!>!);
+  }
+
+  @Deprecated public interface Supplier<T> {
+    method @Deprecated public T! get();
+  }
+
+}
+
+package androidx.test.espresso.matcher {
+
+  public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S> {
+    ctor public BoundedDiagnosingMatcher(Class<? extends S!>!);
+    ctor public BoundedDiagnosingMatcher(Class<? extends S!>!, Class<?>!, Class<?>!...!);
+    method public final void describeMismatch(Object!, org.hamcrest.Description!);
+    method protected abstract void describeMoreTo(org.hamcrest.Description!);
+    method public final void describeTo(org.hamcrest.Description!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(T!, org.hamcrest.Description!);
+  }
+
+  public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T> {
+    ctor public BoundedMatcher(Class<? extends S!>!);
+    ctor public BoundedMatcher(Class<?>!, Class<?>!, Class<?>!...!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(S!);
+  }
+
+  public final class CursorMatchers {
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object,android.database.Cursor> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public boolean matchesSafely(android.database.Cursor!);
+    method public androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withStrictColumnChecks(boolean);
+  }
+
+  public final class HasBackgroundMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View> {
+    ctor public HasBackgroundMatcher(int);
+    method public void describeTo(org.hamcrest.Description!);
+    method protected boolean matchesSafely(android.view.View!);
+  }
+
+  public final class LayoutMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! hasEllipsizedText();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMultilineText();
+  }
+
+  public final class PreferenceMatchers {
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummary(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitle(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public final class RootMatchers {
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! hasWindowLayoutParams();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isDialog();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isFocusable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isPlatformPopup();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isSystemAlertWindow();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isTouchable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! withDecorView(org.hamcrest.Matcher<android.view.View!>!);
+    field public static final org.hamcrest.Matcher<androidx.test.espresso.Root!>! DEFAULT;
+  }
+
+  public final class ViewMatchers {
+    method public static <T> void assertThat(String!, T!, org.hamcrest.Matcher<T!>!);
+    method public static <T> void assertThat(T!, org.hamcrest.Matcher<T!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! doesNotHaveFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasBackground(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasContentDescription();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasDescendant(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasLinks();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMinimumChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasSibling(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasTextColor(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isActivated();
+    method public static org.hamcrest.Matcher<android.view.View!>! isAssignableFrom(Class<? extends android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isCompletelyDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDescendantOfA(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayingAtLeast(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isJavascriptEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotActivated();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! isRoot();
+    method public static org.hamcrest.Matcher<android.view.View!>! isSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! supportsInputMethods();
+    method public static org.hamcrest.Matcher<android.view.View!>! withAlpha(float);
+    method public static org.hamcrest.Matcher<android.view.View!>! withChild(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(org.hamcrest.Matcher<? extends java.lang.CharSequence!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withEffectiveVisibility(androidx.test.espresso.matcher.ViewMatchers.Visibility!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withInputType(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParent(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParentIndex(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSubstring(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagValue(org.hamcrest.Matcher<java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public enum ViewMatchers.Visibility {
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(android.view.View!);
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(int);
+    method public int getValue();
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility GONE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility INVISIBLE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility VISIBLE;
+  }
+
+}
+
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<?>, Class<? extends java.lang.annotation.Annotation!>?, Class<?>!...?);
+    method public Object! invokeConstructor(java.lang.Object!...!);
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T! fromProto(M!);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M! toProto();
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public boolean isRemoteProcess();
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public default boolean isRemoteClient();
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+}
+
+package androidx.test.espresso.remote.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR}) public @interface RemoteMsgConstructor {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD}) public @interface RemoteMsgField {
+    method public abstract int order();
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class ActivityLifecycles {
+    method public static boolean hasForegroundActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasTransitioningActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasVisibleActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  @Deprecated public final class EspressoOptional<T> {
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! absent();
+    method @Deprecated public java.util.Set<T!>! asSet();
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! fromNullable(T!);
+    method @Deprecated public T! get();
+    method @Deprecated public boolean isPresent();
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! of(T!);
+    method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!);
+    method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<? extends T!>!);
+    method @Deprecated public T! or(T!);
+    method @Deprecated public T! orNull();
+    method @Deprecated public static <T> Iterable<T!>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!>!);
+    method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V!>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T!,V!>!);
+  }
+
+  public final class HumanReadables {
+    method public static String! describe(android.database.Cursor!);
+    method public static String! describe(android.view.View!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!, int);
+  }
+
+  public final class IterablesKt {
+  }
+
+  public final class StringJoinerKt {
+  }
+
+  public final class TreeIterables {
+    method public static Iterable<android.view.View!>! breadthFirstViewTraversal(android.view.View!);
+    method public static Iterable<android.view.View!>! depthFirstViewTraversal(android.view.View!);
+    method public static Iterable<androidx.test.espresso.util.TreeIterables.ViewAndDistance!>! depthFirstViewTraversalWithDistance(android.view.View!);
+  }
+
+  public static class TreeIterables.ViewAndDistance {
+    method public int getDistanceFromRoot();
+    method public android.view.View! getView();
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/3.7.0_internal.txt b/espresso/core/java/androidx/test/espresso/api/3.7.0_internal.txt
new file mode 100644
index 000000000..9c26c4f50
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.7.0_internal.txt
@@ -0,0 +1,49 @@
+// Signature format: 3.0
+package androidx.test.espresso.remote {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface IInteractionExecutionStatus extends android.os.IInterface {
+    method public boolean canExecute() throws android.os.RemoteException;
+    field public static final String DESCRIPTOR = "androidx.test.espresso.remote.IInteractionExecutionStatus";
+  }
+
+  public static class IInteractionExecutionStatus.Default implements androidx.test.espresso.remote.IInteractionExecutionStatus {
+    ctor public IInteractionExecutionStatus.Default();
+    method public android.os.IBinder! asBinder();
+    method public boolean canExecute() throws android.os.RemoteException;
+  }
+
+  public abstract static class IInteractionExecutionStatus.Stub extends android.os.Binder implements androidx.test.espresso.remote.IInteractionExecutionStatus {
+    ctor public IInteractionExecutionStatus.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.espresso.remote.IInteractionExecutionStatus! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class IterablesKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> Iterable<T> filter(Iterable<? extends T> iterable, org.hamcrest.Matcher<T> matcher);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> java.util.List<T> filterToList(Iterable<? extends T> iterable, org.hamcrest.Matcher<T> matcher);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Iterators {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> T![]! toArray(java.util.Iterator<T!>!, Class<T!>!);
+  }
+
+  public final class StringJoinerKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static String joinToString(Iterable<?> iterable, String delimiter);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Throwables {
+    method public static void throwIfUnchecked(Throwable!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ToStringHelper {
+    ctor public ToStringHelper(Object obj);
+    method public androidx.test.espresso.util.ToStringHelper add(String name, Object? obj);
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/3.7.0_public.txt b/espresso/core/java/androidx/test/espresso/api/3.7.0_public.txt
new file mode 100644
index 000000000..dceb4f1ff
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/3.7.0_public.txt
@@ -0,0 +1,881 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class AmbiguousViewMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+  }
+
+  public static class AmbiguousViewMatcherException.Builder {
+    ctor public AmbiguousViewMatcherException.Builder();
+    method public androidx.test.espresso.AmbiguousViewMatcherException! build();
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! from(androidx.test.espresso.AmbiguousViewMatcherException!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! includeViewHierarchy(boolean);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView1(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView2(android.view.View!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View!>!);
+  }
+
+  public final class AppNotIdleException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method @Deprecated public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, int, int);
+    method public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public class DataInteraction {
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! atPosition(Integer!);
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inAdapterView(org.hamcrest.Matcher<android.view.View!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! onChildView(org.hamcrest.Matcher<android.view.View!>!);
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!);
+  }
+
+  public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View!> {
+    method public void describeTo(org.hamcrest.Description!);
+    method @Deprecated public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<? extends java.lang.Object!>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
+    method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<? extends java.lang.Object!>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, Integer?, androidx.test.espresso.action.AdapterViewProtocol);
+    method public boolean matchesSafely(android.view.View!);
+  }
+
+  public final class Espresso {
+    method public static void closeSoftKeyboard();
+    method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static void onIdle();
+    method public static <T> T! onIdle(java.util.concurrent.Callable<T!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
+    method public static void openActionBarOverflowOrOptionsMenu(android.content.Context!);
+    method public static void openContextualActionModeOverflowMenu();
+    method public static void pressBack();
+    method public static void pressBackUnconditionally();
+    method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!, boolean);
+    method public static void setFailureHandler(androidx.test.espresso.FailureHandler!);
+    method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...!);
+  }
+
+  public interface EspressoException extends androidx.test.platform.TestFrameworkException {
+  }
+
+  public interface FailureHandler {
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class GraphHolder {
+  }
+
+  public final class IdlingPolicies {
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceErrorPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceWarningPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getMasterIdlingPolicy();
+    method public static void setIdlingResourceTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeoutWhenDebuggerAttached(boolean);
+  }
+
+  public final class IdlingPolicy {
+    method public boolean getDisableOnTimeout();
+    method public long getIdleTimeout();
+    method public java.util.concurrent.TimeUnit! getIdleTimeoutUnit();
+    method public boolean getTimeoutIfDebuggerAttached();
+    method public void handleTimeout(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public final class IdlingResourceTimeoutException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public IdlingResourceTimeoutException(java.util.List<java.lang.String!>!);
+  }
+
+  public final class InjectEventSecurityException extends androidx.test.platform.ui.InjectEventSecurityException implements androidx.test.espresso.EspressoException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+    ctor public InjectEventSecurityException(Throwable!);
+  }
+
+  public final class NoActivityResumedException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoActivityResumedException(String!);
+    ctor public NoActivityResumedException(String!, Throwable!);
+  }
+
+  public final class NoMatchingRootException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public static androidx.test.espresso.NoMatchingRootException! create(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, java.util.List<androidx.test.espresso.Root!>!);
+  }
+
+  public final class NoMatchingViewException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+    method public String! getViewMatcherDescription();
+  }
+
+  public static class NoMatchingViewException.Builder {
+    ctor public NoMatchingViewException.Builder();
+    method public androidx.test.espresso.NoMatchingViewException! build();
+    method public androidx.test.espresso.NoMatchingViewException.Builder! from(androidx.test.espresso.NoMatchingViewException!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! includeViewHierarchy(boolean);
+    method @Deprecated public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(androidx.test.espresso.util.EspressoOptional<java.lang.String!>!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(String!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViews(java.util.List<android.view.View!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View!>!);
+  }
+
+  public final class PerformException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public String! getActionDescription();
+    method public String! getViewDescription();
+  }
+
+  public static class PerformException.Builder {
+    ctor public PerformException.Builder();
+    method public androidx.test.espresso.PerformException! build();
+    method public androidx.test.espresso.PerformException.Builder! from(androidx.test.espresso.PerformException!);
+    method public androidx.test.espresso.PerformException.Builder! withActionDescription(String!);
+    method public androidx.test.espresso.PerformException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.PerformException.Builder! withViewDescription(String!);
+  }
+
+  public final class Root {
+    method public android.view.View! getDecorView();
+    method @Deprecated public androidx.test.espresso.util.EspressoOptional<android.view.WindowManager.LayoutParams!>! getWindowLayoutParams();
+    method public android.view.WindowManager.LayoutParams! getWindowLayoutParams2();
+    method public boolean isReady();
+  }
+
+  public static class Root.Builder {
+    ctor public Root.Builder();
+    method public androidx.test.espresso.Root! build();
+    method public androidx.test.espresso.Root.Builder! withDecorView(android.view.View!);
+    method public androidx.test.espresso.Root.Builder! withWindowLayoutParams(android.view.WindowManager.LayoutParams!);
+  }
+
+  public interface RootViewException extends androidx.test.espresso.EspressoException {
+    method public android.view.View getRootView();
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public default boolean injectMotionEventSequence(Iterable<android.view.MotionEvent!>!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+  public interface ViewAction {
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface ViewAssertion {
+    method public void check(android.view.View!, androidx.test.espresso.NoMatchingViewException!);
+  }
+
+  public interface ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+  public final class ViewInteraction {
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method public androidx.test.espresso.ViewInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method public androidx.test.espresso.ViewInteraction! noActivity();
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!);
+    method public androidx.test.espresso.ViewInteraction! withFailureHandler(androidx.test.espresso.FailureHandler!);
+  }
+
+}
+
+package androidx.test.espresso.action {
+
+  public final class AdapterDataLoaderAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public AdapterDataLoaderAction(org.hamcrest.Matcher<? extends java.lang.Object!>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
+    ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<? extends java.lang.Object!>!, Integer?, androidx.test.espresso.action.AdapterViewProtocol!);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! getAdaptedData();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface AdapterViewProtocol {
+    method public Iterable<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataInAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!);
+    method @Deprecated public androidx.test.espresso.util.EspressoOptional<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataRenderedByView(android.widget.AdapterView<? extends android.widget.Adapter!>!, android.view.View!);
+    method public default androidx.test.espresso.action.AdapterViewProtocol.AdaptedData? getDataRenderedByView2(android.widget.AdapterView<? extends android.widget.Adapter!>!, android.view.View!);
+    method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+    method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+  }
+
+  public static class AdapterViewProtocol.AdaptedData {
+    method public Object! getData();
+    field @Deprecated public final Object? data;
+    field public final Object! opaqueToken;
+  }
+
+  public static class AdapterViewProtocol.AdaptedData.Builder {
+    ctor public AdapterViewProtocol.AdaptedData.Builder();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! build();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withData(Object?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withDataFunction(androidx.test.espresso.action.AdapterViewProtocol.DataFunction?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withOpaqueToken(Object?);
+  }
+
+  public static interface AdapterViewProtocol.DataFunction {
+    method public Object! getData();
+  }
+
+  public final class AdapterViewProtocols {
+    method public static androidx.test.espresso.action.AdapterViewProtocol! standardProtocol();
+  }
+
+  public final class CaptureToBitmapAction implements androidx.test.espresso.ViewAction {
+    ctor public CaptureToBitmapAction(androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver);
+    method public androidx.test.espresso.action.ViewActions.BitmapReceiver getBitmapReceiver();
+    method public org.hamcrest.Matcher<android.view.View> getConstraints();
+    method public String getDescription();
+    method public void perform(androidx.test.espresso.UiController uiController, android.view.View view);
+    property public final androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver;
+  }
+
+  public final class CloseKeyboardAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public CloseKeyboardAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface CoordinatesProvider {
+    method public float[]! calculateCoordinates(android.view.View!);
+  }
+
+  public final class EditorAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public EditorAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class EspressoKey {
+    method public int getKeyCode();
+    method public int getMetaState();
+  }
+
+  public static class EspressoKey.Builder {
+    ctor public EspressoKey.Builder();
+    method public androidx.test.espresso.action.EspressoKey! build();
+    method public androidx.test.espresso.action.EspressoKey.Builder! withAltPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withCtrlPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withKeyCode(int);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withShiftPressed(boolean);
+  }
+
+  public final class GeneralClickAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, androidx.test.espresso.ViewAction!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int, androidx.test.espresso.ViewAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum GeneralLocation implements androidx.test.espresso.action.CoordinatesProvider {
+    method public static androidx.test.espresso.action.CoordinatesProvider translate(androidx.test.espresso.action.CoordinatesProvider, float, float);
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation VISIBLE_CENTER;
+  }
+
+  public final class GeneralSwipeAction implements androidx.test.espresso.ViewAction {
+    ctor public GeneralSwipeAction(androidx.test.espresso.action.Swiper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class KeyEventAction implements androidx.test.espresso.ViewAction {
+    ctor public KeyEventAction(androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class MotionEvents {
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!);
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!, int, int);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, float[]);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, long, float[]);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, float[]!);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, long, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, long, float[]!);
+    method public static void sendCancel(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method public static boolean sendMovement(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+  }
+
+  public static class MotionEvents.DownResultHolder {
+    field public final android.view.MotionEvent! down;
+    field public final boolean longPress;
+  }
+
+  public final class OpenLinkAction implements androidx.test.espresso.ViewAction {
+    ctor public OpenLinkAction(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface PrecisionDescriber {
+    method public float[]! describePrecision();
+  }
+
+  public enum Press implements androidx.test.espresso.action.PrecisionDescriber {
+    enum_constant public static final androidx.test.espresso.action.Press FINGER;
+    enum_constant public static final androidx.test.espresso.action.Press PINPOINT;
+    enum_constant public static final androidx.test.espresso.action.Press THUMB;
+  }
+
+  public final class PressBackAction implements androidx.test.espresso.ViewAction {
+    ctor public PressBackAction(boolean);
+    ctor public PressBackAction(boolean, androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class RepeatActionUntilViewState implements androidx.test.espresso.ViewAction {
+    ctor protected RepeatActionUntilViewState(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ReplaceTextAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public ReplaceTextAction(String!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ScrollToAction implements androidx.test.espresso.ViewAction {
+    ctor public ScrollToAction();
+    ctor public ScrollToAction(int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum Swipe implements androidx.test.espresso.action.Swiper {
+    enum_constant public static final androidx.test.espresso.action.Swipe FAST;
+    enum_constant public static final androidx.test.espresso.action.Swipe SLOW;
+  }
+
+  public interface Swiper {
+    method public androidx.test.espresso.action.Swiper.Status! sendSwipe(androidx.test.espresso.UiController!, float[]!, float[]!, float[]!);
+  }
+
+  public enum Swiper.Status {
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status SUCCESS;
+  }
+
+  public enum Tap implements androidx.test.espresso.action.Tapper {
+    enum_constant public static final androidx.test.espresso.action.Tap DOUBLE;
+    enum_constant public static final androidx.test.espresso.action.Tap LONG;
+    enum_constant public static final androidx.test.espresso.action.Tap SINGLE;
+  }
+
+  public interface Tapper {
+    method @Deprecated public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+  }
+
+  public enum Tapper.Status {
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status SUCCESS;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status WARNING;
+  }
+
+  public final class TypeTextAction implements androidx.test.espresso.ViewAction {
+    ctor public TypeTextAction(String!);
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TypeTextAction(String!, boolean);
+    ctor public TypeTextAction(String!, boolean, androidx.test.espresso.action.GeneralClickAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ViewActions {
+    method public static androidx.test.espresso.ViewAction! actionWithAssertions(androidx.test.espresso.ViewAction!);
+    method public static void addGlobalAssertion(String!, androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! captureToBitmap(androidx.test.espresso.action.ViewActions.BitmapReceiver!);
+    method public static void clearGlobalAssertions();
+    method public static androidx.test.espresso.ViewAction! clearText();
+    method public static androidx.test.espresso.ViewAction! click();
+    method public static androidx.test.espresso.ViewAction! click(androidx.test.espresso.ViewAction!);
+    method public static androidx.test.espresso.ViewAction! click(int, int);
+    method public static androidx.test.espresso.ViewAction! closeSoftKeyboard();
+    method public static androidx.test.espresso.ViewAction! doubleClick();
+    method public static androidx.test.espresso.ViewAction! longClick();
+    method public static androidx.test.espresso.ViewAction! openLink(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! pressBack();
+    method public static androidx.test.espresso.ViewAction! pressBackUnconditionally();
+    method public static androidx.test.espresso.ViewAction! pressImeActionButton();
+    method public static androidx.test.espresso.ViewAction! pressKey(androidx.test.espresso.action.EspressoKey!);
+    method public static androidx.test.espresso.ViewAction! pressKey(int);
+    method public static androidx.test.espresso.ViewAction! pressMenuKey();
+    method public static void removeGlobalAssertion(androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! repeatedlyUntil(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public static androidx.test.espresso.ViewAction! replaceText(String);
+    method public static androidx.test.espresso.ViewAction! scrollCompletelyTo();
+    method public static androidx.test.espresso.ViewAction! scrollTo();
+    method public static androidx.test.espresso.ViewAction! scrollTo(int);
+    method public static androidx.test.espresso.ViewAction! slowSwipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeDown();
+    method public static androidx.test.espresso.ViewAction! swipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeRight();
+    method public static androidx.test.espresso.ViewAction! swipeUp();
+    method public static androidx.test.espresso.ViewAction! typeText(String!);
+    method public static androidx.test.espresso.ViewAction! typeTextIntoFocusedView(String!);
+  }
+
+  public static interface ViewActions.BitmapReceiver {
+    method public void onBitmapCaptured(android.graphics.Bitmap!);
+  }
+
+}
+
+package androidx.test.espresso.assertion {
+
+  public final class LayoutAssertions {
+    method public static androidx.test.espresso.ViewAssertion! noEllipsizedText();
+    method public static androidx.test.espresso.ViewAssertion! noMultilineButtons();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class PositionAssertions {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isBottomAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isLeftAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isRightAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isTopAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class ViewAssertions {
+    method public static androidx.test.espresso.ViewAssertion! doesNotExist();
+    method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher<? super android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! selectedDescendantsMatch(org.hamcrest.Matcher<android.view.View!>!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+}
+
+package androidx.test.espresso.base {
+
+  public interface ActiveRootLister {
+    method public java.util.List<androidx.test.espresso.Root!>! listActiveRoots();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface Default {
+  }
+
+  public final class DefaultFailureHandler implements androidx.test.espresso.FailureHandler {
+    ctor public DefaultFailureHandler(android.content.Context!);
+    ctor public DefaultFailureHandler(android.content.Context!, boolean);
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  @javax.inject.Singleton public final class IdlingResourceRegistry {
+    ctor public IdlingResourceRegistry(android.os.Looper!);
+    method public java.util.List<androidx.test.espresso.IdlingResource!>! getResources();
+    method public void registerLooper(android.os.Looper!, boolean);
+    method public boolean registerResources(java.util.List<? extends androidx.test.espresso.IdlingResource!>!);
+    method public void sync(Iterable<androidx.test.espresso.IdlingResource!>!, Iterable<android.os.Looper!>!);
+    method public boolean unregisterResources(java.util.List<? extends androidx.test.espresso.IdlingResource!>!);
+  }
+
+  public interface IdlingUiController extends androidx.test.espresso.UiController {
+    method public androidx.test.espresso.base.IdlingResourceRegistry! getIdlingResourceRegistry();
+  }
+
+  public interface InterruptableUiController extends androidx.test.espresso.UiController {
+    method public void interruptEspressoTasks();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface MainThread {
+  }
+
+  @dagger.Module public class PlatformTestStorageModule {
+    ctor public PlatformTestStorageModule();
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker implements javax.inject.Provider<android.view.View!> {
+    method public android.view.View! get();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @javax.inject.Scope public @interface RootViewPickerScope {
+  }
+
+  public final class ViewFinderImpl implements androidx.test.espresso.ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+}
+
+package androidx.test.espresso.core.internal.deps.guava.base {
+
+  @Deprecated public interface Function<F, T> {
+    method @Deprecated public T! apply(F!);
+  }
+
+  @Deprecated public class Optional<T> implements java.io.Serializable {
+    method @Deprecated public java.util.Set<T!>! asSet();
+    method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! fromNullable(T?);
+    method @Deprecated public T! get();
+    method @Deprecated public boolean isPresent();
+    method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! of(T!);
+    method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>!);
+    method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<T!>!);
+    method @Deprecated public T! or(T!);
+    method @Deprecated public T! orNull();
+    method @Deprecated public static <T> Iterable<T!>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!>!);
+    method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V!>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T!,V!>!);
+  }
+
+  @Deprecated public interface Supplier<T> {
+    method @Deprecated public T! get();
+  }
+
+}
+
+package androidx.test.espresso.matcher {
+
+  public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S!> {
+    ctor public BoundedDiagnosingMatcher(Class<? extends S!>!);
+    ctor public BoundedDiagnosingMatcher(Class<? extends S!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
+    method public final void describeMismatch(Object!, org.hamcrest.Description!);
+    method protected abstract void describeMoreTo(org.hamcrest.Description!);
+    method public final void describeTo(org.hamcrest.Description!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(T!, org.hamcrest.Description!);
+  }
+
+  public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T!> {
+    ctor public BoundedMatcher(Class<? extends S!>!);
+    ctor public BoundedMatcher(Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(S!);
+  }
+
+  public final class CursorMatchers {
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object!,android.database.Cursor!> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public boolean matchesSafely(android.database.Cursor!);
+    method public androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withStrictColumnChecks(boolean);
+  }
+
+  public final class HasBackgroundMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View!> {
+    ctor public HasBackgroundMatcher(int);
+    method public void describeTo(org.hamcrest.Description!);
+    method protected boolean matchesSafely(android.view.View!);
+  }
+
+  public final class LayoutMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! hasEllipsizedText();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMultilineText();
+  }
+
+  public final class PreferenceMatchers {
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummary(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitle(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public final class RootMatchers {
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! hasWindowLayoutParams();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isDialog();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isFocusable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isPlatformPopup();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isSystemAlertWindow();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isTouchable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! withDecorView(org.hamcrest.Matcher<android.view.View!>!);
+    field public static final org.hamcrest.Matcher<androidx.test.espresso.Root!>! DEFAULT;
+  }
+
+  public final class ViewMatchers {
+    method public static <T> void assertThat(String!, T!, org.hamcrest.Matcher<T!>!);
+    method public static <T> void assertThat(T!, org.hamcrest.Matcher<T!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! doesNotHaveFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasBackground(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasContentDescription();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasDescendant(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasLinks();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMinimumChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasSibling(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasTextColor(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isActivated();
+    method public static org.hamcrest.Matcher<android.view.View!>! isAssignableFrom(Class<? extends android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isCompletelyDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDescendantOfA(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayingAtLeast(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isJavascriptEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotActivated();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! isRoot();
+    method public static org.hamcrest.Matcher<android.view.View!>! isSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! supportsInputMethods();
+    method public static org.hamcrest.Matcher<android.view.View!>! withAlpha(float);
+    method public static org.hamcrest.Matcher<android.view.View!>! withChild(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(org.hamcrest.Matcher<? extends java.lang.CharSequence!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withEffectiveVisibility(androidx.test.espresso.matcher.ViewMatchers.Visibility!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withInputType(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParent(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParentIndex(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSubstring(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagValue(org.hamcrest.Matcher<java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public enum ViewMatchers.Visibility {
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(android.view.View!);
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(int);
+    method public int getValue();
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility GONE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility INVISIBLE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility VISIBLE;
+  }
+
+}
+
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<? extends java.lang.Object!>, Class<? extends java.lang.annotation.Annotation!>?, Class<? extends java.lang.Object!>!...?);
+    method public Object! invokeConstructor(java.lang.Object!...!);
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T! fromProto(M!);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M! toProto();
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public boolean isRemoteProcess();
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public default boolean isRemoteClient();
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+}
+
+package androidx.test.espresso.remote.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR}) public @interface RemoteMsgConstructor {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD}) public @interface RemoteMsgField {
+    method public abstract int order();
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class ActivityLifecycles {
+    method public static boolean hasForegroundActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasTransitioningActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasVisibleActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  @Deprecated public final class EspressoOptional<T> {
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! absent();
+    method @Deprecated public java.util.Set<T!>! asSet();
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! fromNullable(T!);
+    method @Deprecated public T! get();
+    method @Deprecated public boolean isPresent();
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T!>! of(T!);
+    method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T!>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!);
+    method @Deprecated public T! or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<? extends T!>!);
+    method @Deprecated public T! or(T!);
+    method @Deprecated public T! orNull();
+    method @Deprecated public static <T> Iterable<T!>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T!>!>!);
+    method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V!>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T!,V!>!);
+  }
+
+  public final class HumanReadables {
+    method public static String! describe(android.database.Cursor!);
+    method public static String! describe(android.view.View!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!, int);
+  }
+
+  public final class IterablesKt {
+  }
+
+  public final class StringJoinerKt {
+  }
+
+  public final class TreeIterables {
+    method public static Iterable<android.view.View!>! breadthFirstViewTraversal(android.view.View!);
+    method public static Iterable<android.view.View!>! depthFirstViewTraversal(android.view.View!);
+    method public static Iterable<androidx.test.espresso.util.TreeIterables.ViewAndDistance!>! depthFirstViewTraversalWithDistance(android.view.View!);
+  }
+
+  public static class TreeIterables.ViewAndDistance {
+    method public int getDistanceFromRoot();
+    method public android.view.View! getView();
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/current_internal.txt b/espresso/core/java/androidx/test/espresso/api/current_internal.txt
new file mode 100644
index 000000000..05c15d392
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/current_internal.txt
@@ -0,0 +1,48 @@
+// Signature format: 5.0
+package androidx.test.espresso.remote {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface IInteractionExecutionStatus extends android.os.IInterface {
+    method public boolean canExecute() throws android.os.RemoteException;
+  }
+
+  public static class IInteractionExecutionStatus.Default implements androidx.test.espresso.remote.IInteractionExecutionStatus {
+    ctor public IInteractionExecutionStatus.Default();
+    method public android.os.IBinder! asBinder();
+    method public boolean canExecute() throws android.os.RemoteException;
+  }
+
+  public abstract static class IInteractionExecutionStatus.Stub extends android.os.Binder implements androidx.test.espresso.remote.IInteractionExecutionStatus {
+    ctor public IInteractionExecutionStatus.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.espresso.remote.IInteractionExecutionStatus! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class IterablesKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> Iterable<T> filter(Iterable<? extends T> iterable, org.hamcrest.Matcher<T> matcher);
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> java.util.List<T> filterToList(Iterable<? extends T> iterable, org.hamcrest.Matcher<T> matcher);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Iterators {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static <T> T[]! toArray(java.util.Iterator<T>!, Class<T>!);
+  }
+
+  public final class StringJoinerKt {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static String joinToString(Iterable<?> iterable, String delimiter);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class Throwables {
+    method public static void throwIfUnchecked(Throwable!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ToStringHelper {
+    ctor public ToStringHelper(Object obj);
+    method public androidx.test.espresso.util.ToStringHelper add(String name, Object? obj);
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/api/current_public.txt b/espresso/core/java/androidx/test/espresso/api/current_public.txt
new file mode 100644
index 000000000..8087bc06d
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/api/current_public.txt
@@ -0,0 +1,875 @@
+// Signature format: 5.0
+package androidx.test.espresso {
+
+  public final class AmbiguousViewMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+  }
+
+  public static class AmbiguousViewMatcherException.Builder {
+    ctor public AmbiguousViewMatcherException.Builder();
+    method public androidx.test.espresso.AmbiguousViewMatcherException! build();
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! from(androidx.test.espresso.AmbiguousViewMatcherException!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! includeViewHierarchy(boolean);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withOtherAmbiguousViews(android.view.View!...!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView1(android.view.View!);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withView2(android.view.View!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.AmbiguousViewMatcherException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.AmbiguousViewMatcherException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View!>!);
+  }
+
+  public final class AppNotIdleException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method @Deprecated public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, int, int);
+    method public static androidx.test.espresso.AppNotIdleException! create(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public class DataInteraction {
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! atPosition(Integer!);
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inAdapterView(org.hamcrest.Matcher<android.view.View!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! onChildView(org.hamcrest.Matcher<android.view.View!>!);
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.DataInteraction! usingAdapterViewProtocol(androidx.test.espresso.action.AdapterViewProtocol!);
+  }
+
+  public static final class DataInteraction.DisplayDataMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View!> {
+    method public void describeTo(org.hamcrest.Description!);
+    method @Deprecated public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<? extends java.lang.Object!>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol);
+    method public static androidx.test.espresso.DataInteraction.DisplayDataMatcher! displayDataMatcher(org.hamcrest.Matcher<android.view.View!>, org.hamcrest.Matcher<? extends java.lang.Object!>, org.hamcrest.Matcher<androidx.test.espresso.Root!>, Integer?, androidx.test.espresso.action.AdapterViewProtocol);
+    method public boolean matchesSafely(android.view.View!);
+  }
+
+  public final class Espresso {
+    method public static void closeSoftKeyboard();
+    method @Deprecated public static java.util.List<androidx.test.espresso.IdlingResource!>! getIdlingResources();
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.DataInteraction! onData(org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static void onIdle();
+    method public static <T> T onIdle(java.util.concurrent.Callable<T>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public static androidx.test.espresso.ViewInteraction! onView(org.hamcrest.Matcher<android.view.View!>!);
+    method public static void openActionBarOverflowOrOptionsMenu(android.content.Context!);
+    method public static void openContextualActionModeOverflowMenu();
+    method public static void pressBack();
+    method public static void pressBackUnconditionally();
+    method @Deprecated public static boolean registerIdlingResources(androidx.test.espresso.IdlingResource!...!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!);
+    method @Deprecated public static void registerLooperAsIdlingResource(android.os.Looper!, boolean);
+    method public static void setFailureHandler(androidx.test.espresso.FailureHandler!);
+    method @Deprecated public static boolean unregisterIdlingResources(androidx.test.espresso.IdlingResource!...!);
+  }
+
+  public interface EspressoException extends androidx.test.platform.TestFrameworkException {
+  }
+
+  public interface FailureHandler {
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class GraphHolder {
+  }
+
+  public final class IdlingPolicies {
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceErrorPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getDynamicIdlingResourceWarningPolicy();
+    method public static androidx.test.espresso.IdlingPolicy! getMasterIdlingPolicy();
+    method public static void setIdlingResourceTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeout(long, java.util.concurrent.TimeUnit!);
+    method public static void setMasterPolicyTimeoutWhenDebuggerAttached(boolean);
+  }
+
+  public final class IdlingPolicy {
+    method public boolean getDisableOnTimeout();
+    method public long getIdleTimeout();
+    method public java.util.concurrent.TimeUnit! getIdleTimeoutUnit();
+    method public boolean getTimeoutIfDebuggerAttached();
+    method public void handleTimeout(java.util.List<java.lang.String!>!, String!);
+  }
+
+  public final class IdlingResourceTimeoutException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public IdlingResourceTimeoutException(java.util.List<java.lang.String!>!);
+  }
+
+  public final class InjectEventSecurityException extends androidx.test.platform.ui.InjectEventSecurityException implements androidx.test.espresso.EspressoException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+    ctor public InjectEventSecurityException(Throwable!);
+  }
+
+  public final class NoActivityResumedException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoActivityResumedException(String!);
+    ctor public NoActivityResumedException(String!, Throwable!);
+  }
+
+  public final class NoMatchingRootException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public static androidx.test.espresso.NoMatchingRootException! create(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, java.util.List<androidx.test.espresso.Root!>!);
+  }
+
+  public final class NoMatchingViewException extends java.lang.RuntimeException implements androidx.test.espresso.RootViewException {
+    method public android.view.View! getRootView();
+    method public String! getViewMatcherDescription();
+  }
+
+  public static class NoMatchingViewException.Builder {
+    ctor public NoMatchingViewException.Builder();
+    method public androidx.test.espresso.NoMatchingViewException! build();
+    method public androidx.test.espresso.NoMatchingViewException.Builder! from(androidx.test.espresso.NoMatchingViewException!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! includeViewHierarchy(boolean);
+    method @Deprecated public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(androidx.test.espresso.util.EspressoOptional<java.lang.String!>!);
+    method @com.google.errorprone.annotations.CanIgnoreReturnValue public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViewWarning(String!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withAdapterViews(java.util.List<android.view.View!>!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withMaxMsgLen(int);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withRootView(android.view.View!);
+    method public androidx.test.espresso.NoMatchingViewException.Builder withViewHierarchyFile(String?);
+    method public androidx.test.espresso.NoMatchingViewException.Builder! withViewMatcher(org.hamcrest.Matcher<? super android.view.View!>!);
+  }
+
+  public final class PerformException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    method public String! getActionDescription();
+    method public String! getViewDescription();
+  }
+
+  public static class PerformException.Builder {
+    ctor public PerformException.Builder();
+    method public androidx.test.espresso.PerformException! build();
+    method public androidx.test.espresso.PerformException.Builder! from(androidx.test.espresso.PerformException!);
+    method public androidx.test.espresso.PerformException.Builder! withActionDescription(String!);
+    method public androidx.test.espresso.PerformException.Builder! withCause(Throwable!);
+    method public androidx.test.espresso.PerformException.Builder! withViewDescription(String!);
+  }
+
+  public final class Root {
+    method public android.view.View! getDecorView();
+    method @Deprecated public androidx.test.espresso.util.EspressoOptional<android.view.WindowManager.LayoutParams!>! getWindowLayoutParams();
+    method public android.view.WindowManager.LayoutParams! getWindowLayoutParams2();
+    method public boolean isReady();
+  }
+
+  public static class Root.Builder {
+    ctor public Root.Builder();
+    method public androidx.test.espresso.Root! build();
+    method public androidx.test.espresso.Root.Builder! withDecorView(android.view.View!);
+    method public androidx.test.espresso.Root.Builder! withWindowLayoutParams(android.view.WindowManager.LayoutParams!);
+  }
+
+  public interface RootViewException extends androidx.test.espresso.EspressoException {
+    method public android.view.View getRootView();
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public default boolean injectMotionEventSequence(Iterable<android.view.MotionEvent!>!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.espresso.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+  public interface ViewAction {
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface ViewAssertion {
+    method public void check(android.view.View!, androidx.test.espresso.NoMatchingViewException!);
+  }
+
+  public interface ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+  public final class ViewInteraction {
+    method public androidx.test.espresso.ViewInteraction! check(androidx.test.espresso.ViewAssertion!);
+    method public androidx.test.espresso.ViewInteraction! inRoot(org.hamcrest.Matcher<androidx.test.espresso.Root!>!);
+    method public androidx.test.espresso.ViewInteraction! noActivity();
+    method public androidx.test.espresso.ViewInteraction! perform(androidx.test.espresso.ViewAction!...!);
+    method public androidx.test.espresso.ViewInteraction! withFailureHandler(androidx.test.espresso.FailureHandler!);
+  }
+
+}
+
+package androidx.test.espresso.action {
+
+  public final class AdapterDataLoaderAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public AdapterDataLoaderAction(org.hamcrest.Matcher<? extends java.lang.Object!>!, androidx.test.espresso.util.EspressoOptional<java.lang.Integer!>!, androidx.test.espresso.action.AdapterViewProtocol!);
+    ctor public AdapterDataLoaderAction(org.hamcrest.Matcher<? extends java.lang.Object!>!, Integer?, androidx.test.espresso.action.AdapterViewProtocol!);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! getAdaptedData();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface AdapterViewProtocol {
+    method public Iterable<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataInAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!);
+    method @Deprecated public androidx.test.espresso.util.EspressoOptional<androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!>! getDataRenderedByView(android.widget.AdapterView<? extends android.widget.Adapter!>!, android.view.View!);
+    method public default androidx.test.espresso.action.AdapterViewProtocol.AdaptedData? getDataRenderedByView2(android.widget.AdapterView<? extends android.widget.Adapter!>!, android.view.View!);
+    method public boolean isDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+    method public void makeDataRenderedWithinAdapterView(android.widget.AdapterView<? extends android.widget.Adapter!>!, androidx.test.espresso.action.AdapterViewProtocol.AdaptedData!);
+  }
+
+  public static class AdapterViewProtocol.AdaptedData {
+    method public Object! getData();
+    field @Deprecated public final Object? data;
+    field public final Object! opaqueToken;
+  }
+
+  public static class AdapterViewProtocol.AdaptedData.Builder {
+    ctor public AdapterViewProtocol.AdaptedData.Builder();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData! build();
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withData(Object?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withDataFunction(androidx.test.espresso.action.AdapterViewProtocol.DataFunction?);
+    method public androidx.test.espresso.action.AdapterViewProtocol.AdaptedData.Builder! withOpaqueToken(Object?);
+  }
+
+  public static interface AdapterViewProtocol.DataFunction {
+    method public Object! getData();
+  }
+
+  public final class AdapterViewProtocols {
+    method public static androidx.test.espresso.action.AdapterViewProtocol! standardProtocol();
+  }
+
+  public final class CaptureToBitmapAction implements androidx.test.espresso.ViewAction {
+    ctor public CaptureToBitmapAction(androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver);
+    method @InaccessibleFromKotlin public androidx.test.espresso.action.ViewActions.BitmapReceiver getBitmapReceiver();
+    method public org.hamcrest.Matcher<android.view.View> getConstraints();
+    method public String getDescription();
+    method public void perform(androidx.test.espresso.UiController uiController, android.view.View view);
+    property public androidx.test.espresso.action.ViewActions.BitmapReceiver bitmapReceiver;
+  }
+
+  public final class CloseKeyboardAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public CloseKeyboardAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface CoordinatesProvider {
+    method public float[]! calculateCoordinates(android.view.View!);
+  }
+
+  public final class EditorAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public EditorAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class EspressoKey {
+    method public int getKeyCode();
+    method public int getMetaState();
+  }
+
+  public static class EspressoKey.Builder {
+    ctor public EspressoKey.Builder();
+    method public androidx.test.espresso.action.EspressoKey! build();
+    method public androidx.test.espresso.action.EspressoKey.Builder! withAltPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withCtrlPressed(boolean);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withKeyCode(int);
+    method public androidx.test.espresso.action.EspressoKey.Builder! withShiftPressed(boolean);
+  }
+
+  public final class GeneralClickAction implements androidx.test.espresso.ViewAction {
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    ctor @Deprecated public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, androidx.test.espresso.ViewAction!);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int);
+    ctor public GeneralClickAction(androidx.test.espresso.action.Tapper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!, int, int, androidx.test.espresso.ViewAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum GeneralLocation implements androidx.test.espresso.action.CoordinatesProvider {
+    method public static androidx.test.espresso.action.CoordinatesProvider translate(androidx.test.espresso.action.CoordinatesProvider, float, float);
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation BOTTOM_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation CENTER_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_CENTER;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_LEFT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation TOP_RIGHT;
+    enum_constant public static final androidx.test.espresso.action.GeneralLocation VISIBLE_CENTER;
+  }
+
+  public final class GeneralSwipeAction implements androidx.test.espresso.ViewAction {
+    ctor public GeneralSwipeAction(androidx.test.espresso.action.Swiper!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.CoordinatesProvider!, androidx.test.espresso.action.PrecisionDescriber!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class KeyEventAction implements androidx.test.espresso.ViewAction {
+    ctor public KeyEventAction(androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class MotionEvents {
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!);
+    method public static android.view.MotionEvent! obtainDownEvent(float[]!, float[]!, int, int);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, float[]);
+    method public static android.view.MotionEvent obtainMovement(android.view.MotionEvent, long, float[]);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, float[]!);
+    method @Deprecated public static android.view.MotionEvent! obtainMovement(long, long, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, float[]!);
+    method public static android.view.MotionEvent! obtainUpEvent(android.view.MotionEvent!, long, float[]!);
+    method public static void sendCancel(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public static androidx.test.espresso.action.MotionEvents.DownResultHolder! sendDown(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+    method public static boolean sendMovement(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!);
+    method public static boolean sendUp(androidx.test.espresso.UiController!, android.view.MotionEvent!, float[]!);
+  }
+
+  public static class MotionEvents.DownResultHolder {
+    field public final android.view.MotionEvent! down;
+    field public final boolean longPress;
+  }
+
+  public final class OpenLinkAction implements androidx.test.espresso.ViewAction {
+    ctor public OpenLinkAction(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface PrecisionDescriber {
+    method public float[]! describePrecision();
+  }
+
+  public enum Press implements androidx.test.espresso.action.PrecisionDescriber {
+    enum_constant public static final androidx.test.espresso.action.Press FINGER;
+    enum_constant public static final androidx.test.espresso.action.Press PINPOINT;
+    enum_constant public static final androidx.test.espresso.action.Press THUMB;
+  }
+
+  public final class PressBackAction implements androidx.test.espresso.ViewAction {
+    ctor public PressBackAction(boolean);
+    ctor public PressBackAction(boolean, androidx.test.espresso.action.EspressoKey!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    field public static final int BACK_ACTIVITY_TRANSITION_MILLIS_DELAY = 150; // 0x96
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_ATTEMPTS = 4; // 0x4
+    field public static final int CLEAR_TRANSITIONING_ACTIVITIES_MILLIS_DELAY = 150; // 0x96
+  }
+
+  public final class RepeatActionUntilViewState implements androidx.test.espresso.ViewAction {
+    ctor protected RepeatActionUntilViewState(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ReplaceTextAction implements androidx.test.espresso.ViewAction {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public ReplaceTextAction(String!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public final class ScrollToAction implements androidx.test.espresso.ViewAction {
+    ctor public ScrollToAction();
+    ctor public ScrollToAction(int);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public enum Swipe implements androidx.test.espresso.action.Swiper {
+    enum_constant public static final androidx.test.espresso.action.Swipe FAST;
+    enum_constant public static final androidx.test.espresso.action.Swipe SLOW;
+  }
+
+  public interface Swiper {
+    method public androidx.test.espresso.action.Swiper.Status! sendSwipe(androidx.test.espresso.UiController!, float[]!, float[]!, float[]!);
+  }
+
+  public enum Swiper.Status {
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Swiper.Status SUCCESS;
+  }
+
+  public enum Tap implements androidx.test.espresso.action.Tapper {
+    enum_constant public static final androidx.test.espresso.action.Tap DOUBLE;
+    enum_constant public static final androidx.test.espresso.action.Tap LONG;
+    enum_constant public static final androidx.test.espresso.action.Tap SINGLE;
+  }
+
+  public interface Tapper {
+    method @Deprecated public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!);
+    method public androidx.test.espresso.action.Tapper.Status! sendTap(androidx.test.espresso.UiController!, float[]!, float[]!, int, int);
+  }
+
+  public enum Tapper.Status {
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status FAILURE;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status SUCCESS;
+    enum_constant public static final androidx.test.espresso.action.Tapper.Status WARNING;
+  }
+
+  public final class TypeTextAction implements androidx.test.espresso.ViewAction {
+    ctor public TypeTextAction(String!);
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TypeTextAction(String!, boolean);
+    ctor public TypeTextAction(String!, boolean, androidx.test.espresso.action.GeneralClickAction!);
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ViewActions {
+    method public static androidx.test.espresso.ViewAction! actionWithAssertions(androidx.test.espresso.ViewAction!);
+    method public static void addGlobalAssertion(String!, androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! captureToBitmap(androidx.test.espresso.action.ViewActions.BitmapReceiver!);
+    method public static void clearGlobalAssertions();
+    method public static androidx.test.espresso.ViewAction! clearText();
+    method public static androidx.test.espresso.ViewAction! click();
+    method public static androidx.test.espresso.ViewAction! click(androidx.test.espresso.ViewAction!);
+    method public static androidx.test.espresso.ViewAction! click(int, int);
+    method public static androidx.test.espresso.ViewAction! closeSoftKeyboard();
+    method public static androidx.test.espresso.ViewAction! doubleClick();
+    method public static androidx.test.espresso.ViewAction! longClick();
+    method public static androidx.test.espresso.ViewAction! openLink(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(String!);
+    method public static androidx.test.espresso.ViewAction! openLinkWithUri(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static androidx.test.espresso.ViewAction! pressBack();
+    method public static androidx.test.espresso.ViewAction! pressBackUnconditionally();
+    method public static androidx.test.espresso.ViewAction! pressImeActionButton();
+    method public static androidx.test.espresso.ViewAction! pressKey(androidx.test.espresso.action.EspressoKey!);
+    method public static androidx.test.espresso.ViewAction! pressKey(int);
+    method public static androidx.test.espresso.ViewAction! pressMenuKey();
+    method public static void removeGlobalAssertion(androidx.test.espresso.ViewAssertion!);
+    method public static androidx.test.espresso.ViewAction! repeatedlyUntil(androidx.test.espresso.ViewAction!, org.hamcrest.Matcher<android.view.View!>!, int);
+    method public static androidx.test.espresso.ViewAction! replaceText(String);
+    method public static androidx.test.espresso.ViewAction! scrollCompletelyTo();
+    method public static androidx.test.espresso.ViewAction! scrollTo();
+    method public static androidx.test.espresso.ViewAction! scrollTo(int);
+    method public static androidx.test.espresso.ViewAction! slowSwipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeDown();
+    method public static androidx.test.espresso.ViewAction! swipeLeft();
+    method public static androidx.test.espresso.ViewAction! swipeRight();
+    method public static androidx.test.espresso.ViewAction! swipeUp();
+    method public static androidx.test.espresso.ViewAction! typeText(String!);
+    method public static androidx.test.espresso.ViewAction! typeTextIntoFocusedView(String!);
+  }
+
+  public static interface ViewActions.BitmapReceiver {
+    method public void onBitmapCaptured(android.graphics.Bitmap!);
+  }
+
+}
+
+package androidx.test.espresso.assertion {
+
+  public final class LayoutAssertions {
+    method public static androidx.test.espresso.ViewAssertion! noEllipsizedText();
+    method public static androidx.test.espresso.ViewAssertion! noMultilineButtons();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps();
+    method public static androidx.test.espresso.ViewAssertion! noOverlaps(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class PositionAssertions {
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isBottomAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isCompletelyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isLeftAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyAbove(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyBelow(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyLeftOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isPartiallyRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isRightAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+    method @Deprecated public static androidx.test.espresso.ViewAssertion! isRightOf(org.hamcrest.Matcher<android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! isTopAlignedWith(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public final class ViewAssertions {
+    method public static androidx.test.espresso.ViewAssertion! doesNotExist();
+    method public static androidx.test.espresso.ViewAssertion! matches(org.hamcrest.Matcher<? super android.view.View!>!);
+    method public static androidx.test.espresso.ViewAssertion! selectedDescendantsMatch(org.hamcrest.Matcher<android.view.View!>!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+}
+
+package androidx.test.espresso.base {
+
+  public interface ActiveRootLister {
+    method public java.util.List<androidx.test.espresso.Root!>! listActiveRoots();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface Default {
+  }
+
+  public final class DefaultFailureHandler implements androidx.test.espresso.FailureHandler {
+    ctor public DefaultFailureHandler(android.content.Context!);
+    ctor public DefaultFailureHandler(android.content.Context!, boolean);
+    method public void handle(Throwable!, org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  @javax.inject.Singleton public final class IdlingResourceRegistry {
+    ctor public IdlingResourceRegistry(android.os.Looper!);
+    method public java.util.List<androidx.test.espresso.IdlingResource!>! getResources();
+    method public void registerLooper(android.os.Looper!, boolean);
+    method public boolean registerResources(java.util.List<? extends androidx.test.espresso.IdlingResource!>!);
+    method public void sync(Iterable<androidx.test.espresso.IdlingResource!>!, Iterable<android.os.Looper!>!);
+    method public boolean unregisterResources(java.util.List<? extends androidx.test.espresso.IdlingResource!>!);
+  }
+
+  public interface IdlingUiController extends androidx.test.espresso.UiController {
+    method public androidx.test.espresso.base.IdlingResourceRegistry! getIdlingResourceRegistry();
+  }
+
+  public interface InterruptableUiController extends androidx.test.espresso.UiController {
+    method public void interruptEspressoTasks();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @javax.inject.Qualifier public @interface MainThread {
+  }
+
+  @dagger.Module public class PlatformTestStorageModule {
+    ctor public PlatformTestStorageModule();
+  }
+
+  @androidx.test.espresso.base.RootViewPickerScope public final class RootViewPicker implements javax.inject.Provider<android.view.View!> {
+    method public android.view.View! get();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @javax.inject.Scope public @interface RootViewPickerScope {
+  }
+
+  public final class ViewFinderImpl implements androidx.test.espresso.ViewFinder {
+    method public android.view.View! getView() throws androidx.test.espresso.AmbiguousViewMatcherException, androidx.test.espresso.NoMatchingViewException;
+  }
+
+}
+
+package androidx.test.espresso.core.internal.deps.guava.base {
+
+  @Deprecated public interface Function<F, T> {
+    method @Deprecated public T apply(F);
+  }
+
+  @Deprecated public class Optional<T> implements java.io.Serializable {
+    method @Deprecated public java.util.Set<T>! asSet();
+    method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! fromNullable(T?);
+    method @Deprecated public T get();
+    method @Deprecated public boolean isPresent();
+    method @Deprecated public static <T> androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! of(T);
+    method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<T>!);
+    method @Deprecated public T or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<T>!);
+    method @Deprecated public T or(T);
+    method @Deprecated public T orNull();
+    method @Deprecated public static <T> Iterable<T>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T>!>!);
+    method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T,V>!);
+  }
+
+  @Deprecated public interface Supplier<T> {
+    method @Deprecated public T get();
+  }
+
+}
+
+package androidx.test.espresso.matcher {
+
+  public abstract class BoundedDiagnosingMatcher<S, T extends S> extends org.hamcrest.BaseMatcher<S> {
+    ctor public BoundedDiagnosingMatcher(Class<? extends S>!);
+    ctor public BoundedDiagnosingMatcher(Class<? extends S>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
+    method public final void describeMismatch(Object!, org.hamcrest.Description!);
+    method protected abstract void describeMoreTo(org.hamcrest.Description!);
+    method public final void describeTo(org.hamcrest.Description!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(T, org.hamcrest.Description!);
+  }
+
+  public abstract class BoundedMatcher<T, S extends T> extends org.hamcrest.BaseMatcher<T> {
+    ctor public BoundedMatcher(Class<? extends S>!);
+    ctor public BoundedMatcher(Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!, Class<? extends java.lang.Object!>!...!);
+    method public final boolean matches(Object!);
+    method protected abstract boolean matchesSafely(S);
+  }
+
+  public final class CursorMatchers {
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(int, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, byte[]!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(String!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowBlob(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<byte[]!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(int, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, double);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(String!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowDouble(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Double!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(int, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, float);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(String!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowFloat(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Float!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(int, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, int);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(String!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowInt(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(int, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, long);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(String!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowLong(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Long!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(int, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(String!, short);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowShort(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.Short!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(int, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, String!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(String!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withRowString(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public static class CursorMatchers.CursorMatcher extends androidx.test.espresso.matcher.BoundedMatcher<java.lang.Object!,android.database.Cursor!> {
+    method public void describeTo(org.hamcrest.Description!);
+    method public boolean matchesSafely(android.database.Cursor!);
+    method public androidx.test.espresso.matcher.CursorMatchers.CursorMatcher! withStrictColumnChecks(boolean);
+  }
+
+  public final class HasBackgroundMatcher extends org.hamcrest.TypeSafeMatcher<android.view.View!> {
+    ctor public HasBackgroundMatcher(int);
+    method public void describeTo(org.hamcrest.Description!);
+    method protected boolean matchesSafely(android.view.View!);
+  }
+
+  public final class LayoutMatchers {
+    method public static org.hamcrest.Matcher<android.view.View!>! hasEllipsizedText();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMultilineText();
+  }
+
+  public final class PreferenceMatchers {
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummary(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withSummaryText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitle(int);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(String!);
+    method public static org.hamcrest.Matcher<android.preference.Preference!>! withTitleText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public final class RootMatchers {
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! hasWindowLayoutParams();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isDialog();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isFocusable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isPlatformPopup();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isSystemAlertWindow();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! isTouchable();
+    method public static org.hamcrest.Matcher<androidx.test.espresso.Root!>! withDecorView(org.hamcrest.Matcher<android.view.View!>!);
+    field public static final org.hamcrest.Matcher<androidx.test.espresso.Root!>! DEFAULT;
+  }
+
+  public final class ViewMatchers {
+    method public static <T> void assertThat(String!, T, org.hamcrest.Matcher<T>!);
+    method public static <T> void assertThat(T, org.hamcrest.Matcher<T>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! doesNotHaveFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasBackground(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasContentDescription();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasDescendant(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasErrorText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasFocus();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasImeAction(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasLinks();
+    method public static org.hamcrest.Matcher<android.view.View!>! hasMinimumChildCount(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasSibling(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! hasTextColor(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isActivated();
+    method public static org.hamcrest.Matcher<android.view.View!>! isAssignableFrom(Class<? extends android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isCompletelyDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDescendantOfA(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayed();
+    method public static org.hamcrest.Matcher<android.view.View!>! isDisplayingAtLeast(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! isEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isJavascriptEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotActivated();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotChecked();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotClickable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotEnabled();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocusable();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotFocused();
+    method public static org.hamcrest.Matcher<android.view.View!>! isNotSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! isRoot();
+    method public static org.hamcrest.Matcher<android.view.View!>! isSelected();
+    method public static org.hamcrest.Matcher<android.view.View!>! supportsInputMethods();
+    method public static org.hamcrest.Matcher<android.view.View!>! withAlpha(float);
+    method public static org.hamcrest.Matcher<android.view.View!>! withChild(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withContentDescription(org.hamcrest.Matcher<? extends java.lang.CharSequence!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withEffectiveVisibility(androidx.test.espresso.matcher.ViewMatchers.Visibility!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withHint(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withId(org.hamcrest.Matcher<java.lang.Integer!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withInputType(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParent(org.hamcrest.Matcher<android.view.View!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withParentIndex(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withResourceName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSpinnerText(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withSubstring(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagKey(int, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withTagValue(org.hamcrest.Matcher<java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(int);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(String!);
+    method public static org.hamcrest.Matcher<android.view.View!>! withText(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public enum ViewMatchers.Visibility {
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(android.view.View!);
+    method public static androidx.test.espresso.matcher.ViewMatchers.Visibility! forViewVisibility(int);
+    method public int getValue();
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility GONE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility INVISIBLE;
+    enum_constant public static final androidx.test.espresso.matcher.ViewMatchers.Visibility VISIBLE;
+  }
+
+}
+
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<? extends java.lang.Object!>, Class<? extends java.lang.annotation.Annotation!>?, Class<? extends java.lang.Object!>!...?);
+    method public Object! invokeConstructor(java.lang.Object!...!);
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T fromProto(M);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M toProto();
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public boolean isRemoteProcess();
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public default boolean isRemoteClient();
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+}
+
+package androidx.test.espresso.remote.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.CONSTRUCTOR}) public @interface RemoteMsgConstructor {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD}) public @interface RemoteMsgField {
+    method public abstract int order();
+  }
+
+}
+
+package androidx.test.espresso.util {
+
+  public final class ActivityLifecycles {
+    method public static boolean hasForegroundActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasTransitioningActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+    method public static boolean hasVisibleActivities(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  @Deprecated public final class EspressoOptional<T> {
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T>! absent();
+    method @Deprecated public java.util.Set<T>! asSet();
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T>! fromNullable(T);
+    method @Deprecated public T get();
+    method @Deprecated public boolean isPresent();
+    method @Deprecated public static <T> androidx.test.espresso.util.EspressoOptional<T>! of(T);
+    method @Deprecated public androidx.test.espresso.core.internal.deps.guava.base.Optional<T>! or(androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T>!);
+    method @Deprecated public T or(androidx.test.espresso.core.internal.deps.guava.base.Supplier<? extends T>!);
+    method @Deprecated public T or(T);
+    method @Deprecated public T orNull();
+    method @Deprecated public static <T> Iterable<T>! presentInstances(Iterable<? extends androidx.test.espresso.core.internal.deps.guava.base.Optional<? extends T>!>!);
+    method @Deprecated public <V> androidx.test.espresso.core.internal.deps.guava.base.Optional<V>! transform(androidx.test.espresso.core.internal.deps.guava.base.Function<? super T,V>!);
+  }
+
+  public final class HumanReadables {
+    method public static String! describe(android.database.Cursor!);
+    method public static String! describe(android.view.View!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!);
+    method public static String! getViewHierarchyErrorMessage(android.view.View!, java.util.List<android.view.View!>!, String!, String!, int);
+  }
+
+  public final class TreeIterables {
+    method public static Iterable<android.view.View!>! breadthFirstViewTraversal(android.view.View!);
+    method public static Iterable<android.view.View!>! depthFirstViewTraversal(android.view.View!);
+    method public static Iterable<androidx.test.espresso.util.TreeIterables.ViewAndDistance!>! depthFirstViewTraversalWithDistance(android.view.View!);
+  }
+
+  public static class TreeIterables.ViewAndDistance {
+    method public int getDistanceFromRoot();
+    method public android.view.View! getView();
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/assertion/BUILD b/espresso/core/java/androidx/test/espresso/assertion/BUILD
new file mode 100644
index 000000000..174cc2906
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/assertion/BUILD
@@ -0,0 +1,35 @@
+# Description:
+#  View Assertions for New UI Test API.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "assertion",
+    srcs = glob(
+        ["*.java"],
+    ),
+    exports = [
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/assertion/BUILD.bazel b/espresso/core/java/androidx/test/espresso/assertion/BUILD.bazel
deleted file mode 100644
index 32f238803..000000000
--- a/espresso/core/java/androidx/test/espresso/assertion/BUILD.bazel
+++ /dev/null
@@ -1,45 +0,0 @@
-# Description:
-#  View Assertions for New UI Test API.
-licenses(["notice"])
-
-package(default_visibility = ["//visibility:public"])
-
-REMOTE_VIEW_ASSERTIONS = [
-    "RemoteViewAssertions.java",
-    "*RemoteMessage.java",
-]
-
-android_library(
-    name = "assertion",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_VIEW_ASSERTIONS,
-    ),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library(
-    name = "remote_view_assertions",
-    srcs = glob(
-        REMOTE_VIEW_ASSERTIONS,
-    ),
-    deps = [
-        ":assertion",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso/proto/assertion:ui_interaction_view_assertions_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "@maven//:com_google_guava_guava",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/assertion/LayoutAssertions.java b/espresso/core/java/androidx/test/espresso/assertion/LayoutAssertions.java
index 13a5eb228..cd5bcd043 100644
--- a/espresso/core/java/androidx/test/espresso/assertion/LayoutAssertions.java
+++ b/espresso/core/java/androidx/test/espresso/assertion/LayoutAssertions.java
@@ -23,7 +23,7 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
 import static androidx.test.espresso.util.HumanReadables.describe;
 import static androidx.test.espresso.util.TreeIterables.breadthFirstViewTraversal;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.not;
@@ -39,8 +39,7 @@
 import androidx.test.espresso.matcher.ViewMatchers.Visibility;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
+import androidx.test.espresso.util.IterablesKt;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -109,24 +108,14 @@ private NoOverlapsViewAssertion(Matcher<View> selector) {
       this.selector = selector;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void check(View view, NoMatchingViewException noViewException) {
-
-      final Predicate<View> viewPredicate =
-          new Predicate<View>() {
-            @Override
-            public boolean apply(View input) {
-              return selector.matches(input);
-            }
-          };
-
       if (noViewException != null) {
         throw noViewException;
       }
 
       Iterator<View> selectedViewIterator =
-          Iterables.filter(breadthFirstViewTraversal(view), viewPredicate).iterator();
+          IterablesKt.filter(breadthFirstViewTraversal(view), selector).iterator();
 
       List<View> prevViews = new LinkedList<>();
       StringBuilder errorMessage = new StringBuilder();
diff --git a/espresso/core/java/androidx/test/espresso/assertion/PositionAssertions.java b/espresso/core/java/androidx/test/espresso/assertion/PositionAssertions.java
index 4bbb791f5..f52830f54 100644
--- a/espresso/core/java/androidx/test/espresso/assertion/PositionAssertions.java
+++ b/espresso/core/java/androidx/test/espresso/assertion/PositionAssertions.java
@@ -18,7 +18,7 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
 import static androidx.test.espresso.util.TreeIterables.breadthFirstViewTraversal;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.is;
 
 import android.util.Log;
@@ -29,10 +29,8 @@
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
+import androidx.test.espresso.util.IterablesKt;
+import androidx.test.espresso.util.Iterators;
 import java.util.Iterator;
 import java.util.Locale;
 import org.hamcrest.Matcher;
@@ -297,17 +295,10 @@ foundView, findView(viewMatcher, getTopViewGroup(foundView)), position),
 
   // Helper methods
   static View findView(final Matcher<View> toView, View root) {
-    Preconditions.checkNotNull(toView);
-    Preconditions.checkNotNull(root);
-    final Predicate<View> viewPredicate =
-        new Predicate<View>() {
-          @Override
-          public boolean apply(View input) {
-            return toView.matches(input);
-          }
-        };
+    checkNotNull(toView);
+    checkNotNull(root);
     Iterator<View> matchedViewIterator =
-        Iterables.filter(breadthFirstViewTraversal(root), viewPredicate).iterator();
+        IterablesKt.filter(breadthFirstViewTraversal(root), toView).iterator();
     View matchedView = null;
     while (matchedViewIterator.hasNext()) {
       if (matchedView != null) {
diff --git a/espresso/core/java/androidx/test/espresso/assertion/ViewAssertions.java b/espresso/core/java/androidx/test/espresso/assertion/ViewAssertions.java
index ddb3bf8e8..804c85bda 100644
--- a/espresso/core/java/androidx/test/espresso/assertion/ViewAssertions.java
+++ b/espresso/core/java/androidx/test/espresso/assertion/ViewAssertions.java
@@ -18,7 +18,7 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
 import static androidx.test.espresso.util.TreeIterables.breadthFirstViewTraversal;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.is;
 
 import android.view.View;
@@ -28,9 +28,7 @@
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
+import androidx.test.espresso.util.IterablesKt;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -134,21 +132,12 @@ private SelectedDescendantsMatchViewAssertion(
       this.matcher = matcher;
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void check(View view, NoMatchingViewException noViewException) {
-      Preconditions.checkNotNull(view);
-
-      final Predicate<View> viewPredicate =
-          new Predicate<View>() {
-            @Override
-            public boolean apply(View input) {
-              return selector.matches(input);
-            }
-          };
+      checkNotNull(view);
 
       Iterator<View> selectedViewIterator =
-          Iterables.filter(breadthFirstViewTraversal(view), viewPredicate).iterator();
+          IterablesKt.filter(breadthFirstViewTraversal(view), selector).iterator();
 
       List<View> nonMatchingViews = new ArrayList<>();
       while (selectedViewIterator.hasNext()) {
diff --git a/espresso/core/java/androidx/test/espresso/base/AsyncTaskPoolMonitor.java b/espresso/core/java/androidx/test/espresso/base/AsyncTaskPoolMonitor.java
index f44b96d4a..3037adece 100644
--- a/espresso/core/java/androidx/test/espresso/base/AsyncTaskPoolMonitor.java
+++ b/espresso/core/java/androidx/test/espresso/base/AsyncTaskPoolMonitor.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
diff --git a/espresso/core/java/androidx/test/espresso/base/BUILD b/espresso/core/java/androidx/test/espresso/base/BUILD
new file mode 100644
index 000000000..7b2aa881c
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/base/BUILD
@@ -0,0 +1,114 @@
+# Description:
+#  Base package for espresso.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
+)
+
+android_library(
+    name = "base",
+    srcs = glob(
+        ["*.java"],
+        exclude = [
+            "AssertionErrorHandler.java",
+            "DefaultFailureHandler.java",
+            "EspressoExceptionHandler.java",
+            "PerformExceptionHandler.java",
+            "ThrowableHandler.java",
+            "IdleNotifier.java",
+            "IdlingUiController.java",
+            "IdlingResourceRegistry.java",
+            "Interrogator.java",
+            "LooperIdlingResourceInterrogationHandler.java",
+            "TestLooperManagerCompat.java",
+            "ViewHierarchyExceptionHandler.java",
+        ],
+    ),
+    deps = [
+        ":default_failure_handler",
+        ":idling_resource_registry",
+        ":idling_uicontroller_interface",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/internal/inject",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
+        "//opensource/androidx:annotation",
+        "//opensource/dagger",
+        "//runner/android_junit_runner",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "active_root_lister",
+    srcs = ["ActiveRootLister.java"],
+    visibility = [
+        "//espresso/core/java/androidx/test/espresso:espresso_first_party",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:interface",
+    ],
+)
+
+android_library(
+    name = "idling_resource_registry",
+    srcs = [
+        "IdleNotifier.java",
+        "IdlingResourceRegistry.java",
+        "Interrogator.java",
+        "LooperIdlingResourceInterrogationHandler.java",
+        "TestLooperManagerCompat.java",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+android_library(
+    name = "idling_uicontroller_interface",
+    srcs = ["IdlingUiController.java"],
+    deps = [
+        ":idling_resource_registry",
+        "//espresso/core/java/androidx/test/espresso:interface",
+    ],
+)
+
+android_library(
+    name = "default_failure_handler",
+    srcs = [
+        "AssertionErrorHandler.java",
+        "DefaultFailureHandler.java",
+        "EspressoExceptionHandler.java",
+        "PerformExceptionHandler.java",
+        "ThrowableHandler.java",
+        "ViewHierarchyExceptionHandler.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/internal/inject",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
+        "//opensource/dagger",
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/base/BUILD.bazel b/espresso/core/java/androidx/test/espresso/base/BUILD.bazel
deleted file mode 100644
index 7a1382149..000000000
--- a/espresso/core/java/androidx/test/espresso/base/BUILD.bazel
+++ /dev/null
@@ -1,112 +0,0 @@
-# Description:
-#  Base package for espresso.
-
-licenses(["notice"])
-
-package(default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"])
-
-android_library(
-    name = "base",
-    srcs = glob(
-        ["*.java"],
-        exclude = [
-            "AssertionErrorHandler.java",
-            "DefaultFailureHandler.java",
-            "EspressoExceptionHandler.java",
-            "PerformExceptionHandler.java",
-            "ThrowableHandler.java",
-            "IdlingUiController.java",
-            "IdlingResourceRegistry.java",
-            "LooperIdlingResourceInterrogationHandler.java",
-            "NoMatchingViewExceptionHandler.java",
-        ],
-    ),
-    plugins = ["//opensource/dagger:dagger_plugin"],
-    deps = [
-        ":default_failure_handler",
-        ":idling_resource_registry",
-        ":idling_uicontroller_interface",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/internal/inject",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_dagger_dagger",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:javax_inject_javax_inject",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library(
-    name = "active_root_lister",
-    srcs = ["ActiveRootLister.java"],
-    deps = [
-        "//espresso/core/java/androidx/test/espresso:interface",
-    ],
-)
-
-android_library(
-    name = "idling_resource_registry",
-    srcs = [
-        "IdleNotifier.java",
-        "IdlingResourceRegistry.java",
-        "Interrogator.java",
-        "LooperIdlingResourceInterrogationHandler.java",
-    ],
-    deps = [
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource",
-        "@maven//:com_google_dagger_dagger",
-        "@maven//:com_google_guava_guava",
-        "@maven//:javax_annotation_javax_annotation_api",
-        "@maven//:javax_inject_javax_inject",
-    ],
-)
-
-android_library(
-    name = "idling_uicontroller_interface",
-    srcs = ["IdlingUiController.java"],
-    deps = [
-        ":idling_resource_registry",
-        "//espresso/core/java/androidx/test/espresso:interface",
-    ],
-)
-
-android_library(
-    name = "default_failure_handler",
-    srcs = [
-        "AssertionErrorHandler.java",
-        "DefaultFailureHandler.java",
-        "EspressoExceptionHandler.java",
-        "NoMatchingViewExceptionHandler.java",
-        "PerformExceptionHandler.java",
-        "ThrowableHandler.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/internal/inject",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//runner/monitor/java/androidx/test:monitor",
-        "@maven//:com_google_dagger_dagger",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:javax_annotation_javax_annotation_api",
-        "@maven//:javax_inject_javax_inject",
-        "@maven//:junit_junit",
-    ],
-)
-
-filegroup(
-    name = "espresso_base_src",
-    srcs = [
-        ":libactive_root_lister-src.jar",
-        ":libbase-src.jar",
-        ":libdefault_failure_handler-src.jar",
-        ":libidling_resource_registry-src.jar",
-        ":libidling_uicontroller_interface-src.jar",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/base/BaseLayerModule.java b/espresso/core/java/androidx/test/espresso/base/BaseLayerModule.java
index 258e5f4de..011b9d63d 100644
--- a/espresso/core/java/androidx/test/espresso/base/BaseLayerModule.java
+++ b/espresso/core/java/androidx/test/espresso/base/BaseLayerModule.java
@@ -17,23 +17,22 @@
 package androidx.test.espresso.base;
 
 import android.content.Context;
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.espresso.FailureHandler;
 import androidx.test.espresso.IdlingRegistry;
 import androidx.test.espresso.base.IdlingResourceRegistry.IdleNotificationCallback;
 import androidx.test.espresso.internal.inject.TargetContext;
+import androidx.test.espresso.util.concurrent.ListeningExecutorService;
+import androidx.test.espresso.util.concurrent.ThreadFactoryBuilder;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
 import androidx.test.internal.platform.os.ControlledLooper;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.platform.io.PlatformTestStorage;
+import androidx.test.platform.tracing.Tracing;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import dagger.Module;
 import dagger.Provides;
 import java.util.concurrent.Executor;
@@ -49,6 +48,7 @@
  *
  * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 @Module(includes = {PlatformTestStorageModule.class})
 public class BaseLayerModule {
 
@@ -74,9 +74,9 @@ public Looper provideMainLooper() {
   @CompatAsyncTask
   public IdleNotifier<Runnable> provideCompatAsyncTaskMonitor(
       ThreadPoolExecutorExtractor extractor) {
-    Optional<ThreadPoolExecutor> compatThreadPool = extractor.getCompatAsyncTaskThreadPool();
-    if (compatThreadPool.isPresent()) {
-      return new AsyncTaskPoolMonitor(compatThreadPool.get()).asIdleNotifier();
+    ThreadPoolExecutor compatThreadPool = extractor.getCompatAsyncTaskThreadPool();
+    if (compatThreadPool != null) {
+      return new AsyncTaskPoolMonitor(compatThreadPool).asIdleNotifier();
     } else {
       return new NoopRunnableIdleNotifier();
     }
@@ -120,28 +120,12 @@ public ActiveRootLister provideActiveRootLister(RootsOracle rootsOracle) {
   @Provides
   @Singleton
   public EventInjector provideEventInjector() {
-    // On API 16 and above, android uses input manager to inject events. On API < 16,
-    // they use Window Manager. So we need to create our InjectionStrategy depending on the api
-    // level. Instrumentation does not check if the event presses went through by checking the
+    // Android uses input manager to inject events.
+    // Instrumentation does not check if the event presses went through by checking the
     // boolean return value of injectInputEvent, which is why we created this class to better
     // handle lost/dropped press events. Instrumentation cannot be used as a fallback strategy,
     // since this will be executed on the main thread.
-    int sdkVersion = Build.VERSION.SDK_INT;
-    EventInjectionStrategy injectionStrategy = null;
-    if (sdkVersion >= 16) { // Use InputManager for API level 16 and up.
-      InputManagerEventInjectionStrategy strategy = new InputManagerEventInjectionStrategy();
-      strategy.initialize();
-      injectionStrategy = strategy;
-    } else if (sdkVersion >= 7) {
-      // else Use WindowManager for API level 15 through 7.
-      WindowManagerEventInjectionStrategy strategy = new WindowManagerEventInjectionStrategy();
-      strategy.initialize();
-      injectionStrategy = strategy;
-    } else {
-      throw new RuntimeException(
-          "API Level 6 and below is not supported. You are running: " + sdkVersion);
-    }
-    return new EventInjector(injectionStrategy);
+    return new EventInjector(new InputManagerEventInjectionStrategy());
   }
 
   /** Holder for AtomicReference<FailureHandler> which allows updating it at runtime. */
@@ -171,7 +155,7 @@ FailureHandler provideFailureHandler(FailureHandlerHolder holder) {
   @Provides
   @Singleton
   public ListeningExecutorService provideRemoteExecutor() {
-    return MoreExecutors.listeningDecorator(
+    return new ListeningExecutorService(
         new ThreadPoolExecutor(
             0 /*corePoolSize*/,
             5 /*maximumPoolSize*/,
@@ -188,9 +172,8 @@ FailureHandler provideFailureHander(DefaultFailureHandler impl) {
   }
 
   @Provides
-  DefaultFailureHandler provideDefaultFailureHander(
-      @TargetContext Context context, PlatformTestStorage testStorage) {
-    return new DefaultFailureHandler(context, testStorage);
+  DefaultFailureHandler provideDefaultFailureHander(@TargetContext Context context) {
+    return new DefaultFailureHandler(context, true);
   }
 
   @Provides
@@ -200,4 +183,10 @@ public ControlledLooper provideControlledLooper() {
     return ServiceLoaderWrapper.loadSingleService(
         ControlledLooper.class, () -> ControlledLooper.NO_OP_CONTROLLED_LOOPER);
   }
+
+  @Provides
+  @Singleton
+  Tracing providesTracing() {
+    return Tracing.getInstance();
+  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java b/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java
new file mode 100644
index 000000000..d976c3602
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/base/ConfigurationSynchronizationUtils.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.base;
+
+import static java.util.Collections.unmodifiableList;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+import androidx.test.espresso.NoActivityResumedException;
+import androidx.test.espresso.UiController;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/** Helper methods to synchronize configuration changes with onView actions. */
+final class ConfigurationSynchronizationUtils {
+  private static final String TAG = ConfigurationSynchronizationUtils.class.getSimpleName();
+  private static final List<Integer> ORIENTATION_WAIT_TIMES =
+      unmodifiableList(Arrays.asList(10, 50, 100, 250, 500, 2000 /* 2sec */));
+
+  private ConfigurationSynchronizationUtils() {}
+
+  /**
+   * Wait for configuration changes to finish on the activity if there are any in progress.
+   *
+   * @param currentActivity the Activity to check for configuration changes in progress.
+   * @param uiController used to loop the main thread while configuration changes occur.
+   * @param appContext the application's context
+   */
+  public static void waitForConfigurationChangesOnActivity(
+      Activity currentActivity, UiController uiController, Context appContext) {
+    // The activity's orientation can differ from application's orientation when the activity is in
+    // multi-window mode.
+    if (Build.VERSION.SDK_INT >= 24 && currentActivity.isInMultiWindowMode()) {
+      return;
+    }
+    // If the application is running activities in different processes, activities that aren't
+    // on the main process may have a different orientation
+    if (Build.VERSION.SDK_INT >= 28
+        && !Objects.equals(
+            currentActivity.getApplicationInfo().processName, Application.getProcessName())) {
+      return;
+    }
+
+    int applicationOrientation = appContext.getResources().getConfiguration().orientation;
+    if (applicationOrientation != currentActivity.getResources().getConfiguration().orientation) {
+      for (long waitTime : ORIENTATION_WAIT_TIMES) {
+        Log.w(
+            TAG,
+            "Activity's orientation does not match the application's - waiting: "
+                + waitTime
+                + "ms for orientation to update.");
+        uiController.loopMainThreadForAtLeast(waitTime);
+        if (applicationOrientation
+            == currentActivity.getResources().getConfiguration().orientation) {
+          return;
+        }
+      }
+
+      throw new NoActivityResumedException(
+          "Timed out waiting for Activity's orientation to update.");
+    }
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/base/DefaultFailureHandler.java b/espresso/core/java/androidx/test/espresso/base/DefaultFailureHandler.java
index d05c85c43..665712eff 100644
--- a/espresso/core/java/androidx/test/espresso/base/DefaultFailureHandler.java
+++ b/espresso/core/java/androidx/test/espresso/base/DefaultFailureHandler.java
@@ -16,23 +16,26 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.content.Context;
+import android.util.Log;
 import android.view.View;
+import androidx.test.core.app.DeviceCapture;
+import androidx.test.core.graphics.BitmapStorage;
+import androidx.test.espresso.AmbiguousViewMatcherException;
 import androidx.test.espresso.EspressoException;
 import androidx.test.espresso.FailureHandler;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.PerformException;
+import androidx.test.espresso.base.ViewHierarchyExceptionHandler.Truncater;
 import androidx.test.espresso.internal.inject.TargetContext;
 import androidx.test.internal.platform.util.TestOutputEmitter;
-import androidx.test.platform.io.PlatformTestStorage;
-import androidx.test.platform.io.PlatformTestStorageRegistry;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
 import junit.framework.AssertionFailedError;
 import org.hamcrest.Matcher;
 
@@ -44,13 +47,15 @@ public final class DefaultFailureHandler implements FailureHandler {
 
   private static final AtomicInteger failureCount = new AtomicInteger(0);
   private final List<FailureHandler> handlers = new ArrayList<>();
+  private final boolean captureScreenshotOnFailure;
 
   public DefaultFailureHandler(@TargetContext Context appContext) {
-    this(appContext, PlatformTestStorageRegistry.getInstance());
+    this(appContext, true);
   }
 
-  @Inject
-  DefaultFailureHandler(@TargetContext Context appContext, PlatformTestStorage testStorage) {
+  public DefaultFailureHandler(
+      @TargetContext Context appContext, boolean captureScreenshotOnFailure) {
+
     // Adds a chain of exception handlers.
     // Order matters and a matching failure handler in the chain will throw after the exception is
     // handled. Always adds the handler of the child class ahead of its superclasses to make sure
@@ -61,9 +66,17 @@ public DefaultFailureHandler(@TargetContext Context appContext) {
     // PerformException ---------> EspressoException
     //                  ---------> Throwable
     // AssertionError ----------->
+    this.captureScreenshotOnFailure = captureScreenshotOnFailure;
+    handlers.add(
+        new ViewHierarchyExceptionHandler<>(
+            failureCount,
+            NoMatchingViewException.class,
+            getNoMatchingViewExceptionTruncater()));
     handlers.add(
-        new NoMatchingViewExceptionHandler(
-            testStorage, failureCount, NoMatchingViewException.class));
+        new ViewHierarchyExceptionHandler<>(
+            failureCount,
+            AmbiguousViewMatcherException.class,
+            getAmbiguousViewMatcherExceptionTruncater()));
     handlers.add(new PerformExceptionHandler(checkNotNull(appContext), PerformException.class));
     // On API 15, junit.framework.AssertionFailedError is not a subclass of AssertionError.
     handlers.add(new AssertionErrorHandler(AssertionFailedError.class, AssertionError.class));
@@ -71,11 +84,35 @@ public DefaultFailureHandler(@TargetContext Context appContext) {
     handlers.add(new ThrowableHandler());
   }
 
+  static Truncater<NoMatchingViewException> getNoMatchingViewExceptionTruncater() {
+    return (exception, msgLen, viewHierarchyFile) ->
+        new NoMatchingViewException.Builder()
+            .from(exception)
+            .withMaxMsgLen(msgLen)
+            .withViewHierarchyFile(viewHierarchyFile)
+            .build();
+  }
+
+  static Truncater<AmbiguousViewMatcherException> getAmbiguousViewMatcherExceptionTruncater() {
+    return (exception, msgLen, viewHierarchyFile) ->
+        new AmbiguousViewMatcherException.Builder()
+            .from(exception)
+            .withMaxMsgLen(msgLen)
+            .withViewHierarchyFile(viewHierarchyFile)
+            .build();
+  }
+
   @Override
   public void handle(Throwable error, Matcher<View> viewMatcher) {
     int count = failureCount.incrementAndGet();
-    TestOutputEmitter.takeScreenshot("view-op-error-" + count + ".png");
-    TestOutputEmitter.captureWindowHierarchy("explore-window-hierarchy-" + count + ".xml");
+    try {
+      TestOutputEmitter.captureWindowHierarchy("explore-window-hierarchy-" + count + ".xml");
+      takeScreenshot("view-op-error-" + count);
+    } catch (RuntimeException screenshotException) {
+      // Ensure that the root cause exception is surfaced, not an auxiliary exception that may occur
+      // during the capture/screenshot process.
+      error.addSuppressed(screenshotException);
+    }
 
     // Iterates through the list of handlers to handle the exception, but at most one handler will
     // update the exception and throw at the end of the handling.
@@ -84,6 +121,21 @@ public void handle(Throwable error, Matcher<View> viewMatcher) {
     }
   }
 
+  private void takeScreenshot(String outputName) {
+    if (!captureScreenshotOnFailure) {
+      return;
+    }
+    try {
+      if (DeviceCapture.canTakeScreenshot()) {
+        BitmapStorage.writeToTestStorage(DeviceCapture.takeScreenshotNoSync(), outputName);
+      } else {
+        TestOutputEmitter.takeScreenshot(outputName + ".png");
+      }
+    } catch (RuntimeException | Error | IOException e) {
+      Log.w("DefaultFailureHandler", "Failed to take screenshot", e);
+    }
+  }
+
   /** Handles failure for given types of exceptions. Does nothing if the types do not match. */
   abstract static class TypedFailureHandler<T> implements FailureHandler {
     private final List<Class<?>> acceptedTypes;
@@ -113,3 +165,4 @@ public void handle(Throwable error, Matcher<View> viewMatcher) {
     abstract void handleSafely(T error, Matcher<View> viewMatcher);
   }
 }
+
diff --git a/espresso/core/java/androidx/test/espresso/base/EspressoExceptionHandler.java b/espresso/core/java/androidx/test/espresso/base/EspressoExceptionHandler.java
index 92f2c8ddc..61ff10055 100644
--- a/espresso/core/java/androidx/test/espresso/base/EspressoExceptionHandler.java
+++ b/espresso/core/java/androidx/test/espresso/base/EspressoExceptionHandler.java
@@ -15,7 +15,7 @@
  */
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
+import static androidx.test.espresso.util.Throwables.throwIfUnchecked;
 
 import android.view.View;
 import androidx.test.espresso.EspressoException;
@@ -35,4 +35,5 @@ public void handleSafely(Throwable error, Matcher<View> viewMatcher) {
     throwIfUnchecked(error);
     throw new RuntimeException(error);
   }
+
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/EventInjector.java b/espresso/core/java/androidx/test/espresso/base/EventInjector.java
index e1b0a113e..6b94a6c9e 100644
--- a/espresso/core/java/androidx/test/espresso/base/EventInjector.java
+++ b/espresso/core/java/androidx/test/espresso/base/EventInjector.java
@@ -16,9 +16,8 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
-import android.os.Build;
 import android.os.SystemClock;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -55,36 +54,19 @@ boolean injectKeyEvent(KeyEvent event) throws InjectEventSecurityException {
       downTime = eventTime;
     }
 
-    // API < 9 does not have constructor with source (nor has source field).
-    KeyEvent newEvent;
-    if (Build.VERSION.SDK_INT < 9) {
-      newEvent =
-          new KeyEvent(
-              downTime,
-              eventTime,
-              action,
-              code,
-              repeatCount,
-              metaState,
-              deviceId,
-              scancode,
-              flags | KeyEvent.FLAG_FROM_SYSTEM);
-    } else {
-      int source = event.getSource();
-      newEvent =
-          new KeyEvent(
-              downTime,
-              eventTime,
-              action,
-              code,
-              repeatCount,
-              metaState,
-              deviceId,
-              scancode,
-              flags | KeyEvent.FLAG_FROM_SYSTEM,
-              source);
-    }
-
+    int source = event.getSource();
+    KeyEvent newEvent =
+        new KeyEvent(
+            downTime,
+            eventTime,
+            action,
+            code,
+            repeatCount,
+            metaState,
+            deviceId,
+            scancode,
+            flags | KeyEvent.FLAG_FROM_SYSTEM,
+            source);
     return injectionStrategy.injectKeyEvent(newEvent);
   }
 
diff --git a/espresso/core/java/androidx/test/espresso/base/IdlingResourceRegistry.java b/espresso/core/java/androidx/test/espresso/base/IdlingResourceRegistry.java
index b43c6eaf1..f1a81f4b6 100644
--- a/espresso/core/java/androidx/test/espresso/base/IdlingResourceRegistry.java
+++ b/espresso/core/java/androidx/test/espresso/base/IdlingResourceRegistry.java
@@ -16,20 +16,25 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+import static java.util.Collections.singletonList;
 
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.IdlingPolicies;
 import androidx.test.espresso.IdlingPolicy;
 import androidx.test.espresso.IdlingResource;
 import androidx.test.espresso.IdlingResource.ResourceCallback;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import androidx.test.espresso.util.TracingUtil;
+import androidx.test.platform.tracing.Tracer;
+import androidx.test.platform.tracing.Tracer.Span;
+import androidx.test.platform.tracing.Tracing;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -74,15 +79,21 @@ public void resourcesHaveTimedOut(List<String> busys) {}
   private final Looper looper;
   private final Handler handler;
   private final Dispatcher dispatcher;
+  private final Tracing tracer;
   private IdleNotificationCallback idleNotificationCallback = NO_OP_CALLBACK;
 
   @Inject
-  public IdlingResourceRegistry(Looper looper) {
+  IdlingResourceRegistry(Looper looper, @NonNull Tracing tracer) {
     this.looper = looper;
+    this.tracer = tracer;
     this.dispatcher = new Dispatcher();
     this.handler = new Handler(looper, dispatcher);
   }
 
+  public IdlingResourceRegistry(Looper looper) {
+    this(looper, Tracing.getInstance());
+  }
+
   /**
    * Ensures that this idling resource registry is in sync with given resources by
    * registering/un-registering idling resources as needed.
@@ -137,7 +148,7 @@ public Void call() {
       }
 
       unregisterResources(resourcesToUnRegister);
-      registerResources(Lists.newArrayList(resourcesToRegister.values()));
+      registerResources(new ArrayList<>(resourcesToRegister.values()));
     }
   }
 
@@ -206,6 +217,10 @@ public Boolean call() {
         boolean found = false;
         for (int i = 0; i < idlingStates.size(); i++) {
           if (idlingStates.get(i).resource.getName().equals(resource.getName())) {
+            if (idlingStates.get(i).resource instanceof LooperIdlingResourceInterrogationHandler) {
+              ((LooperIdlingResourceInterrogationHandler) idlingStates.get(i).resource).release();
+            }
+            idlingStates.get(i).closeSpan();
             idlingStates.remove(i);
             found = true;
             break;
@@ -232,15 +247,14 @@ public void registerLooper(Looper looper, boolean considerWaitIdle) {
     checkNotNull(looper);
     checkArgument(Looper.getMainLooper() != looper, "Not intended for use with main looper!");
 
-    registerResources(
-        Lists.newArrayList(LooperIdlingResourceInterrogationHandler.forLooper(looper)));
+    registerResources(singletonList(LooperIdlingResourceInterrogationHandler.forLooper(looper)));
   }
 
   /**
    * Returns a list of all currently registered {@link IdlingResource}s. This method is safe to call
    * from any thread.
    *
-   * @return an ImmutableList of {@link IdlingResource}s.
+   * @return an immutable List of {@link IdlingResource}s.
    */
   public List<IdlingResource> getResources() {
     if (Looper.myLooper() != looper) {
@@ -252,11 +266,11 @@ public List<IdlingResource> call() {
             }
           });
     } else {
-      ImmutableList.Builder<IdlingResource> irs = ImmutableList.builder();
+      List<IdlingResource> irs = new ArrayList<>();
       for (IdlingState is : idlingStates) {
         irs.add(is.resource);
       }
-      return irs.build();
+      return irs;
     }
   }
 
@@ -265,9 +279,11 @@ boolean allResourcesAreIdle() {
     for (IdlingState is : idlingStates) {
       if (is.idle) {
         // ensure resource has not gone busy.
-        is.idle = is.resource.isIdleNow();
+        is.setIdle(is.resource.isIdleNow());
       }
-
+      // TODO(b/214584779): We should not return early here as this call also has the side effect of
+      // updating all the current idle states so we may miss a chance to notice another resource
+      // has gone busy and start a tracing span for it.
       if (!is.idle) {
         return false;
       }
@@ -348,9 +364,10 @@ private void scheduleTimeoutMessages() {
         timeoutError, error.getIdleTimeoutUnit().toMillis(error.getIdleTimeout()));
   }
 
-  private List<String> getBusyResources() {
-    List<String> busyResourceNames = Lists.newArrayList();
-    List<IdlingState> racyResources = Lists.newArrayList();
+  @Nullable
+  private List<String> pollBusyResourceNames() {
+    List<String> busyResourceNames = new ArrayList<>();
+    List<IdlingState> racyResources = new ArrayList<>();
 
     for (IdlingState state : idlingStates) {
       if (!state.idle) {
@@ -375,13 +392,26 @@ private List<String> getBusyResources() {
     }
   }
 
-  private static class IdlingState implements ResourceCallback {
+  @NonNull
+  String describeBusyResources() {
+    List<String> busyResourceNames = new ArrayList<>();
+    for (IdlingState state : idlingStates) {
+      if (!state.idle) {
+        busyResourceNames.add(state.resource.getName());
+      }
+    }
+    return String.join(", ", busyResourceNames);
+  }
+
+  private class IdlingState implements ResourceCallback {
     // on main
     final IdlingResource resource;
     // from anywhere
     final Handler handler;
     // on main
-    boolean idle;
+    private boolean idle;
+    // on main
+    Tracer.Span tracerSpan;
 
     private IdlingState(IdlingResource resource, Handler handler) {
       this.resource = resource;
@@ -391,7 +421,42 @@ private IdlingState(IdlingResource resource, Handler handler) {
     private void registerSelf() {
       // on main, once at initialization.
       resource.registerIdleTransitionCallback(this);
-      idle = resource.isIdleNow();
+      setIdle(resource.isIdleNow());
+    }
+
+    private void closeSpan() {
+      // Resource is being unregistered. End the tracing span.
+      if (tracerSpan != null) {
+        tracerSpan.close();
+        tracerSpan = null;
+        if (!idle) {
+          Log.w(TAG, "Closing span for resource not idle: " + resource.getName());
+        }
+      }
+    }
+
+    /** Must be invoked from main thread. */
+    public void setIdle(boolean idle) {
+      if (!idle && tracerSpan == null) {
+        // Resource is busy. Start a tracing span if we haven't done so yet.
+        tracerSpan =
+            createUnmanagedTracerSpan(TracingUtil.getSpanName("IdleResource", resource.getName()));
+      } else if (idle && tracerSpan != null) {
+        // Resource is no longer busy. End any current tracing span.
+        tracerSpan.close();
+        tracerSpan = null;
+      }
+
+      this.idle = idle;
+    }
+
+    /**
+     * Internal method to create a Span that does not enforce try-resource usage. Caller
+     * <em>must</em> manually call {@link Span#close()} later on the resource.
+     */
+    @SuppressWarnings("MustBeClosedChecker")
+    private Span createUnmanagedTracerSpan(String name) {
+      return tracer.beginSpan(name);
     }
 
     @Override
@@ -428,7 +493,7 @@ public boolean handleMessage(Message m) {
 
     private void handleResourceIdled(Message m) {
       IdlingState is = (IdlingState) m.obj;
-      is.idle = true;
+      is.setIdle(true);
       boolean unknownResource = true;
       boolean allIdle = true;
       for (IdlingState state : idlingStates) {
@@ -456,7 +521,7 @@ private void handleResourceIdled(Message m) {
     }
 
     private void handleTimeoutWarning() {
-      List<String> busyResources = getBusyResources();
+      List<String> busyResources = pollBusyResourceNames();
       if (busyResources == null) {
         // null indicates that there is either a race or a programming error
         // a race detector message has been inserted into the q.
@@ -473,7 +538,7 @@ private void handleTimeoutWarning() {
     }
 
     private void handleTimeout() {
-      List<String> busyResources = getBusyResources();
+      List<String> busyResources = pollBusyResourceNames();
       if (busyResources == null) {
         // detected a possible race... we've enqueued a race busting message
         // so either that'll resolve the race or kill the app because it's buggy.
diff --git a/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java b/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java
index 74e13b3fc..fa28796ee 100644
--- a/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java
+++ b/espresso/core/java/androidx/test/espresso/base/InputManagerEventInjectionStrategy.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkState;
-
+import android.content.Context;
+import android.hardware.input.InputManager;
 import android.os.Build;
 import android.os.SystemClock;
 import android.util.Log;
@@ -25,14 +25,18 @@
 import android.view.InputEvent;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import android.view.View;
 import androidx.test.espresso.InjectEventSecurityException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import androidx.test.internal.platform.reflect.ReflectionException;
+import androidx.test.internal.platform.reflect.ReflectiveMethod;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.platform.view.inspector.WindowInspectorCompat;
+import androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+import java.util.List;
 
 /**
  * An {@link EventInjectionStrategy} that uses the input manager to inject Events. This strategy
- * supports API level 16 and above.
+ * supports API level 23 and above.
  */
 final class InputManagerEventInjectionStrategy implements EventInjectionStrategy {
   private static final String TAG = "EventInjectionStrategy";
@@ -40,85 +44,39 @@ final class InputManagerEventInjectionStrategy implements EventInjectionStrategy
   private static final long KEYBOARD_DISMISSAL_DELAY_MILLIS = 1000L;
 
   // Used in reflection
-  private boolean initComplete;
-  private Method injectInputEventMethod;
-  private Method setSourceMotionMethod;
-  private Object instanceInputManagerObject;
-  private int asyncEventMode;
-  private int syncEventMode;
-
-  InputManagerEventInjectionStrategy() {
-    checkState(Build.VERSION.SDK_INT >= 16, "Unsupported API level.");
-  }
+  // TODO(b/404661556): use a public API method instead
+  private final ReflectiveMethod<Boolean> injectInputEventMethod =
+      new ReflectiveMethod<>(
+          InputManager.class, "injectInputEvent", InputEvent.class, Integer.TYPE);
 
-  void initialize() {
-    if (initComplete) {
-      return;
-    }
-
-    try {
-      Log.d(TAG, "Creating injection strategy with input manager.");
+  // hardcoded copies of private InputManager fields.
+  // historically these were obtained via reflection, but that seems
+  // wasteful as these values have not changed since they were introduced
+  // copy of private InputManager.INJECT_INPUT_EVENT_MODE_ASYNC.
+  // This value has always been 0
+  private static final int INJECT_INPUT_EVENT_MODE_ASYNC = 0;
 
-      // Get the InputManager class object and initialize if necessary.
-      Class<?> inputManagerClassObject = Class.forName("android.hardware.input.InputManager");
-      Method getInstanceMethod = inputManagerClassObject.getDeclaredMethod("getInstance");
-      getInstanceMethod.setAccessible(true);
+  // Setting event mode to INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH to ensure
+  // that we've dispatched the event and any side effects its had on the view hierarchy
+  // have occurred.
+  private static final int INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH = 2;
 
-      instanceInputManagerObject = getInstanceMethod.invoke(inputManagerClassObject);
-
-      injectInputEventMethod =
-          instanceInputManagerObject
-              .getClass()
-              .getDeclaredMethod("injectInputEvent", InputEvent.class, Integer.TYPE);
-      injectInputEventMethod.setAccessible(true);
-
-      // Setting event mode to INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH to ensure
-      // that we've dispatched the event and any side effects its had on the view hierarchy
-      // have occurred.
-      Field motionEventModeField =
-          inputManagerClassObject.getField("INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH");
-      motionEventModeField.setAccessible(true);
-      syncEventMode = motionEventModeField.getInt(inputManagerClassObject);
-
-      if (Build.VERSION.SDK_INT >= 28) {
-        // Starting from android P it is not allowed to access this field with reflection, hardcoded
-        // this value as workaround.
-        asyncEventMode = 0;
-      } else {
-        Field asyncMotionEventModeField =
-            inputManagerClassObject.getField("INJECT_INPUT_EVENT_MODE_ASYNC");
-        asyncMotionEventModeField.setAccessible(true);
-        asyncEventMode = asyncMotionEventModeField.getInt(inputManagerClassObject);
-      }
-
-      setSourceMotionMethod = MotionEvent.class.getDeclaredMethod("setSource", Integer.TYPE);
-      initComplete = true;
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    } catch (InvocationTargetException e) {
-      throw new RuntimeException(e);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(e);
-    } catch (NoSuchFieldException e) {
-      throw new RuntimeException(e);
-    }
-  }
+  InputManagerEventInjectionStrategy() {}
 
   @Override
   public boolean injectKeyEvent(KeyEvent keyEvent) throws InjectEventSecurityException {
     try {
-      return (Boolean)
-          injectInputEventMethod.invoke(instanceInputManagerObject, keyEvent, syncEventMode);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    } catch (InvocationTargetException e) {
-      Throwable cause = e.getCause();
+      return injectInputEventMethod.invoke(
+          getContext().getSystemService(InputManager.class),
+          keyEvent,
+          INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH);
+    } catch (ReflectionException e) {
+      // annoyingly, ReflectiveMethod always rewraps the underlying exception
+      Throwable cause = e.getCause().getCause();
       if (cause instanceof SecurityException) {
         throw new InjectEventSecurityException(cause);
       }
-      throw new RuntimeException(e);
+      throw new RuntimeException(cause);
     } catch (SecurityException e) {
       throw new InjectEventSecurityException(e);
     }
@@ -138,18 +96,15 @@ private boolean innerInjectMotionEvent(MotionEvent motionEvent, boolean shouldRe
       // TODO: proper handling of events from a trackball (SOURCE_TRACKBALL) and joystick.
       if ((motionEvent.getSource() & InputDevice.SOURCE_CLASS_POINTER) == 0
           && !isFromTouchpadInGlassDevice(motionEvent)) {
-        // Need to do runtime invocation of setSource because it was not added until 2.3_r1.
-        setSourceMotionMethod.invoke(motionEvent, InputDevice.SOURCE_TOUCHSCREEN);
+
+        motionEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
       }
-      int eventMode = sync ? syncEventMode : asyncEventMode;
-      return (Boolean)
-          injectInputEventMethod.invoke(instanceInputManagerObject, motionEvent, eventMode);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalArgumentException e) {
-      throw e;
-    } catch (InvocationTargetException e) {
-      Throwable cause = e.getCause();
+      int eventMode =
+          sync ? INJECT_INPUT_EVENT_MODE_WAIT_FOR_FINISH : INJECT_INPUT_EVENT_MODE_ASYNC;
+      return injectInputEventMethod.invoke(
+          getContext().getSystemService(InputManager.class), motionEvent, eventMode);
+    } catch (ReflectionException e) {
+      Throwable cause = e.getCause().getCause();
       if (cause instanceof SecurityException) {
         if (shouldRetry) {
           Log.w(
@@ -161,10 +116,13 @@ private boolean innerInjectMotionEvent(MotionEvent motionEvent, boolean shouldRe
           SystemClock.sleep(KEYBOARD_DISMISSAL_DELAY_MILLIS);
           innerInjectMotionEvent(motionEvent, false, sync);
         } else {
-          throw new InjectEventSecurityException(cause);
+          throw new InjectEventSecurityException(
+              "Check if Espresso is clicking outside the app (system dialog, navigation bar if"
+                  + " edge-to-edge is enabled, etc.).",
+              cause);
         }
       } else {
-        throw new RuntimeException(e);
+        throw new RuntimeException(e.getCause());
       }
     } catch (SecurityException e) {
       throw new InjectEventSecurityException(e);
@@ -179,4 +137,24 @@ private static boolean isFromTouchpadInGlassDevice(MotionEvent motionEvent) {
             || Build.DEVICE.contains("wingman"))
         && ((motionEvent.getSource() & InputDevice.SOURCE_TOUCHPAD) != 0);
   }
+
+  private static Context getContext() {
+    try {
+      return InstrumentationRegistry.getInstrumentation().getTargetContext();
+    } catch (IllegalStateException e) {
+      // Espresso is being used outside of instrumentation. Unusual, but prior art exists
+      // Attempt to get context from global views
+      try {
+        List<View> views = WindowInspectorCompat.getGlobalWindowViews();
+        if (views.isEmpty()) {
+          throw new IllegalStateException(
+              "Could not get Context. Not running under instrumentation and there is no UI"
+                  + " present");
+        }
+        return views.get(0).getContext();
+      } catch (ViewRetrievalException ve) {
+        throw new IllegalStateException(ve);
+      }
+    }
+  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/Interrogator.java b/espresso/core/java/androidx/test/espresso/base/Interrogator.java
index 92426f377..e091ac5ed 100644
--- a/espresso/core/java/androidx/test/espresso/base/Interrogator.java
+++ b/espresso/core/java/androidx/test/espresso/base/Interrogator.java
@@ -16,29 +16,22 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Throwables.throwIfUnchecked;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.os.Binder;
 import android.os.Looper;
 import android.os.Message;
-import android.os.MessageQueue;
 import android.os.SystemClock;
 import android.util.Log;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
+import androidx.annotation.VisibleForTesting;
 
 /** Isolates the nasty details of touching the message queue. */
 final class Interrogator {
 
   private static final String TAG = "Interrogator";
-  private static final Method messageQueueNextMethod;
-  private static final Field messageQueueHeadField;
-  private static final Method recycleUncheckedMethod;
 
-  private static final int LOOKAHEAD_MILLIS = 15;
+  @VisibleForTesting static final int LOOKAHEAD_MILLIS = 15;
   private static final ThreadLocal<Boolean> interrogating =
       new ThreadLocal<Boolean>() {
         @Override
@@ -47,29 +40,7 @@ public Boolean initialValue() {
         }
       };
 
-  static {
-    try {
-      messageQueueNextMethod = MessageQueue.class.getDeclaredMethod("next");
-      messageQueueNextMethod.setAccessible(true);
-
-      messageQueueHeadField = MessageQueue.class.getDeclaredField("mMessages");
-      messageQueueHeadField.setAccessible(true);
-    } catch (IllegalArgumentException
-        | NoSuchFieldException
-        | SecurityException
-        | NoSuchMethodException e) {
-      Log.e(TAG, "Could not initialize interrogator!", e);
-      throw new RuntimeException("Could not initialize interrogator!", e);
-    }
 
-    Method recycleUnchecked = null;
-    try {
-      recycleUnchecked = Message.class.getDeclaredMethod("recycleUnchecked");
-      recycleUnchecked.setAccessible(true);
-    } catch (NoSuchMethodException expectedOnLowerApiLevels) {
-    }
-    recycleUncheckedMethod = recycleUnchecked;
-  }
 
   /** Informed of the state of the queue and controls whether to continue interrogation or quit. */
   interface QueueInterrogationHandler<R> {
@@ -121,6 +92,7 @@ interface InterrogationHandler<R> extends QueueInterrogationHandler<R> {
     public String getMessage();
   }
 
+  Interrogator() {}
 
   /**
    * Loops the main thread and informs the interrogation handler at interesting points in the exec
@@ -128,11 +100,12 @@ interface InterrogationHandler<R> extends QueueInterrogationHandler<R> {
    *
    * @param handler an interrogation handler that controls whether to continue looping or not.
    */
-  static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
+  <T> T loopAndInterrogate(
+      TestLooperManagerCompat testLooperManager, InterrogationHandler<T> handler) {
     checkSanity();
     interrogating.set(Boolean.TRUE);
     boolean stillInterested = true;
-    MessageQueue q = Looper.myQueue();
+
     // We may have an identity when we're called - we want to restore it at the end of the fn.
     final long entryIdentity = Binder.clearCallingIdentity();
     try {
@@ -140,9 +113,9 @@ static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
       final long threadIdentity = Binder.clearCallingIdentity();
       while (stillInterested) {
         // run until the observer is no longer interested.
-        stillInterested = interrogateQueueState(q, handler);
+        stillInterested = interrogateQueueState(testLooperManager, handler);
         if (stillInterested) {
-          Message m = getNextMessage();
+          Message m = testLooperManager.next();
 
           // the observer cannot stop us from dispatching this message - but we need to let it know
           // that we're about to dispatch.
@@ -152,7 +125,7 @@ static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
           }
           stillInterested = handler.beforeTaskDispatch();
           handler.setMessage(m);
-          m.getTarget().dispatchMessage(m);
+          testLooperManager.execute(m);
 
           // ensure looper invariants
           final long newIdentity = Binder.clearCallingIdentity();
@@ -171,7 +144,7 @@ static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
                     + " what="
                     + m.what);
           }
-          recycle(m);
+          testLooperManager.recycle(m);
         }
       }
     } finally {
@@ -181,38 +154,6 @@ static <R> R loopAndInterrogate(InterrogationHandler<R> handler) {
     return handler.get();
   }
 
-  private static void recycle(Message m) {
-    if (recycleUncheckedMethod != null) {
-      try {
-        recycleUncheckedMethod.invoke(m);
-      } catch (IllegalAccessException | IllegalArgumentException | SecurityException e) {
-        throwIfUnchecked(e);
-        throw new RuntimeException(e);
-      } catch (InvocationTargetException ite) {
-        if (ite.getCause() != null) {
-          throwIfUnchecked(ite.getCause());
-          throw new RuntimeException(ite.getCause());
-        } else {
-          throw new RuntimeException(ite);
-        }
-      }
-    } else {
-      m.recycle();
-    }
-  }
-
-  private static Message getNextMessage() {
-    try {
-      return (Message) messageQueueNextMethod.invoke(Looper.myQueue());
-    } catch (IllegalAccessException
-        | IllegalArgumentException
-        | InvocationTargetException
-        | SecurityException e) {
-      throwIfUnchecked(e);
-      throw new RuntimeException(e);
-    }
-  }
-
   /**
    * Allows caller to see if the message queue is empty, has a task due soon / long, or has a
    * barrier.
@@ -227,36 +168,30 @@ private static Message getNextMessage() {
    *     queueEmpty(), taskDueSoon(), taskDueLong() or barrierUp(). once and only once.
    * @return the result of handler.get()
    */
-  static <R> R peekAtQueueState(MessageQueue q, QueueInterrogationHandler<R> handler) {
-    checkNotNull(q);
+  <T> T peekAtQueueState(
+      TestLooperManagerCompat testLooperManager, QueueInterrogationHandler<T> handler) {
     checkNotNull(handler);
     checkState(
-        !interrogateQueueState(q, handler),
+        !interrogateQueueState(testLooperManager, handler),
         "It is expected that %s would stop interrogation after a single peak at the queue.",
         handler);
     return handler.get();
   }
 
-  private static boolean interrogateQueueState(
-      MessageQueue q, QueueInterrogationHandler<?> handler) {
-    synchronized (q) {
-      final Message head;
-      try {
-        head = (Message) messageQueueHeadField.get(q);
-      } catch (IllegalAccessException e) {
-        throw new RuntimeException(e);
-      }
-      if (null == head) {
-        // no messages pending - AT ALL!
-        return handler.queueEmpty();
-      } else if (null == head.getTarget()) {
-        // null target is a sync barrier token.
+  private boolean interrogateQueueState(
+      TestLooperManagerCompat testLooperManager, QueueInterrogationHandler<?> handler) {
+    synchronized (testLooperManager.getQueue()) {
+      if (testLooperManager.isBlockedOnSyncBarrier()) {
         if (Log.isLoggable(TAG, Log.DEBUG)) {
           Log.d(TAG, "barrier is up");
         }
         return handler.barrierUp();
       }
-      long headWhen = head.getWhen();
+      Long headWhen = testLooperManager.peekWhen();
+      if (headWhen == null) {
+        return handler.queueEmpty();
+      }
+
       long nowFuz = SystemClock.uptimeMillis() + LOOKAHEAD_MILLIS;
       if (Log.isLoggable(TAG, Log.DEBUG)) {
         Log.d(
@@ -270,7 +205,7 @@ private static boolean interrogateQueueState(
     }
   }
 
-  private static void checkSanity() {
+  private void checkSanity() {
     checkState(Looper.myLooper() != null, "Calling non-looper thread!");
     checkState(Boolean.FALSE.equals(interrogating.get()), "Already interrogating!");
   }
diff --git a/espresso/core/java/androidx/test/espresso/base/LooperIdlingResourceInterrogationHandler.java b/espresso/core/java/androidx/test/espresso/base/LooperIdlingResourceInterrogationHandler.java
index 8a3149549..9619c0c7f 100644
--- a/espresso/core/java/androidx/test/espresso/base/LooperIdlingResourceInterrogationHandler.java
+++ b/espresso/core/java/androidx/test/espresso/base/LooperIdlingResourceInterrogationHandler.java
@@ -19,7 +19,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.os.MessageQueue;
 import androidx.test.espresso.IdlingResource;
 import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
@@ -69,8 +68,11 @@ public boolean barrierUp() {
 
   // read on main - written on looper
   private volatile boolean started = false;
-  private volatile MessageQueue queue = null;
+  private volatile Looper looper = null;
   private volatile boolean idle = true;
+  private volatile boolean releasing = false;
+
+  private volatile TestLooperManagerCompat testLooperManager = null;
 
   // written on main - read on looper
   private volatile IdlingResource.ResourceCallback cb = null;
@@ -97,9 +99,14 @@ static LooperIdlingResourceInterrogationHandler forLooper(Looper l) {
             new Runnable() {
               @Override
               public void run() {
-                ir.queue = Looper.myQueue();
+                ir.looper = Looper.myLooper();
+                ir.testLooperManager = TestLooperManagerCompat.acquire(ir.looper);
                 ir.started = true;
-                Interrogator.loopAndInterrogate(ir);
+                try {
+                  new Interrogator().loopAndInterrogate(ir.testLooperManager, ir);
+                } finally {
+                  ir.testLooperManager.release();
+                }
               }
             });
 
@@ -116,37 +123,37 @@ public String getMessage() {
 
   @Override
   public void quitting() {
-    transitionToIdle();
+    releasing = true;
   }
 
   @Override
   public boolean queueEmpty() {
     transitionToIdle();
-    return true;
+    return !releasing;
   }
 
   @Override
   public boolean taskDueLong() {
     transitionToIdle();
-    return true;
+    return !releasing;
   }
 
   @Override
   public boolean beforeTaskDispatch() {
     idle = false;
-    return true;
+    return !releasing;
   }
 
   @Override
   public boolean taskDueSoon() {
     idle = false;
-    return true;
+    return !releasing;
   }
 
   @Override
   public boolean barrierUp() {
     idle = false;
-    return true;
+    return !releasing;
   }
 
   @Override
@@ -156,14 +163,15 @@ public Void get() {
 
   @Override
   public boolean isIdleNow() {
-    if (!started) {
+    if (!started || releasing) {
       return false;
     }
     if (idle) {
       // make sure nothing has arrived in the queue while the looper thread is waiting to pull a
       // new task out of it. There can be some delay between a new message entering the queue and
       // the looper thread pulling it out and processing it.
-      return Boolean.FALSE.equals(Interrogator.peekAtQueueState(queue, queueHasNewTasks));
+      return Boolean.FALSE.equals(
+          new Interrogator().peekAtQueueState(testLooperManager, queueHasNewTasks));
     }
     return false;
   }
@@ -184,4 +192,10 @@ private void transitionToIdle() {
       cb.onTransitionToIdle();
     }
   }
+
+  public void release() {
+    releasing = true;
+    // post a message to looper to wake up interrogator if necessary
+    new Handler(looper).post(() -> {});
+  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/NoMatchingViewExceptionHandler.java b/espresso/core/java/androidx/test/espresso/base/NoMatchingViewExceptionHandler.java
deleted file mode 100644
index 76413cbdf..000000000
--- a/espresso/core/java/androidx/test/espresso/base/NoMatchingViewExceptionHandler.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.espresso.base;
-
-import static androidx.test.internal.util.Checks.checkNotNull;
-import static com.google.common.base.Throwables.throwIfUnchecked;
-
-import android.util.Log;
-import android.view.View;
-import androidx.test.espresso.NoMatchingViewException;
-import androidx.test.espresso.base.DefaultFailureHandler.TypedFailureHandler;
-import androidx.test.espresso.util.HumanReadables;
-import androidx.test.platform.io.PlatformTestStorage;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.hamcrest.Matcher;
-
-/** An Espresso failure handler that handles an {@link NoMatchingViewException}. */
-class NoMatchingViewExceptionHandler extends TypedFailureHandler<NoMatchingViewException> {
-  private static final String TAG = NoMatchingViewExceptionHandler.class.getSimpleName();
-
-  private final PlatformTestStorage testStorage;
-  private final AtomicInteger failureCount;
-
-  public NoMatchingViewExceptionHandler(
-      PlatformTestStorage testStorage,
-      AtomicInteger failureCount,
-      Class<NoMatchingViewException> expectedType) {
-    super(expectedType);
-    this.testStorage = checkNotNull(testStorage);
-    this.failureCount = failureCount;
-  }
-
-  @Override
-  public void handleSafely(NoMatchingViewException error, Matcher<View> viewMatcher) {
-    dumpFullViewHierarchyToFile(error);
-    error.setStackTrace(Thread.currentThread().getStackTrace());
-    throwIfUnchecked(error);
-    throw new RuntimeException(error);
-  }
-
-  private void dumpFullViewHierarchyToFile(NoMatchingViewException error) {
-    String viewHierarchyMsg =
-        HumanReadables.getViewHierarchyErrorMessage(error.getRootView(), null, "", null);
-    String viewHierarchyFile = "view-hierarchy-" + failureCount + ".txt";
-    try {
-      addOutputFile(viewHierarchyFile, viewHierarchyMsg);
-    } catch (IOException e) {
-      // Log and ignore.
-      Log.w(TAG, "Failed to save the view hierarchy to file " + viewHierarchyFile, e);
-    }
-  }
-
-  private void addOutputFile(String filename, String content) throws IOException {
-    try (OutputStream out = testStorage.openOutputFile(filename)) {
-      out.write(content.getBytes());
-    }
-  }
-}
diff --git a/espresso/core/java/androidx/test/espresso/base/PerformExceptionHandler.java b/espresso/core/java/androidx/test/espresso/base/PerformExceptionHandler.java
index b24f92d9a..48e8df4db 100644
--- a/espresso/core/java/androidx/test/espresso/base/PerformExceptionHandler.java
+++ b/espresso/core/java/androidx/test/espresso/base/PerformExceptionHandler.java
@@ -15,11 +15,10 @@
  */
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.content.ContentResolver;
 import android.content.Context;
-import android.os.Build;
 import android.provider.Settings;
 import android.view.View;
 import androidx.test.espresso.PerformException;
@@ -44,7 +43,8 @@ public void handleSafely(PerformException error, Matcher<View> viewMatcher) {
     if (!isAnimationAndTransitionDisabled(appContext)) {
       sb.append(
           "Animations or transitions are enabled on the target device.\n"
-              + "For more info check: https://developer.android.com/training/testing/espresso/setup#set-up-environment\n\n");
+              + "For more info check:"
+              + " https://developer.android.com/training/testing/espresso/setup#set-up-environment\n\n");
     }
     sb.append(viewMatcher);
     // Re-throw the exception with the viewMatcher (used to locate the view) as the view
@@ -88,13 +88,8 @@ private static float getWindowAnimationScale(ContentResolver resolver) {
   }
 
   private static float getAnimatorDurationScale(ContentResolver resolver) {
-    if (isJellyBeanMR1OrHigher()) {
-      return getSetting(
-          resolver,
-          Settings.Global.ANIMATOR_DURATION_SCALE,
-          Settings.System.ANIMATOR_DURATION_SCALE);
-    }
-    return 0f;
+    return getSetting(
+        resolver, Settings.Global.ANIMATOR_DURATION_SCALE, Settings.System.ANIMATOR_DURATION_SCALE);
   }
 
   /**
@@ -109,16 +104,7 @@ private static float getAnimatorDurationScale(ContentResolver resolver) {
    * @see #getSystemSetting(ContentResolver, String)
    */
   private static float getSetting(ContentResolver resolver, String current, String deprecated) {
-    if (isJellyBeanMR1OrHigher()) {
-      return getGlobalSetting(resolver, current);
-    } else {
-      return getSystemSetting(resolver, deprecated);
-    }
-  }
-
-  /** Helper method to determine if API level is JellyBean MR1 or higher. */
-  private static boolean isJellyBeanMR1OrHigher() {
-    return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1;
+    return getGlobalSetting(resolver, current);
   }
 
   /**
@@ -135,19 +121,4 @@ private static float getGlobalSetting(ContentResolver resolver, String setting)
       return 0f;
     }
   }
-
-  /**
-   * Method to get system settings, which hold desired values until {@link JELLY_BEAN_MR1}.
-   *
-   * @param resolver The target context's content resolver.
-   * @param setting The system setting to look for.
-   * @return The setting's value or <code>0f</code> if none was found.
-   */
-  private static float getSystemSetting(ContentResolver resolver, String setting) {
-    try {
-      return Settings.System.getFloat(resolver, setting);
-    } catch (Settings.SettingNotFoundException e) {
-      return 0f;
-    }
-  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/RootViewPicker.java b/espresso/core/java/androidx/test/espresso/base/RootViewPicker.java
index ef32f793c..d16e220b6 100644
--- a/espresso/core/java/androidx/test/espresso/base/RootViewPicker.java
+++ b/espresso/core/java/androidx/test/espresso/base/RootViewPicker.java
@@ -17,10 +17,15 @@
 package androidx.test.espresso.base;
 
 import static androidx.test.espresso.matcher.RootMatchers.isDialog;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkState;
+import static java.util.Collections.unmodifiableList;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
 import android.app.Activity;
+import android.content.Context;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.util.Log;
 import android.view.View;
 import androidx.test.espresso.EspressoException;
@@ -28,12 +33,13 @@
 import androidx.test.espresso.NoMatchingRootException;
 import androidx.test.espresso.Root;
 import androidx.test.espresso.UiController;
+import androidx.test.espresso.internal.inject.TargetContext;
 import androidx.test.internal.platform.os.ControlledLooper;
 import androidx.test.internal.util.LogUtil;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.Stage;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumSet;
 import java.util.List;
@@ -54,16 +60,17 @@
 public final class RootViewPicker implements Provider<View> {
   private static final String TAG = RootViewPicker.class.getSimpleName();
 
-  private static final ImmutableList<Integer> CREATED_WAIT_TIMES =
-      ImmutableList.of(10, 50, 150, 250);
-  private static final ImmutableList<Integer> RESUMED_WAIT_TIMES =
-      ImmutableList.of(10, 50, 100, 500, 2000 /* 2sec */, 30000 /* 30sec */);
+  private static final List<Integer> CREATED_WAIT_TIMES =
+      unmodifiableList(Arrays.asList(10, 50, 150, 250));
+  private static final List<Integer> RESUMED_WAIT_TIMES =
+      unmodifiableList(Arrays.asList(10, 50, 100, 500, 2000 /* 2sec */, 30000 /* 30sec */));
 
   private final UiController uiController;
   private final ActivityLifecycleMonitor activityLifecycleMonitor;
   private final AtomicReference<Boolean> needsActivity;
   private final RootResultFetcher rootResultFetcher;
   private final ControlledLooper controlledLooper;
+  private final Context appContext;
 
   @Inject
   RootViewPicker(
@@ -71,12 +78,14 @@ public final class RootViewPicker implements Provider<View> {
       RootResultFetcher rootResultFetcher,
       ActivityLifecycleMonitor activityLifecycleMonitor,
       AtomicReference<Boolean> needsActivity,
-      ControlledLooper controlledLooper) {
+      ControlledLooper controlledLooper,
+      @TargetContext Context appContext) {
     this.uiController = uiController;
     this.rootResultFetcher = rootResultFetcher;
     this.activityLifecycleMonitor = activityLifecycleMonitor;
     this.needsActivity = needsActivity;
     this.controlledLooper = controlledLooper;
+    this.appContext = appContext;
   }
 
   @Override
@@ -97,9 +106,9 @@ public View get() {
    * root view is not being requested and the root view has window focus or is focusable.
    */
   private Root waitForRootToBeReady(Root pickedRoot) {
-    long timeout = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(10) /* 10 seconds */;
+    long timeout = SystemClock.uptimeMillis() + SECONDS.toMillis(10) /* 10 seconds */;
     BackOff rootReadyBackoff = new RootReadyBackoff();
-    while (System.currentTimeMillis() <= timeout) {
+    while (SystemClock.uptimeMillis() <= timeout) {
       if (pickedRoot.isReady()) {
         return pickedRoot;
       } else {
@@ -119,11 +128,11 @@ private Root waitForRootToBeReady(Root pickedRoot) {
   }
 
   private Root pickARoot() {
-    long timeout = System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(60) /* 60 seconds */;
+    long timeout = SystemClock.uptimeMillis() + SECONDS.toMillis(60) /* 60 seconds */;
     RootResults rootResults = rootResultFetcher.fetch();
     BackOff noActiveRootsBackoff = new NoActiveRootsBackoff();
     BackOff noMatchingRootBackoff = new NoMatchingRootBackoff();
-    while (System.currentTimeMillis() <= timeout) {
+    while (SystemClock.uptimeMillis() <= timeout) {
       switch (rootResults.getState()) {
         case ROOTS_PICKED:
           return rootResults.getPickedRoot();
@@ -192,11 +201,16 @@ private void waitForAtLeastOneActivityToBeResumed() {
           "No activities in stage RESUMED. Did you forget to "
               + "launch the activity. (test.getActivity() or similar)?");
     }
+
+    // Wait for configuration changes to finish on the activity if there are any in progress.
+    Activity currentActivity = (Activity) resumedActivities.toArray()[0];
+    ConfigurationSynchronizationUtils.waitForConfigurationChangesOnActivity(
+        currentActivity, uiController, appContext);
   }
 
   /** Returns the list of all non-destroyed activities. */
   private List<Activity> getAllActiveActivities() {
-    List<Activity> activities = Lists.newArrayList();
+    List<Activity> activities = new ArrayList<>();
     for (Stage s : EnumSet.range(Stage.PRE_ON_CREATE, Stage.RESTARTED)) {
       activities.addAll(activityLifecycleMonitor.getActivitiesInStage(s));
     }
@@ -292,7 +306,7 @@ public RootResultFetcher(
 
     public RootResults fetch() {
       List<Root> allRoots = activeRootLister.listActiveRoots();
-      List<Root> pickedRoots = Lists.newArrayList();
+      List<Root> pickedRoots = new ArrayList<>();
 
       for (Root root : allRoots) {
         if (selector.matches(root)) {
@@ -326,11 +340,11 @@ protected final long getBackoffForAttempt() {
   }
 
   private static final class NoActiveRootsBackoff extends BackOff {
-    private static final ImmutableList<Integer> NO_ACTIVE_ROOTS_BACKOFF =
-        ImmutableList.of(10, 10, 20, 30, 50, 80, 130, 210, 340);
+    private static final List<Integer> NO_ACTIVE_ROOTS_BACKOFF =
+        unmodifiableList(Arrays.asList(10, 10, 20, 30, 50, 80, 130, 210, 340));
 
     public NoActiveRootsBackoff() {
-      super(NO_ACTIVE_ROOTS_BACKOFF, TimeUnit.MILLISECONDS);
+      super(NO_ACTIVE_ROOTS_BACKOFF, MILLISECONDS);
     }
 
     @Override
@@ -343,11 +357,11 @@ public long getNextBackoffInMillis() {
   }
 
   private static final class NoMatchingRootBackoff extends BackOff {
-    private static final ImmutableList<Integer> NO_MATCHING_ROOT_BACKOFF =
-        ImmutableList.of(10, 20, 200, 400, 1000, 2000 /* 2sec */);
+    private static final List<Integer> NO_MATCHING_ROOT_BACKOFF =
+        unmodifiableList(Arrays.asList(10, 20, 200, 400, 1000, 2000 /* 2sec */));
 
     public NoMatchingRootBackoff() {
-      super(NO_MATCHING_ROOT_BACKOFF, TimeUnit.MILLISECONDS);
+      super(NO_MATCHING_ROOT_BACKOFF, MILLISECONDS);
     }
 
     @Override
@@ -364,11 +378,11 @@ public long getNextBackoffInMillis() {
   }
 
   private static final class RootReadyBackoff extends BackOff {
-    private static final ImmutableList<Integer> ROOT_READY_BACKOFF =
-        ImmutableList.of(10, 25, 50, 100, 200, 400, 800, 1000 /* 1sec */);
+    private static final List<Integer> ROOT_READY_BACKOFF =
+        unmodifiableList(Arrays.asList(10, 25, 50, 100, 200, 400, 800, 1000 /* 1sec */));
 
     public RootReadyBackoff() {
-      super(ROOT_READY_BACKOFF, TimeUnit.MILLISECONDS);
+      super(ROOT_READY_BACKOFF, MILLISECONDS);
     }
 
     @Override
diff --git a/espresso/core/java/androidx/test/espresso/base/RootsOracle.java b/espresso/core/java/androidx/test/espresso/base/RootsOracle.java
index e16cd21ad..27549a0da 100644
--- a/espresso/core/java/androidx/test/espresso/base/RootsOracle.java
+++ b/espresso/core/java/androidx/test/espresso/base/RootsOracle.java
@@ -16,21 +16,19 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkState;
+import static java.util.Collections.emptyList;
 
-import android.os.Build;
 import android.os.Looper;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager.LayoutParams;
 import androidx.test.espresso.Root;
-import com.google.common.collect.Lists;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
+import androidx.test.platform.view.inspector.WindowInspectorCompat;
+import androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 import javax.inject.Inject;
 
 /**
@@ -38,162 +36,45 @@
  *
  * <p>95% of the time this is unnecessary and we can operate solely on current Activity's root view
  * as indicated by getWindow().getDecorView(). However in the case of popup windows, menus, and
- * dialogs the actual view hierarchy we should be operating on is not accessible thru public apis.
- *
- * <p>In the spirit of degrading gracefully when new api levels break compatibility, callers should
- * handle a list of size 0 by assuming getWindow().getDecorView() on the currently resumed activity
- * is the sole root - this assumption will be correct often enough.
+ * dialogs the actual view hierarchy we should be operating on is in another root.
  *
  * <p>Obviously, you need to be on the main thread to use this.
  */
 final class RootsOracle implements ActiveRootLister {
 
   private static final String TAG = RootsOracle.class.getSimpleName();
-  private static final String WINDOW_MANAGER_IMPL_CLAZZ = "android.view.WindowManagerImpl";
-  private static final String WINDOW_MANAGER_GLOBAL_CLAZZ = "android.view.WindowManagerGlobal";
-  private static final String VIEWS_FIELD = "mViews";
-  private static final String WINDOW_PARAMS_FIELD = "mParams";
-  private static final String GET_DEFAULT_IMPL = "getDefault";
-  private static final String GET_GLOBAL_INSTANCE = "getInstance";
 
   private final Looper mainLooper;
-  private boolean initialized;
-  private Object windowManagerObj;
-  private Field viewsField;
-  private Field paramsField;
 
   @Inject
   RootsOracle(Looper mainLooper) {
     this.mainLooper = mainLooper;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public List<Root> listActiveRoots() {
     checkState(mainLooper.equals(Looper.myLooper()), "must be called on main thread.");
 
-    if (!initialized) {
-      initialize();
-    }
-
-    if (null == windowManagerObj) {
-      Log.w(TAG, "No reflective access to windowmanager object.");
-      return Lists.newArrayList();
-    }
-
-    if (null == viewsField) {
-      Log.w(TAG, "No reflective access to mViews");
-      return Lists.newArrayList();
-    }
-    if (null == paramsField) {
-      Log.w(TAG, "No reflective access to mParams");
-      return Lists.newArrayList();
-    }
-
-    List<View> views = null;
-    List<LayoutParams> params = null;
-
     try {
-      if (Build.VERSION.SDK_INT < 19) {
-        views = Arrays.asList((View[]) viewsField.get(windowManagerObj));
-        params = Arrays.asList((LayoutParams[]) paramsField.get(windowManagerObj));
-      } else {
-        views = (List<View>) viewsField.get(windowManagerObj);
-        params = (List<LayoutParams>) paramsField.get(windowManagerObj);
+      List<Root> roots = new ArrayList<>();
+      // return roots in reverse order, to match legacy behavior that assumes
+      // window ordering by position
+      for (View view : reverse(WindowInspectorCompat.getGlobalWindowViews())) {
+        roots.add(
+            new Root.Builder()
+                .withDecorView(view)
+                .withWindowLayoutParams((LayoutParams) view.getLayoutParams())
+                .build());
       }
-    } catch (RuntimeException re) {
-      Log.w(
-          TAG,
-          String.format(
-              Locale.ROOT,
-              "Reflective access to %s or %s on %s failed.",
-              viewsField,
-              paramsField,
-              windowManagerObj),
-          re);
-      return Lists.newArrayList();
-    } catch (IllegalAccessException iae) {
-      Log.w(
-          TAG,
-          String.format(
-              Locale.ROOT,
-              "Reflective access to %s or %s on %s failed.",
-              viewsField,
-              paramsField,
-              windowManagerObj),
-          iae);
-      return Lists.newArrayList();
-    }
-
-    List<Root> roots = Lists.newArrayList();
-    for (int i = views.size() - 1; i > -1; i--) {
-      roots.add(
-          new Root.Builder()
-              .withDecorView(views.get(i))
-              .withWindowLayoutParams(params.get(i))
-              .build());
+      return Collections.unmodifiableList(roots);
+    } catch (ViewRetrievalException e) {
+      Log.w(TAG, "Failed to retrieve root views", e);
+      return emptyList();
     }
-
-    return roots;
   }
 
-  private void initialize() {
-    initialized = true;
-    String accessClass =
-        Build.VERSION.SDK_INT > 16 ? WINDOW_MANAGER_GLOBAL_CLAZZ : WINDOW_MANAGER_IMPL_CLAZZ;
-    String instanceMethod = Build.VERSION.SDK_INT > 16 ? GET_GLOBAL_INSTANCE : GET_DEFAULT_IMPL;
-
-    try {
-      Class<?> clazz = Class.forName(accessClass);
-      Method getMethod = clazz.getMethod(instanceMethod);
-      windowManagerObj = getMethod.invoke(null);
-      viewsField = clazz.getDeclaredField(VIEWS_FIELD);
-      viewsField.setAccessible(true);
-      paramsField = clazz.getDeclaredField(WINDOW_PARAMS_FIELD);
-      paramsField.setAccessible(true);
-    } catch (InvocationTargetException ite) {
-      Log.e(
-          TAG,
-          String.format(Locale.ROOT, "could not invoke: %s on %s", instanceMethod, accessClass),
-          ite.getCause());
-    } catch (ClassNotFoundException cnfe) {
-      Log.e(TAG, String.format(Locale.ROOT, "could not find class: %s", accessClass), cnfe);
-    } catch (NoSuchFieldException nsfe) {
-      Log.e(
-          TAG,
-          String.format(
-              Locale.ROOT,
-              "could not find field: %s or %s on %s",
-              WINDOW_PARAMS_FIELD,
-              VIEWS_FIELD,
-              accessClass),
-          nsfe);
-    } catch (NoSuchMethodException nsme) {
-      Log.e(
-          TAG,
-          String.format(
-              Locale.ROOT, "could not find method: %s on %s", instanceMethod, accessClass),
-          nsme);
-    } catch (RuntimeException re) {
-      Log.e(
-          TAG,
-          String.format(
-              Locale.ROOT,
-              "reflective setup failed using obj: %s method: %s field: %s",
-              accessClass,
-              instanceMethod,
-              VIEWS_FIELD),
-          re);
-    } catch (IllegalAccessException iae) {
-      Log.e(
-          TAG,
-          String.format(
-              Locale.ROOT,
-              "reflective setup failed using obj: %s method: %s field: %s",
-              accessClass,
-              instanceMethod,
-              VIEWS_FIELD),
-          iae);
-    }
+  private List<View> reverse(List<View> globalWindowViews) {
+    Collections.reverse(globalWindowViews);
+    return globalWindowViews;
   }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java b/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java
new file mode 100644
index 000000000..8561a2c44
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/base/TestLooperManagerCompat.java
@@ -0,0 +1,158 @@
+package androidx.test.espresso.base;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.os.Looper;
+import android.os.Message;
+import android.os.MessageQueue;
+import android.os.TestLooperManager;
+import androidx.annotation.Nullable;
+import androidx.test.internal.util.Checks;
+import androidx.test.platform.app.InstrumentationRegistry;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
+/**
+ * Compat class that supports the {@link android.os.TestLooperManager} Baklava+ functionality on
+ * older Android SDKs.
+ *
+ * <p>Unlike the real TestLooperManager this only supports being used from the Looper's thread.
+ */
+@SuppressWarnings("NonFinalStaticField")
+final class TestLooperManagerCompat {
+
+  private static Method messageQueueNextMethod;
+  private static Field messageQueueHeadField;
+  private static Method recycleUncheckedMethod;
+
+  static {
+    try {
+      if (VERSION.SDK_INT < VERSION_CODES.BAKLAVA) {
+        messageQueueNextMethod = MessageQueue.class.getDeclaredMethod("next");
+        messageQueueNextMethod.setAccessible(true);
+        messageQueueHeadField = MessageQueue.class.getDeclaredField("mMessages");
+        messageQueueHeadField.setAccessible(true);
+        recycleUncheckedMethod = Message.class.getDeclaredMethod("recycleUnchecked");
+        recycleUncheckedMethod.setAccessible(true);
+      }
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  private final MessageQueue queue;
+
+  // the TestLooperManager to defer to. Will only be non-null if running
+  // on an Android API level that supports it
+  private final TestLooperManager delegate;
+
+  private TestLooperManagerCompat(MessageQueue queue) {
+    this.queue = queue;
+    this.delegate = null;
+  }
+
+  private TestLooperManagerCompat(TestLooperManager testLooperManager) {
+    this.queue = null;
+    this.delegate = testLooperManager;
+  }
+
+  static TestLooperManagerCompat acquire(Looper looper) {
+    if (VERSION.SDK_INT >= VERSION_CODES.BAKLAVA) {
+      // running on a newer Android version that has the supported TestLooperManagerCompat changes
+      Checks.checkState(looper.isCurrentThread());
+      TestLooperManager testLooperManager =
+          InstrumentationRegistry.getInstrumentation().acquireLooperManager(looper);
+      return new TestLooperManagerCompat(testLooperManager);
+    } else {
+      return new TestLooperManagerCompat(looper.getQueue());
+    }
+  }
+
+  @Nullable
+  Long peekWhen() {
+    try {
+      if (delegate != null) {
+        return delegate.peekWhen();
+      } else {
+        Message msg = legacyPeek();
+        if (msg != null && msg.getTarget() == null) {
+          return null;
+        }
+        return msg == null ? null : msg.getWhen();
+      }
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @Nullable
+  private Message legacyPeek() throws IllegalAccessException {
+    checkNotNull(queue);
+    // the legacy MessageQueue implementation synchronizes on itself,
+    // so this uses the same lock
+    synchronized (queue) {
+      return (Message) messageQueueHeadField.get(queue);
+    }
+  }
+
+  void execute(Message message) {
+    if (delegate != null) {
+      delegate.execute(message);
+    } else {
+      message.getTarget().dispatchMessage(message);
+    }
+  }
+
+  void release() {
+    if (delegate != null) {
+      delegate.release();
+    }
+  }
+
+  boolean isBlockedOnSyncBarrier() {
+    try {
+      if (delegate != null) {
+        return delegate.isBlockedOnSyncBarrier();
+      } else {
+        Message msg = legacyPeek();
+        return msg != null && msg.getTarget() == null;
+      }
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  Message next() {
+    try {
+      if (delegate != null) {
+        return delegate.next();
+      } else {
+        return (Message) messageQueueNextMethod.invoke(queue);
+      }
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  void recycle(Message m) {
+    try {
+      if (delegate != null) {
+        delegate.recycle(m);
+      } else {
+        recycleUncheckedMethod.invoke(m);
+      }
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  MessageQueue getQueue() {
+    if (queue != null) {
+      return queue;
+    } else {
+      return delegate.getMessageQueue();
+    }
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/base/ThreadPoolExecutorExtractor.java b/espresso/core/java/androidx/test/espresso/base/ThreadPoolExecutorExtractor.java
index 87554a116..b016f7d44 100644
--- a/espresso/core/java/androidx/test/espresso/base/ThreadPoolExecutorExtractor.java
+++ b/espresso/core/java/androidx/test/espresso/base/ThreadPoolExecutorExtractor.java
@@ -16,10 +16,11 @@
 
 package androidx.test.espresso.base;
 
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import com.google.common.base.Optional;
+import androidx.annotation.Nullable;
+import androidx.test.internal.platform.ServiceLoaderWrapper;
+import androidx.test.internal.platform.os.ControlledLooper;
 import java.lang.reflect.Field;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -41,24 +42,22 @@ final class ThreadPoolExecutorExtractor {
   private static final String MODERN_ASYNC_TASK_CLASS_NAME =
       "androidx.loader.content.ModernAsyncTask";
   private static final String MODERN_ASYNC_TASK_FIELD_NAME = "THREAD_POOL_EXECUTOR";
-  private static final String LEGACY_ASYNC_TASK_FIELD_NAME = "sExecutor";
   private final Handler mainHandler;
 
+  private final ControlledLooper controlledLooper =
+      ServiceLoaderWrapper.loadSingleService(
+          ControlledLooper.class, () -> ControlledLooper.NO_OP_CONTROLLED_LOOPER);
+
   @Inject
   ThreadPoolExecutorExtractor(Looper looper) {
     mainHandler = new Handler(looper);
   }
 
+  @Nullable
   public ThreadPoolExecutor getAsyncTaskThreadPool() {
-    FutureTask<Optional<ThreadPoolExecutor>> getTask = null;
-    if (Build.VERSION.SDK_INT < 11) {
-      getTask = new FutureTask<Optional<ThreadPoolExecutor>>(LEGACY_ASYNC_TASK_EXECUTOR);
-    } else {
-      getTask = new FutureTask<Optional<ThreadPoolExecutor>>(POST_HONEYCOMB_ASYNC_TASK_EXECUTOR);
-    }
-
+    FutureTask<ThreadPoolExecutor> getTask = new FutureTask<>(ASYNC_TASK_EXECUTOR);
     try {
-      return runOnMainThread(getTask).get().get();
+      return runOnMainThread(getTask).get();
     } catch (InterruptedException ie) {
       throw new RuntimeException("Interrupted while trying to get the async task executor!", ie);
     } catch (ExecutionException ee) {
@@ -66,11 +65,10 @@ public ThreadPoolExecutor getAsyncTaskThreadPool() {
     }
   }
 
-  public Optional<ThreadPoolExecutor> getCompatAsyncTaskThreadPool() {
+  @Nullable
+  public ThreadPoolExecutor getCompatAsyncTaskThreadPool() {
     try {
-      return runOnMainThread(
-              new FutureTask<Optional<ThreadPoolExecutor>>(MODERN_ASYNC_TASK_EXTRACTOR))
-          .get();
+      return runOnMainThread(new FutureTask<>(MODERN_ASYNC_TASK_EXTRACTOR)).get();
     } catch (InterruptedException ie) {
       throw new RuntimeException("Interrupted while trying to get the compat async executor!", ie);
     } catch (ExecutionException ee) {
@@ -93,6 +91,7 @@ public void run() {
             }
           });
       try {
+        controlledLooper.drainMainThreadUntilIdle();
         latch.await();
       } catch (InterruptedException ie) {
         if (!futureToRun.isDone()) {
@@ -106,67 +105,38 @@ public void run() {
     return futureToRun;
   }
 
-  private static final Callable<Optional<ThreadPoolExecutor>> MODERN_ASYNC_TASK_EXTRACTOR =
-      new Callable<Optional<ThreadPoolExecutor>>() {
-        @Override
-        public Optional<ThreadPoolExecutor> call() throws Exception {
-          try {
-            Class<?> modernClazz = Class.forName(MODERN_ASYNC_TASK_CLASS_NAME);
-            if (modernClazz == null) {
-              return Optional.<ThreadPoolExecutor>absent();
-            }
-            Field executorField = modernClazz.getDeclaredField(MODERN_ASYNC_TASK_FIELD_NAME);
-            if (executorField == null) {
-              return Optional.<ThreadPoolExecutor>absent();
-            }
-            executorField.setAccessible(true);
-            return Optional.of((ThreadPoolExecutor) executorField.get(null));
-          } catch (ClassNotFoundException cnfe) {
-            return Optional.<ThreadPoolExecutor>absent();
-          } catch (NoSuchFieldException nsfe) {
-            return Optional.<ThreadPoolExecutor>absent();
+  private static final Callable<ThreadPoolExecutor> MODERN_ASYNC_TASK_EXTRACTOR =
+      () -> {
+        try {
+          Class<?> modernClazz = Class.forName(MODERN_ASYNC_TASK_CLASS_NAME);
+          if (modernClazz == null) {
+            return null;
+          }
+          Field executorField = modernClazz.getDeclaredField(MODERN_ASYNC_TASK_FIELD_NAME);
+          if (executorField == null) {
+            return null;
           }
+          executorField.setAccessible(true);
+          return (ThreadPoolExecutor) executorField.get(null);
+        } catch (ClassNotFoundException cnfe) {
+          return null;
+        } catch (NoSuchFieldException nsfe) {
+          return null;
         }
       };
 
   private static final Callable<Class<?>> LOAD_ASYNC_TASK_CLASS =
-      new Callable<Class<?>>() {
-        @Override
-        public Class<?> call() throws Exception {
-          return Class.forName(ASYNC_TASK_CLASS_NAME);
-        }
-      };
+      () -> Class.forName(ASYNC_TASK_CLASS_NAME);
 
-  private static final Callable<Optional<ThreadPoolExecutor>> LEGACY_ASYNC_TASK_EXECUTOR =
-      new Callable<Optional<ThreadPoolExecutor>>() {
-        @Override
-        public Optional<ThreadPoolExecutor> call() throws Exception {
-          try {
-            Field executorField =
-                LOAD_ASYNC_TASK_CLASS.call().getDeclaredField(LEGACY_ASYNC_TASK_FIELD_NAME);
-            executorField.setAccessible(true);
-            return Optional.of((ThreadPoolExecutor) executorField.get(null));
-          } catch (ClassNotFoundException cnfe) {
-            return Optional.<ThreadPoolExecutor>absent();
-          } catch (NoSuchFieldException nsfe) {
-            return Optional.<ThreadPoolExecutor>absent();
-          }
-        }
-      };
-
-  private static final Callable<Optional<ThreadPoolExecutor>> POST_HONEYCOMB_ASYNC_TASK_EXECUTOR =
-      new Callable<Optional<ThreadPoolExecutor>>() {
-        @Override
-        public Optional<ThreadPoolExecutor> call() throws Exception {
-          try {
-            Field executorField =
-                LOAD_ASYNC_TASK_CLASS.call().getField(MODERN_ASYNC_TASK_FIELD_NAME);
-            return Optional.of((ThreadPoolExecutor) executorField.get(null));
-          } catch (ClassNotFoundException cnfe) {
-            return Optional.<ThreadPoolExecutor>absent();
-          } catch (NoSuchFieldException nsfe) {
-            return Optional.<ThreadPoolExecutor>absent();
-          }
+  private static final Callable<ThreadPoolExecutor> ASYNC_TASK_EXECUTOR =
+      () -> {
+        try {
+          Field executorField = LOAD_ASYNC_TASK_CLASS.call().getField(MODERN_ASYNC_TASK_FIELD_NAME);
+          return (ThreadPoolExecutor) executorField.get(null);
+        } catch (ClassNotFoundException cnfe) {
+          return null;
+        } catch (NoSuchFieldException nsfe) {
+          return null;
         }
       };
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/ThrowableHandler.java b/espresso/core/java/androidx/test/espresso/base/ThrowableHandler.java
index 0ad7180db..6ddd5c4fd 100644
--- a/espresso/core/java/androidx/test/espresso/base/ThrowableHandler.java
+++ b/espresso/core/java/androidx/test/espresso/base/ThrowableHandler.java
@@ -15,7 +15,7 @@
  */
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Throwables.throwIfUnchecked;
+import static androidx.test.espresso.util.Throwables.throwIfUnchecked;
 
 import android.view.View;
 import androidx.test.espresso.FailureHandler;
diff --git a/espresso/core/java/androidx/test/espresso/base/UiControllerImpl.java b/espresso/core/java/androidx/test/espresso/base/UiControllerImpl.java
index 35901006d..a9f028231 100644
--- a/espresso/core/java/androidx/test/espresso/base/UiControllerImpl.java
+++ b/espresso/core/java/androidx/test/espresso/base/UiControllerImpl.java
@@ -16,13 +16,12 @@
 
 package androidx.test.espresso.base;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Throwables.throwIfUnchecked;
+import static androidx.test.espresso.util.Throwables.throwIfUnchecked;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.annotation.SuppressLint;
-import android.os.Build;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.Looper;
@@ -32,15 +31,13 @@
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.IdlingPolicies;
 import androidx.test.espresso.IdlingPolicy;
 import androidx.test.espresso.InjectEventSecurityException;
-import androidx.test.espresso.UiController;
 import androidx.test.espresso.base.IdlingResourceRegistry.IdleNotificationCallback;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import androidx.test.espresso.util.concurrent.ThreadFactoryBuilder;
+import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -78,7 +75,8 @@ enum IdleCondition {
     COMPAT_TASKS_HAVE_IDLED,
     KEY_INJECT_HAS_COMPLETED,
     MOTION_INJECTION_HAS_COMPLETED,
-    DYNAMIC_TASKS_HAVE_IDLED;
+    DYNAMIC_TASKS_HAVE_IDLED,
+    POSSIBLE_RACE_CONDITION_DETECTED;
 
     /** Checks whether this condition has been signaled. */
     public boolean isSignaled(BitSet conditionSet) {
@@ -149,8 +147,8 @@ private enum InterrogationStatus {
           new ThreadFactoryBuilder().setNameFormat("Espresso Key Event #%d").build());
   private final Looper mainLooper;
   private final IdlingResourceRegistry idlingResourceRegistry;
+  private final Handler controllerHandler;
 
-  private Handler controllerHandler;
   // only updated on main thread.
   private MainThreadInterrogation interrogation;
   private int generation = 0;
@@ -174,6 +172,7 @@ private enum InterrogationStatus {
     this.dynamicIdleProvider = checkNotNull(dynamicIdle);
     this.mainLooper = checkNotNull(mainLooper);
     this.idlingResourceRegistry = checkNotNull(idlingResourceRegistry);
+    controllerHandler = new Handler(mainLooper, this);
   }
 
   @SuppressWarnings("deprecation")
@@ -181,7 +180,6 @@ private enum InterrogationStatus {
   public boolean injectKeyEvent(final KeyEvent event) throws InjectEventSecurityException {
     checkNotNull(event);
     checkState(Looper.myLooper() == mainLooper, "Expecting to be on main thread!");
-    initialize();
     loopMainThreadUntilIdle();
 
     FutureTask<Boolean> injectTask =
@@ -221,7 +219,6 @@ public Boolean call() throws Exception {
   public boolean injectMotionEvent(final MotionEvent event) throws InjectEventSecurityException {
     checkNotNull(event);
     checkState(Looper.myLooper() == mainLooper, "Expecting to be on main thread!");
-    initialize();
     FutureTask<Boolean> injectTask =
         new SignalingTask<Boolean>(
             new Callable<Boolean>() {
@@ -257,11 +254,10 @@ public Boolean call() throws Exception {
   public boolean injectMotionEventSequence(final Iterable<MotionEvent> events)
       throws InjectEventSecurityException {
     checkNotNull(events);
-    checkState(!Iterables.isEmpty(events), "Expecting non-empty events to inject");
+    checkState(events.iterator().hasNext(), "Expecting non-empty events to inject");
     checkState(Looper.myLooper() == mainLooper, "Expecting to be on main thread!");
-    initialize();
     final Iterator<MotionEvent> mei = events.iterator();
-    final long downTime = Iterables.getFirst(events, null).getEventTime();
+    final long downTime = events.iterator().next().getEventTime();
     final long shift = SystemClock.uptimeMillis() - downTime;
     FutureTask<Boolean> injectTask =
         new SignalingTask<>(
@@ -313,7 +309,6 @@ public Boolean call() throws Exception {
   public boolean injectString(String str) throws InjectEventSecurityException {
     checkNotNull(str);
     checkState(Looper.myLooper() == mainLooper, "Expecting to be on main thread!");
-    initialize();
 
     // No-op if string is empty.
     if (str.isEmpty()) {
@@ -380,16 +375,7 @@ public boolean injectString(String str) throws InjectEventSecurityException {
   @VisibleForTesting
   @SuppressWarnings("deprecation")
   public static KeyCharacterMap getKeyCharacterMap() {
-    KeyCharacterMap keyCharacterMap = null;
-
-    // KeyCharacterMap.VIRTUAL_KEYBOARD is present from API11.
-    // For earlier APIs we use KeyCharacterMap.BUILT_IN_KEYBOARD
-    if (Build.VERSION.SDK_INT < 11) {
-      keyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.BUILT_IN_KEYBOARD);
-    } else {
-      keyCharacterMap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
-    }
-    return keyCharacterMap;
+    return KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
   }
 
   @Override
@@ -399,7 +385,6 @@ public IdlingResourceRegistry getIdlingResourceRegistry() {
 
   @Override
   public void loopMainThreadUntilIdle() {
-    initialize();
     checkState(Looper.myLooper() == mainLooper, "Expecting to be on main thread!");
     IdleNotifier<IdleNotificationCallback> dynamicIdle = dynamicIdleProvider.get();
     do {
@@ -455,8 +440,6 @@ public void allResourcesIdle() {
 
   @Override
   public void loopMainThreadForAtLeast(long millisDelay) {
-    initialize();
-
     checkState(Looper.myLooper() == mainLooper, "Expecting to be on main thread!");
     checkState(!IdleCondition.DELAY_HAS_PAST.isSignaled(conditionSet), "recursion detected!");
     checkArgument(millisDelay > 0);
@@ -517,13 +500,15 @@ private IdleNotifier<IdleNotificationCallback> loopUntil(
       EnumSet<IdleCondition> conditions, IdleNotifier<IdleNotificationCallback> dynamicIdle) {
     IdlingPolicy masterIdlePolicy = IdlingPolicies.getMasterIdlingPolicy();
     IdlingPolicy dynamicIdlePolicy = IdlingPolicies.getDynamicIdlingResourceErrorPolicy();
+    TestLooperManagerCompat testLooperManager = TestLooperManagerCompat.acquire(mainLooper);
     try {
       long start = SystemClock.uptimeMillis();
       long end =
           start + masterIdlePolicy.getIdleTimeoutUnit().toMillis(masterIdlePolicy.getIdleTimeout());
       interrogation = new MainThreadInterrogation(conditions, conditionSet, end);
 
-      InterrogationStatus result = Interrogator.loopAndInterrogate(interrogation);
+      InterrogationStatus result =
+          new Interrogator().loopAndInterrogate(testLooperManager, interrogation);
       if (InterrogationStatus.COMPLETED == result) {
         // did not time out, all conditions happy.
         return dynamicIdle;
@@ -533,10 +518,10 @@ private IdleNotifier<IdleNotificationCallback> loopUntil(
       }
 
       // timed out... what went wrong?
-      List<String> idleConditions = Lists.newArrayList();
+      List<String> idleConditions = new ArrayList<>();
       for (IdleCondition condition : conditions) {
         if (!condition.isSignaled(conditionSet)) {
-          idleConditions.add(condition.name());
+          String conditionName = condition.name();
           switch (condition) {
             case ASYNC_TASKS_HAVE_IDLED:
               if (masterIdlePolicy.getDisableOnTimeout()
@@ -562,12 +547,21 @@ private IdleNotifier<IdleNotificationCallback> loopUntil(
                 dynamicIdleProvider = new NoopIdleNotificationCallbackIdleNotifierProvider();
                 dynamicIdle = dynamicIdleProvider.get();
               }
+
+              conditionName =
+                  String.format(
+                      Locale.ROOT,
+                      "%s(busy resources=%s)",
+                      conditionName,
+                      idlingResourceRegistry.describeBusyResources());
               break;
             default:
               break;
           }
+          idleConditions.add(conditionName);
         }
       }
+
       if (idleConditions.isEmpty()) {
         // Formatted to look consistent with other idling conditions.
         idleConditions.add(
@@ -587,13 +581,13 @@ private IdleNotifier<IdleNotificationCallback> loopUntil(
         condition.reset(conditionSet);
       }
       interrogation = null;
+      testLooperManager.release();
     }
     return dynamicIdle;
   }
 
   @Override
   public void interruptEspressoTasks() {
-    initialize();
     controllerHandler.post(
         new Runnable() {
           @Override
@@ -716,12 +710,6 @@ private boolean conditionsMet() {
     }
   }
 
-  private void initialize() {
-    if (controllerHandler == null) {
-      controllerHandler = new Handler(this);
-    }
-  }
-
   /**
    * Encapsulates posting a signal message to update the conditions set after a task has executed.
    */
diff --git a/espresso/core/java/androidx/test/espresso/base/UiControllerModule.java b/espresso/core/java/androidx/test/espresso/base/UiControllerModule.java
index a3285a9a2..135c532e4 100644
--- a/espresso/core/java/androidx/test/espresso/base/UiControllerModule.java
+++ b/espresso/core/java/androidx/test/espresso/base/UiControllerModule.java
@@ -16,9 +16,10 @@
 
 package androidx.test.espresso.base;
 
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.espresso.InjectEventSecurityException;
 import androidx.test.espresso.UiController;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
@@ -31,6 +32,7 @@
  *
  * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 @Module
 public class UiControllerModule {
 
@@ -92,8 +94,6 @@ public void loopMainThreadForAtLeast(long millisDelay) {
     }
 
     @Override
-    public void interruptEspressoTasks() {
-      Log.w("UiController", "interruptEspressoTasks called, no-op");
-    }
+    public void interruptEspressoTasks() {}
   }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/ViewFinderImpl.java b/espresso/core/java/androidx/test/espresso/base/ViewFinderImpl.java
index fcf8e2332..96eace034 100644
--- a/espresso/core/java/androidx/test/espresso/base/ViewFinderImpl.java
+++ b/espresso/core/java/androidx/test/espresso/base/ViewFinderImpl.java
@@ -17,22 +17,18 @@
 package androidx.test.espresso.base;
 
 import static androidx.test.espresso.util.TreeIterables.breadthFirstViewTraversal;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkMainThread;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
-import android.os.Looper;
 import android.view.View;
 import android.widget.AdapterView;
 import androidx.test.espresso.AmbiguousViewMatcherException;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewFinder;
 import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.espresso.util.EspressoOptional;
-import com.google.common.base.Joiner;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
+import androidx.test.espresso.util.IterablesKt;
+import androidx.test.espresso.util.Iterators;
+import androidx.test.espresso.util.StringJoinerKt;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
@@ -57,13 +53,11 @@ public final class ViewFinderImpl implements ViewFinder {
   @Override
   public View getView() throws AmbiguousViewMatcherException, NoMatchingViewException {
     checkMainThread();
-    final Predicate<View> matcherPredicate =
-        new MatcherPredicateAdapter<View>(checkNotNull(viewMatcher));
+    checkNotNull(viewMatcher);
 
     View root = rootViewProvider.get();
     Iterator<View> matchedViewIterator =
-        Iterables.filter(breadthFirstViewTraversal(root), matcherPredicate).iterator();
-
+        IterablesKt.filter(breadthFirstViewTraversal(root), viewMatcher).iterator();
     View matchedView = null;
 
     while (matchedViewIterator.hasNext()) {
@@ -81,11 +75,10 @@ public View getView() throws AmbiguousViewMatcherException, NoMatchingViewExcept
       }
     }
     if (null == matchedView) {
-      final Predicate<View> adapterViewPredicate =
-          new MatcherPredicateAdapter<View>(ViewMatchers.isAssignableFrom(AdapterView.class));
       List<View> adapterViews =
-          Lists.newArrayList(
-              Iterables.filter(breadthFirstViewTraversal(root), adapterViewPredicate).iterator());
+          IterablesKt.filterToList(
+              breadthFirstViewTraversal(root), ViewMatchers.isAssignableFrom(AdapterView.class));
+
       if (adapterViews.isEmpty()) {
         throw new NoMatchingViewException.Builder()
             .withViewMatcher(viewMatcher)
@@ -99,35 +92,15 @@ public View getView() throws AmbiguousViewMatcherException, NoMatchingViewExcept
               "\n"
                   + "If the target view is not part of the view hierarchy, you may need to use"
                   + " Espresso.onData to load it from one of the following AdapterViews:%s",
-              Joiner.on("\n- ").join(adapterViews));
+              StringJoinerKt.joinToString(adapterViews, "\n- "));
       throw new NoMatchingViewException.Builder()
           .withViewMatcher(viewMatcher)
           .withRootView(root)
           .withAdapterViews(adapterViews)
-          .withAdapterViewWarning(EspressoOptional.of(warning))
+          .withAdapterViewWarning(warning)
           .build();
     } else {
       return matchedView;
     }
   }
-
-  private void checkMainThread() {
-    checkState(
-        Thread.currentThread().equals(Looper.getMainLooper().getThread()),
-        "Executing a query on the view hierarchy outside of the main thread (on: %s)",
-        Thread.currentThread().getName());
-  }
-
-  private static class MatcherPredicateAdapter<T> implements Predicate<T> {
-    private final Matcher<? super T> matcher;
-
-    private MatcherPredicateAdapter(Matcher<? super T> matcher) {
-      this.matcher = checkNotNull(matcher);
-    }
-
-    @Override
-    public boolean apply(T input) {
-      return matcher.matches(input);
-    }
-  }
 }
diff --git a/espresso/core/java/androidx/test/espresso/base/ViewHierarchyExceptionHandler.java b/espresso/core/java/androidx/test/espresso/base/ViewHierarchyExceptionHandler.java
new file mode 100644
index 000000000..1d2ed33ff
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/base/ViewHierarchyExceptionHandler.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.base;
+
+import static androidx.test.espresso.util.Throwables.throwIfUnchecked;
+
+import android.util.Log;
+import android.view.View;
+import androidx.annotation.Nullable;
+import androidx.test.espresso.RootViewException;
+import androidx.test.espresso.base.DefaultFailureHandler.TypedFailureHandler;
+import androidx.test.espresso.util.HumanReadables;
+import androidx.test.platform.io.PlatformTestStorage;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
+import androidx.test.services.storage.TestStorageException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.hamcrest.Matcher;
+
+/**
+ * An Espresso failure handler that handles a {@link RootViewException} to dump the full view
+ * hierarchy to an artifact file.
+ */
+class ViewHierarchyExceptionHandler<T extends Throwable & RootViewException>
+    extends TypedFailureHandler<T> {
+  private static final String TAG = ViewHierarchyExceptionHandler.class.getSimpleName();
+  // Max stack length that can be printed without being truncated in android log. Used to
+  // display a truncated version of the view hierarchy and still have some extra room for the
+  // stack trace.
+  private static final int MAX_MSG_SIZE = (64 - 2) * 1024;
+  private static final String VIEW_HIERARCHY_CHAR_LIMIT = "view_hierarchy_char_limit";
+
+  private final AtomicInteger failureCount;
+  private final Truncater<T> truncater;
+
+  interface Truncater<T> {
+    Throwable truncateExceptionMessage(T exception, int msgLen, String viewHierarchyFile);
+  }
+
+  public ViewHierarchyExceptionHandler(
+      AtomicInteger failureCount,
+      Class<T> expectedType,
+      Truncater<T> truncater) {
+    super(expectedType);
+    this.failureCount = failureCount;
+    this.truncater = truncater;
+  }
+
+  @Override
+  public void handleSafely(T exception, Matcher<View> viewMatcher) {
+    String viewHierarchyFile = dumpFullViewHierarchyToFile(exception);
+
+    exception.setStackTrace(Thread.currentThread().getStackTrace());
+
+    int msgLen = getMsgLen();
+
+    // Truncate exception message to fit within a printable stack frame dump.
+    Throwable error = truncater.truncateExceptionMessage(exception, msgLen, viewHierarchyFile);
+
+    throwIfUnchecked(error);
+    throw new RuntimeException(error);
+  }
+
+  private int getMsgLen() {
+    PlatformTestStorage testStorage = PlatformTestStorageRegistry.getInstance();
+    try {
+      if (testStorage.getInputArgs().containsKey(VIEW_HIERARCHY_CHAR_LIMIT)) {
+        String limit = testStorage.getInputArg(VIEW_HIERARCHY_CHAR_LIMIT);
+        if (limit != null) {
+          return Integer.parseInt(limit);
+        }
+      }
+    } catch (NumberFormatException | TestStorageException e) {
+      Log.e(TAG, "Failed to parse input argument " + VIEW_HIERARCHY_CHAR_LIMIT, e);
+    }
+    return MAX_MSG_SIZE;
+  }
+
+  @Nullable
+  private String dumpFullViewHierarchyToFile(T error) {
+    String viewHierarchyMsg =
+        HumanReadables.getViewHierarchyErrorMessage(
+            error.getRootView(),
+            /* problemViews= */ null,
+            /* errorHeader= */ "",
+            /* problemViewSuffix= */ null);
+
+    String viewHierarchyFile = "view-hierarchy-" + failureCount + ".txt";
+    try {
+      addOutputFile(viewHierarchyFile, viewHierarchyMsg);
+      Log.w(
+          TAG,
+          "The complete view hierarchy is available in artifact file '" + viewHierarchyFile + "'.");
+      return viewHierarchyFile;
+    } catch (IOException e) {
+      // Log and ignore.
+      Log.w(TAG, "Failed to save the view hierarchy to file " + viewHierarchyFile, e);
+      return null;
+    }
+  }
+
+  private void addOutputFile(String filename, String content) throws IOException {
+    try (OutputStream out = PlatformTestStorageRegistry.getInstance().openOutputFile(filename)) {
+      out.write(content.getBytes());
+    }
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/base/WindowManagerEventInjectionStrategy.java b/espresso/core/java/androidx/test/espresso/base/WindowManagerEventInjectionStrategy.java
deleted file mode 100644
index 6b6ffe4c1..000000000
--- a/espresso/core/java/androidx/test/espresso/base/WindowManagerEventInjectionStrategy.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.espresso.base;
-
-import static com.google.common.base.Preconditions.checkState;
-
-import android.os.Build;
-import android.os.IBinder;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import androidx.test.espresso.InjectEventSecurityException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * An {@link EventInjectionStrategy} that uses the window manager to inject {@link MotionEvent}s.
- * This strategy supports API level 15 and below.
- */
-final class WindowManagerEventInjectionStrategy implements EventInjectionStrategy {
-  private static final String TAG = WindowManagerEventInjectionStrategy.class.getSimpleName();
-
-  WindowManagerEventInjectionStrategy() {
-    checkState(Build.VERSION.SDK_INT >= 7 && Build.VERSION.SDK_INT <= 15, "Unsupported API level.");
-  }
-
-  // Reflection members.
-  private boolean initComplete;
-  private Object wmInstance;
-  private Method injectInputKeyEventMethod;
-  private Method injectInputMotionEventMethod;
-
-  void initialize() {
-    if (initComplete) {
-      return;
-    }
-
-    try {
-      Log.d(TAG, "Trying to create injection strategy.");
-
-      Class<?> serviceManagerClassObj = Class.forName("android.os.ServiceManager");
-      Method windowServiceMethod =
-          serviceManagerClassObj.getDeclaredMethod("getService", String.class);
-      windowServiceMethod.setAccessible(true);
-
-      Object windowServiceBinderObj = windowServiceMethod.invoke(serviceManagerClassObj, "window");
-
-      Class<?> windowManagerStubObject = Class.forName("android.view.IWindowManager$Stub");
-      Method asInterfaceMethod =
-          windowManagerStubObject.getDeclaredMethod("asInterface", IBinder.class);
-      asInterfaceMethod.setAccessible(true);
-
-      wmInstance = asInterfaceMethod.invoke(windowManagerStubObject, windowServiceBinderObj);
-
-      injectInputMotionEventMethod =
-          wmInstance
-              .getClass()
-              .getDeclaredMethod("injectPointerEvent", MotionEvent.class, Boolean.TYPE);
-      injectInputMotionEventMethod.setAccessible(true);
-
-      injectInputKeyEventMethod =
-          wmInstance.getClass().getDeclaredMethod("injectKeyEvent", KeyEvent.class, Boolean.TYPE);
-      injectInputKeyEventMethod.setAccessible(true);
-
-      initComplete = true;
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalArgumentException e) {
-      throw e;
-    } catch (InvocationTargetException e) {
-      throw new RuntimeException(e);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(e);
-    } catch (SecurityException e) {
-      throw e;
-    }
-  }
-
-  @Override
-  public boolean injectKeyEvent(KeyEvent keyEvent) throws InjectEventSecurityException {
-    try {
-      // From javadoc of com.android.server.WindowManagerService.injectKeyEvent:
-      // @param sync If true, wait for the event to be completed before returning to the caller.
-      // @return true if event was dispatched, false if it was dropped for any reason
-      //
-      // Key events are delivered OFF the main thread, and we block until they are processed.
-      return (Boolean) injectInputKeyEventMethod.invoke(wmInstance, keyEvent, true);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalArgumentException e) {
-      throw e;
-    } catch (InvocationTargetException e) {
-      Throwable cause = e.getCause();
-      if (cause instanceof SecurityException) {
-        throw new InjectEventSecurityException(cause);
-      }
-      throw new RuntimeException(e);
-    } catch (SecurityException e) {
-      throw new InjectEventSecurityException(e);
-    }
-  }
-
-  @Override
-  public boolean injectMotionEvent(MotionEvent motionEvent, boolean sync)
-      throws InjectEventSecurityException {
-    try {
-      // From javadoc of com.android.server.WindowManagerService.injectKeyEvent:
-      // @param sync If true, wait for the event to be completed before returning to the caller.
-      // @return true if event was dispatched, false if it was dropped for any reason
-      //
-      // We inject the pointer with sync=true to ensure the event is dispatched before control
-      // is returned to our code.
-
-      return (Boolean) injectInputMotionEventMethod.invoke(wmInstance, motionEvent, sync);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    } catch (IllegalArgumentException e) {
-      throw e;
-    } catch (InvocationTargetException e) {
-      Throwable cause = e.getCause();
-      if (cause instanceof SecurityException) {
-        throw new InjectEventSecurityException(cause);
-      }
-      throw new RuntimeException(e);
-    } catch (SecurityException e) {
-      throw new InjectEventSecurityException(e);
-    }
-  }
-}
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/BUILD b/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/BUILD
new file mode 100644
index 000000000..1f48693ce
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/BUILD
@@ -0,0 +1,20 @@
+# Description:
+#   Internal package that will contain shaded dagger classes for external release
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/core/java/androidx/test/espresso:__pkg__"],
+)
+
+java_library(
+    name = "dagger",
+    srcs = glob(["*java"]),
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/package-info.java b/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/package-info.java
new file mode 100644
index 000000000..1c652e55c
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/dagger/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.core.internal.deps.dagger;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD
new file mode 100644
index 000000000..4c87d0b89
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/BUILD
@@ -0,0 +1,21 @@
+# Description:
+#    Redefinition of repackaged guava classes that were mistakenly exposed in public EspressoOptional API
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
+)
+
+android_library(
+    name = "base",
+    srcs = glob(["*java"]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Function.java b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Function.java
new file mode 100644
index 000000000..5c88a1a88
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Function.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.core.internal.deps.guava.base;
+
+/**
+ * Redefinition of Guava's Function, created to avoid compatibility breakages for users of
+ * EspressoOptional.
+ *
+ * @deprecated implementation detail, use Guava Function instead
+ */
+@Deprecated
+public interface Function<F, T> {
+  public T apply(F value);
+}
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Optional.java b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Optional.java
new file mode 100644
index 000000000..369fdc70d
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Optional.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.core.internal.deps.guava.base;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+
+import androidx.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Redefinition of Guava's Optional, created to avoid compatibilty breakages for users of
+ * EspressoOptional.
+ *
+ * @deprecated use androidx.annotation.Nullable instead
+ */
+@Deprecated
+public class Optional<T> implements java.io.Serializable {
+
+  @Nullable private final T value;
+
+  private Optional(T value) {
+    this.value = value;
+  }
+
+  public static <T> Optional<T> fromNullable(@Nullable T value) {
+    return new Optional<>(value);
+  }
+
+  public static <T> Optional<T> of(T value) {
+    return new Optional<>(checkNotNull(value));
+  }
+
+  @Override
+  public int hashCode() {
+    // copy the Guava implementation
+    return isPresent() ? 0x598df91c + value.hashCode() : 0x79a31aac;
+  }
+
+  public Optional<T> or(Optional<T> other) {
+    return isPresent() ? this : other;
+  }
+
+  public T or(Supplier<T> supplier) {
+    return or(supplier.get());
+  }
+
+  public T or(T other) {
+    return isPresent() ? value : other;
+  }
+
+  public <V> Optional<V> transform(Function<? super T, V> function) {
+    return fromNullable(function.apply(value));
+  }
+
+  public static <T> Iterable<T> presentInstances(
+      final Iterable<? extends Optional<? extends T>> optionals) {
+    List<T> list = new ArrayList<>();
+    for (Optional<? extends T> optional : optionals) {
+      if (optional.isPresent()) {
+        list.add(optional.get());
+      }
+    }
+    return list;
+  }
+
+  public T get() {
+    return checkNotNull(value);
+  }
+
+  public T orNull() {
+    return value;
+  }
+
+  public Set<T> asSet() {
+    return isPresent() ? singleton(value) : emptySet();
+  }
+
+  public boolean isPresent() {
+    return value != null;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    if (object instanceof Optional) {
+      Optional<?> other = (Optional<?>) object;
+      if (isPresent()) {
+        return value.equals(other.get());
+      } else if (!other.isPresent()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static final long serialVersionUID = 0;
+}
diff --git a/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Supplier.java b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Supplier.java
new file mode 100644
index 000000000..4a06d6c7d
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base/Supplier.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.core.internal.deps.guava.base;
+
+/**
+ * Redefinition of Guava's Supplier, created to avoid compatibility breakages for users of
+ * EspressoOptional.
+ *
+ * @deprecated implementation detail, use Guava's Supplier instead
+ */
+@Deprecated
+public interface Supplier<T> {
+  public T get();
+}
diff --git a/espresso/core/java/androidx/test/espresso/device/BUILD.bazel b/espresso/core/java/androidx/test/espresso/device/BUILD.bazel
deleted file mode 100644
index b5dbf4a45..000000000
--- a/espresso/core/java/androidx/test/espresso/device/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-# Device Actions for espresso.
-
-licenses(["notice"])
-
-package(default_visibility = ["//visibility:private"])
-
-android_library(
-    name = "device",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//runner/monitor",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/device/DeviceInteraction.java b/espresso/core/java/androidx/test/espresso/device/DeviceInteraction.java
deleted file mode 100644
index fe3b09976..000000000
--- a/espresso/core/java/androidx/test/espresso/device/DeviceInteraction.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.espresso.device;
-
-import androidx.test.annotation.ExperimentalDeviceInteraction;
-
-/**
- * API surface for performing device-centric operations.
- *
- * <p>This API is experimental and subject to change.
- */
-@ExperimentalDeviceInteraction
-public class DeviceInteraction {}
diff --git a/espresso/core/java/androidx/test/espresso/device/EspressoDevice.java b/espresso/core/java/androidx/test/espresso/device/EspressoDevice.java
deleted file mode 100644
index a2cd7083b..000000000
--- a/espresso/core/java/androidx/test/espresso/device/EspressoDevice.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.espresso.device;
-
-import androidx.test.annotation.ExperimentalDeviceInteraction;
-
-/** Entry point for device centric operations */
-public class EspressoDevice {
-
-  private EspressoDevice() {}
-
-  /**
-   * Starts a {@link DeviceInteraction} fluent API call. This method is used to invoke operations
-   * that are device-centric in scope.
-   *
-   * <p>This API is experimental and subject to change or removal.
-   */
-  @ExperimentalDeviceInteraction
-  public static DeviceInteraction onDevice() {
-    return new DeviceInteraction();
-  }
-}
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/BUILD b/espresso/core/java/androidx/test/espresso/internal/data/BUILD
new file mode 100644
index 000000000..e4be4a1b4
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/internal/data/BUILD
@@ -0,0 +1,23 @@
+# This package loads and stores test output artifact metadata for easier debugging of Espresso tests
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
+)
+
+android_library(
+    name = "data",
+    srcs = glob([
+        "*.java",
+    ]),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/internal/data/model",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/BUILD.bazel b/espresso/core/java/androidx/test/espresso/internal/data/BUILD.bazel
deleted file mode 100644
index 03919c1d0..000000000
--- a/espresso/core/java/androidx/test/espresso/internal/data/BUILD.bazel
+++ /dev/null
@@ -1,18 +0,0 @@
-# This package loads and stores test output artifact metadata for easier debugging of Espresso tests
-
-licenses(["notice"])
-
-package(default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"])
-
-android_library(
-    name = "data",
-    srcs = [
-        "TestFlowVisualizer.java",
-    ],
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/internal/data/model",
-        "//runner/monitor/java/androidx/test:monitor",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/model/ActionData.kt b/espresso/core/java/androidx/test/espresso/internal/data/model/ActionData.kt
index e3ffedd80..ca08bb4f9 100644
--- a/espresso/core/java/androidx/test/espresso/internal/data/model/ActionData.kt
+++ b/espresso/core/java/androidx/test/espresso/internal/data/model/ActionData.kt
@@ -18,13 +18,7 @@ package androidx.test.espresso.internal.data.model
 
 import androidx.test.espresso.ViewAction
 
-/**
- * [ActionData] stores metadata of [androidx.test.espresso.ViewAction].
- *
- * @param source the [ScreenData] node this ActionData object belongs to.
- * @param dest the [ScreenData] node this ActionData object points to.
- * @param viewActionData Data pertaining to a ViewAction.
- */
+/** [ActionData] stores metadata of [androidx.test.espresso.ViewAction]. */
 data class ActionData(
   val index: Int?,
   val name: String?,
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD b/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD
new file mode 100644
index 000000000..aef2ff83a
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD
@@ -0,0 +1,23 @@
+# This package loads and stores test output artifact metadata for easier debugging of Espresso tests
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
+)
+
+kt_android_library(
+    name = "model",
+    srcs = glob([
+        "*.kt",
+        "*.java",
+    ]),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//opensource/androidx:annotation",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD.bazel b/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD.bazel
deleted file mode 100644
index 9403e79e1..000000000
--- a/espresso/core/java/androidx/test/espresso/internal/data/model/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-# This package loads and stores test output artifact metadata for easier debugging of Espresso tests
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
-
-licenses(["notice"])
-
-package(default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"])
-
-kt_android_library(
-    name = "model",
-    srcs = [
-        "ActionData.kt",
-        "ScreenData.kt",
-        "TestArtifact.kt",
-        "TestFlow.kt",
-        "ViewData.kt",
-    ],
-    deps = [
-        "//espresso/core/java/androidx/test/espresso:framework",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/model/package-info.java b/espresso/core/java/androidx/test/espresso/internal/data/model/package-info.java
new file mode 100644
index 000000000..7599a143d
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/internal/data/model/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.internal.data.model;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/internal/data/package-info.java b/espresso/core/java/androidx/test/espresso/internal/data/package-info.java
new file mode 100644
index 000000000..69679ecc0
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/internal/data/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.internal.data;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/internal/inject/BUILD b/espresso/core/java/androidx/test/espresso/internal/inject/BUILD
new file mode 100644
index 000000000..cdaed60b0
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/internal/inject/BUILD
@@ -0,0 +1,23 @@
+# Description:
+#   Exposes test infrastructure as a dagger module.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "inject",
+    srcs = glob(["*java"]),
+    visibility = [
+        "//:__subpackages__",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/internal/inject/BUILD.bazel b/espresso/core/java/androidx/test/espresso/internal/inject/BUILD.bazel
deleted file mode 100644
index c3ea39eda..000000000
--- a/espresso/core/java/androidx/test/espresso/internal/inject/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-# Description:
-#   Exposes test infrastructure as a dagger module.
-
-package(default_visibility = ["//visibility:public"])
-
-android_library(
-    name = "inject",
-    srcs = glob(["*java"]),
-    deps = [
-        "@jsr330",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/internal/inject/InstrumentationContext.java b/espresso/core/java/androidx/test/espresso/internal/inject/InstrumentationContext.java
index c36823c1f..d97630c58 100644
--- a/espresso/core/java/androidx/test/espresso/internal/inject/InstrumentationContext.java
+++ b/espresso/core/java/androidx/test/espresso/internal/inject/InstrumentationContext.java
@@ -15,6 +15,8 @@
  */
 package androidx.test.espresso.internal.inject;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import javax.inject.Qualifier;
@@ -24,6 +26,7 @@
  *
  * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 public @interface InstrumentationContext {}
diff --git a/espresso/core/java/androidx/test/espresso/internal/inject/TargetContext.java b/espresso/core/java/androidx/test/espresso/internal/inject/TargetContext.java
index 6fb767da9..97b65077a 100644
--- a/espresso/core/java/androidx/test/espresso/internal/inject/TargetContext.java
+++ b/espresso/core/java/androidx/test/espresso/internal/inject/TargetContext.java
@@ -15,6 +15,8 @@
  */
 package androidx.test.espresso.internal.inject;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import javax.inject.Qualifier;
@@ -24,6 +26,7 @@
  *
  * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)
 public @interface TargetContext {}
diff --git a/espresso/core/java/androidx/test/espresso/matcher/BUILD b/espresso/core/java/androidx/test/espresso/matcher/BUILD
new file mode 100644
index 000000000..12427b505
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/matcher/BUILD
@@ -0,0 +1,34 @@
+# Description:
+#  Matchers for Espresso!
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "matcher",
+    srcs = glob(
+        ["*.java"],
+    ),
+    exports = [
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/matcher/BUILD.bazel b/espresso/core/java/androidx/test/espresso/matcher/BUILD.bazel
deleted file mode 100644
index 07527da27..000000000
--- a/espresso/core/java/androidx/test/espresso/matcher/BUILD.bazel
+++ /dev/null
@@ -1,67 +0,0 @@
-# Description:
-#  Matchers for Espresso!
-licenses(["notice"])
-
-package(default_visibility = ["//visibility:public"])
-
-REMOTE_VIEW_MATCHERS = [
-    "RemoteRootMatchers.java",
-    "RemoteViewMatchers.java",
-    "*RemoteMessage.java",
-]
-
-REMOTE_HAMCREST_v1_3_CORE_MATCHERS = [
-    "RemoteHamcrestCoreMatchers13.java",
-]
-
-android_library(
-    name = "matcher",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_VIEW_MATCHERS + REMOTE_HAMCREST_v1_3_CORE_MATCHERS,
-    ),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library(
-    name = "remote_view_matchers",
-    srcs = glob(
-        REMOTE_VIEW_MATCHERS,
-    ),
-    deps = [
-        ":matcher",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:hamcrest_matchers_v1_3_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:ui_interaction_root_matchers_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "remote_hamcrest_v1_3_core_matchers",
-    srcs = glob(
-        REMOTE_HAMCREST_v1_3_CORE_MATCHERS,
-    ),
-    deps = [
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:hamcrest_matchers_v1_3_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/matcher/BoundedDiagnosingMatcher.java b/espresso/core/java/androidx/test/espresso/matcher/BoundedDiagnosingMatcher.java
index 3d5765c69..96c1b69dc 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/BoundedDiagnosingMatcher.java
+++ b/espresso/core/java/androidx/test/espresso/matcher/BoundedDiagnosingMatcher.java
@@ -1,7 +1,7 @@
 package androidx.test.espresso.matcher;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -68,7 +68,8 @@ public final void describeTo(Description description) {
     matcher.describeTo(description);
     Description implDescription = new StringDescription();
     describeMoreTo(implDescription);
-    String implDescriptionString = implDescription.toString();
+    // workaround for #1351 - javac generates bytecode not handled by older ART versions
+    String implDescriptionString = ((Object) implDescription).toString();
     if (!implDescriptionString.isEmpty()) {
       description.appendText(" and ").appendText(implDescriptionString);
     }
diff --git a/espresso/core/java/androidx/test/espresso/matcher/BoundedMatcher.java b/espresso/core/java/androidx/test/espresso/matcher/BoundedMatcher.java
index e8098e354..5fae1872d 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/BoundedMatcher.java
+++ b/espresso/core/java/androidx/test/espresso/matcher/BoundedMatcher.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.matcher;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
diff --git a/espresso/core/java/androidx/test/espresso/matcher/CursorMatchers.java b/espresso/core/java/androidx/test/espresso/matcher/CursorMatchers.java
index 12b21fc24..be92cd5eb 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/CursorMatchers.java
+++ b/espresso/core/java/androidx/test/espresso/matcher/CursorMatchers.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.matcher;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.is;
 
 import android.database.Cursor;
diff --git a/espresso/core/java/androidx/test/espresso/matcher/HasBackgroundMatcher.java b/espresso/core/java/androidx/test/espresso/matcher/HasBackgroundMatcher.java
index 8f6b1a242..cac964bc7 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/HasBackgroundMatcher.java
+++ b/espresso/core/java/androidx/test/espresso/matcher/HasBackgroundMatcher.java
@@ -20,20 +20,13 @@
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.util.Log;
 import android.view.View;
-import androidx.test.annotation.Beta;
-import java.util.Arrays;
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;
 
 /**
  * Matcher to match {@link android.view.View} based on its background resource.
- *
- * <p><b>This API is currently in beta.</b>
  */
-@Beta
 public final class HasBackgroundMatcher extends TypeSafeMatcher<View> {
 
   private static final String TAG = "HasBackgroundMatcher";
@@ -53,19 +46,6 @@ public void describeTo(Description description) {
     description.appendText("has background with drawable ID: " + drawableId);
   }
 
-  static boolean compareBitmaps(Bitmap img1, Bitmap img2) {
-    if (img1.getWidth() == img2.getWidth() && img1.getHeight() == img2.getHeight()) {
-      int[] img1Pixels = new int[img1.getWidth() * img1.getHeight()];
-      int[] img2Pixels = new int[img2.getWidth() * img2.getHeight()];
-
-      img1.getPixels(img1Pixels, 0, img1.getWidth(), 0, 0, img1.getWidth(), img1.getHeight());
-      img2.getPixels(img2Pixels, 0, img2.getWidth(), 0, 0, img2.getWidth(), img2.getHeight());
-
-      return Arrays.equals(img1Pixels, img2Pixels);
-    }
-    return false;
-  }
-
   private static boolean assertDrawable(Drawable actual, int expectedId, View v) {
     if (null == actual || !(actual instanceof BitmapDrawable)) {
       return false;
@@ -74,15 +54,7 @@ private static boolean assertDrawable(Drawable actual, int expectedId, View v) {
     Bitmap expectedBitmap = null;
     try {
       expectedBitmap = BitmapFactory.decodeResource(v.getContext().getResources(), expectedId);
-      if (Build.VERSION.SDK_INT >= 12) {
-        return ((BitmapDrawable) actual).getBitmap().sameAs(expectedBitmap);
-      } else {
-        return compareBitmaps(((BitmapDrawable) actual).getBitmap(), expectedBitmap);
-      }
-    } catch (OutOfMemoryError error) {
-      Log.e(TAG, error.getMessage(), error.getCause());
-      return false;
-
+      return ((BitmapDrawable) actual).getBitmap().sameAs(expectedBitmap);
     } finally {
       if (expectedBitmap != null) {
         expectedBitmap.recycle();
diff --git a/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java b/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java
index fc8280562..71f63da29 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java
+++ b/espresso/core/java/androidx/test/espresso/matcher/RootMatchers.java
@@ -17,7 +17,7 @@
 package androidx.test.espresso.matcher;
 
 import static androidx.test.espresso.matcher.ViewMatchers.withClassName;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
@@ -34,7 +34,7 @@
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
 import androidx.test.runner.lifecycle.Stage;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import org.hamcrest.Description;
@@ -48,7 +48,6 @@ public final class RootMatchers {
   private RootMatchers() {}
 
   /** Espresso's default {@link Root} matcher. */
-  @SuppressWarnings("unchecked")
   public static final Matcher<Root> DEFAULT =
       allOf(
           hasWindowLayoutParams(),
@@ -123,7 +122,7 @@ private static List<IBinder> getResumedActivityTokens() {
           "suppressed: NoActivityResumedException(\"At least one activity should"
               + " be in RESUMED stage.\"");
     }
-    List<IBinder> tokens = Lists.newArrayList();
+    List<IBinder> tokens = new ArrayList<>();
     for (Activity activity : resumedActivities) {
       tokens.add(activity.getWindow().getDecorView().getApplicationWindowToken());
     }
@@ -236,7 +235,11 @@ public boolean matchesSafely(Root item) {
 
     @Override
     public void describeTo(Description description) {
-      description.appendText("with decor view of type PopupWindow$PopupViewContainer");
+      String popupClassName = "PopupWindow$PopupViewContainer";
+      if (Build.VERSION.SDK_INT >= 23) {
+        popupClassName = "PopupWindow$PopupDecorView";
+      }
+      description.appendText("with decor view of type " + popupClassName);
     }
   }
 
diff --git a/espresso/core/java/androidx/test/espresso/matcher/ViewMatchers.java b/espresso/core/java/androidx/test/espresso/matcher/ViewMatchers.java
index 9d084c8c4..4246e8d2f 100644
--- a/espresso/core/java/androidx/test/espresso/matcher/ViewMatchers.java
+++ b/espresso/core/java/androidx/test/espresso/matcher/ViewMatchers.java
@@ -18,8 +18,8 @@
 package androidx.test.espresso.matcher;
 
 import static androidx.test.espresso.util.TreeIterables.breadthFirstViewTraversal;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 
@@ -27,9 +27,6 @@
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.os.Build;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
 import android.view.View;
@@ -43,13 +40,13 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
 import androidx.test.espresso.util.HumanReadables;
-import com.google.common.base.Predicate;
-import com.google.common.collect.Iterables;
+import androidx.test.espresso.util.IterablesKt;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.regex.Pattern;
@@ -169,6 +166,16 @@ public static Matcher<View> isNotSelected() {
     return new IsSelectedMatcher(false);
   }
 
+  /** Returns a matcher that matches {@link View Views} that are activated. */
+  public static Matcher<View> isActivated() {
+    return new IsActivatedMatcher(/* isActivated= */ true);
+  }
+
+  /** Returns a matcher that matches {@link View Views} that are not activated. */
+  public static Matcher<View> isNotActivated() {
+    return new IsActivatedMatcher(/* isActivated= */ false);
+  }
+
   /**
    * Returns an <a href="http://hamcrest.org/JavaHamcrest/javadoc/1.3/org/hamcrest/Matcher.html">
    * <code>Matcher</code></a> that matches {@link View Views} based on their siblings.
@@ -990,11 +997,9 @@ protected boolean matchesSafely(View view, Description mismatchDescription) {
       float viewHeight = (view.getHeight() > screen.height()) ? screen.height() : view.getHeight();
       float viewWidth = (view.getWidth() > screen.width()) ? screen.width() : view.getWidth();
 
-      if (Build.VERSION.SDK_INT >= 11) {
-        // For API level 11 and above, factor in the View's scaleX and scaleY properties.
-        viewHeight = Math.min(view.getHeight() * Math.abs(view.getScaleY()), screen.height());
-        viewWidth = Math.min(view.getWidth() * Math.abs(view.getScaleX()), screen.width());
-      }
+      // factor in the View's scaleX and scaleY properties.
+      viewHeight = Math.min(view.getHeight() * Math.abs(view.getScaleY()), screen.height());
+      viewWidth = Math.min(view.getWidth() * Math.abs(view.getScaleX()), screen.width());
 
       double maxArea = viewHeight * viewWidth;
       double visibleArea = visibleParts.height() * visibleParts.width();
@@ -1159,6 +1164,31 @@ protected boolean matchesSafely(View view, Description mismatchDescription) {
     }
   }
 
+  static final class IsActivatedMatcher extends TypeSafeDiagnosingMatcher<View> {
+    @RemoteMsgField(order = 0)
+    private final boolean isActivated;
+
+    @RemoteMsgConstructor
+    private IsActivatedMatcher(boolean isActivated) {
+      this.isActivated = isActivated;
+    }
+
+    @Override
+    public void describeTo(Description description) {
+      description.appendText("view.isActivated() is ").appendValue(this.isActivated);
+    }
+
+    @Override
+    protected boolean matchesSafely(View view, Description mismatchDescription) {
+      final boolean isActivated = view.isActivated();
+      if (isActivated != this.isActivated) {
+        mismatchDescription.appendText("view.isActivated() was ").appendValue(isActivated);
+        return false;
+      }
+      return true;
+    }
+  }
+
   static final class HasSiblingMatcher extends TypeSafeDiagnosingMatcher<View> {
     @RemoteMsgField(order = 0)
     private final Matcher<View> siblingMatcher;
@@ -1514,11 +1544,19 @@ protected boolean matchesSafely(final View view, Description mismatchDescription
         return false;
       }
 
-      final Predicate<View> matcherPredicate =
-          input -> input != view && descendantMatcher.matches(input);
+      final Matcher<View> matcherPredicate =
+          new TypeSafeDiagnosingMatcher<View>() {
+            @Override
+            public void describeTo(Description description) {}
+
+            @Override
+            protected boolean matchesSafely(View input, Description description) {
+              return input != view && descendantMatcher.matches(input);
+            }
+          };
 
       Iterator<View> matchedViewIterator =
-          Iterables.filter(breadthFirstViewTraversal(view), matcherPredicate).iterator();
+          IterablesKt.filter(breadthFirstViewTraversal(view), matcherPredicate).iterator();
 
       if (!matchedViewIterator.hasNext()) {
         mismatchDescription
@@ -1651,24 +1689,17 @@ protected boolean matchesSafely(View view, Description mismatchDescription) {
   }
 
   /**
-   * Returns a matcher that matches {@link android.view.View} based on background resource.
+   * Returns a matcher that matches {@link android.view.View} based on background resource Bitmap.
    *
-   * <p>Note: This method compares images at a pixel level and might have significant performance
-   * implications for larger bitmaps.
-   *
-   * <p><b>This API is currently in beta.</b>
+   * @see android.graphics.Bitmap#sameAs
    */
-  @Beta
   public static Matcher<View> hasBackground(final int drawableId) {
     return new HasBackgroundMatcher(drawableId);
   }
 
   /**
    * Returns a matcher that matches {@link android.widget.TextView} based on it's color.
-   *
-   * <p><b>This API is currently in beta.</b>
    */
-  @Beta
   public static Matcher<View> hasTextColor(final int colorResId) {
     return new BoundedDiagnosingMatcher<View, TextView>(TextView.class) {
       private Context context;
@@ -1677,13 +1708,7 @@ public static Matcher<View> hasTextColor(final int colorResId) {
       protected boolean matchesSafely(TextView textView, Description mismatchDescription) {
         context = textView.getContext();
         int textViewColor = textView.getCurrentTextColor();
-        int expectedColor;
-
-        if (Build.VERSION.SDK_INT <= 22) {
-          expectedColor = context.getResources().getColor(colorResId);
-        } else {
-          expectedColor = context.getColor(colorResId);
-        }
+        int expectedColor = context.getColor(colorResId);
 
         mismatchDescription
             .appendText("textView.getCurrentTextColor() was ")
@@ -1697,10 +1722,7 @@ protected void describeMoreTo(Description description) {
         if (context == null) {
           description.appendText("ID ").appendValue(colorResId);
         } else {
-          int color =
-              (Build.VERSION.SDK_INT <= 22)
-                  ? context.getResources().getColor(colorResId)
-                  : context.getColor(colorResId);
+          int color = context.getColor(colorResId);
           description.appendText("value " + getColorHex(color));
         }
       }
@@ -1712,7 +1734,6 @@ private String getColorHex(int color) {
     };
   }
 
-
   @VisibleForTesting
   static final class WithAlphaMatcher extends TypeSafeDiagnosingMatcher<View> {
     @RemoteMsgField(order = 0)
diff --git a/espresso/core/java/androidx/test/espresso/proto/BUILD.bazel b/espresso/core/java/androidx/test/espresso/proto/BUILD.bazel
deleted file mode 100644
index e92919c35..000000000
--- a/espresso/core/java/androidx/test/espresso/proto/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote UI interactions
-
-licenses(["notice"])
-
-package(
-    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
-)
-
-proto_library(
-    name = "ui_interaction_proto",
-    srcs = ["ui_interaction.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "ui_interaction_android_pb3",
-    deps = [
-        ":ui_interaction_proto",
-        "@com_google_protobuf//:any_proto",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/proto/action/BUILD.bazel b/espresso/core/java/androidx/test/espresso/proto/action/BUILD.bazel
deleted file mode 100644
index bfbbed69c..000000000
--- a/espresso/core/java/androidx/test/espresso/proto/action/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-# Protocol buffer definitions for remote UI interactions view matchers
-
-licenses(["notice"])
-
-package(
-    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
-)
-
-proto_library(
-    name = "view_actions_proto",
-    srcs = ["view_actions.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "ui_interaction_view_actions_android_pb3",
-    deps = [":view_actions_proto"],
-)
diff --git a/espresso/core/java/androidx/test/espresso/proto/assertion/BUILD.bazel b/espresso/core/java/androidx/test/espresso/proto/assertion/BUILD.bazel
deleted file mode 100644
index 3854b850e..000000000
--- a/espresso/core/java/androidx/test/espresso/proto/assertion/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-# Protocol buffer definitions for remote view assertions
-
-licenses(["notice"])
-
-package(
-    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
-)
-
-proto_library(
-    name = "view_assertions_proto",
-    srcs = ["view_assertions.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "ui_interaction_view_assertions_android_pb3",
-    deps = [":view_assertions_proto"],
-)
diff --git a/espresso/core/java/androidx/test/espresso/proto/matcher/BUILD.bazel b/espresso/core/java/androidx/test/espresso/proto/matcher/BUILD.bazel
deleted file mode 100644
index 6b498aea0..000000000
--- a/espresso/core/java/androidx/test/espresso/proto/matcher/BUILD.bazel
+++ /dev/null
@@ -1,50 +0,0 @@
-# Protocol buffer definitions for remote root, view and hamcrest matchers (v1.3)
-
-licenses(["notice"])
-
-package(
-    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
-)
-
-proto_library(
-    name = "root_matchers_proto",
-    srcs = ["root_matchers.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "ui_interaction_root_matchers_android_pb3",
-    deps = [
-        ":root_matchers_proto",
-    ],
-)
-
-proto_library(
-    name = "view_matchers_proto",
-    srcs = ["view_matchers.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "ui_interaction_view_matchers_android_pb3",
-    deps = [":view_matchers_proto"],
-)
-
-proto_library(
-    name = "hamcrest_matchersv1_3_proto",
-    srcs = ["hamcrest_matchersv1_3.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "hamcrest_matchers_v1_3_android_pb3",
-    deps = [
-        ":hamcrest_matchersv1_3_proto",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/release_jarjar_rules.txt b/espresso/core/java/androidx/test/espresso/release_jarjar_rules.txt
index d93f57dc8..21adf7ecd 100644
--- a/espresso/core/java/androidx/test/espresso/release_jarjar_rules.txt
+++ b/espresso/core/java/androidx/test/espresso/release_jarjar_rules.txt
@@ -1,5 +1 @@
-rule com.google.common.** androidx.test.espresso.core.internal.deps.guava.@1
 rule dagger.** androidx.test.espresso.core.internal.deps.dagger.@1
-rule com.google.thirdparty.publicsuffix.** androidx.test.espresso.core.internal.deps.publicsuffix.@1
-rule com.google.android.aidl.** androidx.test.espresso.core.internal.deps.aidl.@1
-rule com.google.devtools.build.android.desugar.runtime.** androidx.test.espresso.core.internal.deps.desugar.@1
diff --git a/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml b/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml
index b256734cc..7e40ca101 100644
--- a/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml
+++ b/espresso/core/java/androidx/test/espresso/remote/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.espresso.remote" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application />
 
diff --git a/espresso/core/java/androidx/test/espresso/remote/BUILD b/espresso/core/java/androidx/test/espresso/remote/BUILD
new file mode 100644
index 000000000..f8436ae23
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/remote/BUILD
@@ -0,0 +1,89 @@
+# Description:
+#  The client side for communicating with espresso-remote
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+COMMON_JAVACOPTS = [
+    "-Xep:ObjectToString:OFF",  # See http://go/objecttostring-lsc
+]
+
+REMOTE_INTERFACES = [
+    "NoopRemoteInteraction.java",
+    "RemoteInteraction.java",
+    "RemoteInteractionRegistry.java",
+    "EspressoRemoteMessage.java",
+]
+
+android_library(
+    name = "interface",
+    srcs = REMOTE_INTERFACES,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":exceptions",
+        ":reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//opensource/androidx:annotation",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+REFLECTION_UTILS = [
+    "MethodInvocation.java",
+    "ConstructorInvocation.java",
+]
+
+android_library(
+    name = "reflectionUtils",
+    srcs = REFLECTION_UTILS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":exceptions",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+    ],
+)
+
+android_library(
+    name = "aidls",
+    custom_package = "androidx.test.espresso.remote",
+    idl_import_root = "idls",
+    idl_srcs = glob(["idls/**"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
+
+REMOTE_EXCEPTIONS = [
+    "RemoteEspressoException.java",
+    "RemoteProtocolException.java",
+    "NoRemoteEspressoInstanceException.java",
+]
+
+android_library(
+    name = "exceptions",
+    srcs = REMOTE_EXCEPTIONS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:interface",
+    ],
+)
+
+BINDABLE = [
+    "Bindable.java",
+]
+
+android_library(
+    name = "bindable",
+    srcs = BINDABLE,
+)
diff --git a/espresso/core/java/androidx/test/espresso/remote/BUILD.bazel b/espresso/core/java/androidx/test/espresso/remote/BUILD.bazel
deleted file mode 100644
index dae54c186..000000000
--- a/espresso/core/java/androidx/test/espresso/remote/BUILD.bazel
+++ /dev/null
@@ -1,247 +0,0 @@
-# Remote package for espresso.
-
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "RUNNER_VERSION", "ESPRESSO_VERSION", "ANDROIDX_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-load("//build_extensions:release.bzl", "axt_release_lib")
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-REMOTE_INTERFACES = [
-    "NoopRemoteInteraction.java",
-    "RemoteInteraction.java",
-    "RemoteInteractionRegistry.java",
-    "EspressoRemoteMessage.java",
-]
-
-REMOTE_REGISTRY = [
-    "RemoteDescriptorRegistry.java",
-    "RemoteDescriptor.java",
-    "FieldDescriptor.java",
-]
-
-android_library(
-    name = "registry",
-    srcs = REMOTE_REGISTRY,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":exceptions",
-        ":reflectionUtils",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "interface",
-    srcs = REMOTE_INTERFACES,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":exceptions",
-        ":reflectionUtils",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-REFLECTION_UTILS = [
-    "MethodInvocation.java",
-    "ConstructorInvocation.java",
-]
-
-android_library(
-    name = "reflectionUtils",
-    srcs = REFLECTION_UTILS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":exceptions",
-        "//:androidx_annotation",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-PROTO_UTILS = [
-    "Converter.java",
-    "AnyToTypeConverter.java",
-    "TypeToAnyConverter.java",
-    "ByteStringToTypeConverter.java",
-    "TypeToByteStringConverter.java",
-    "ParcelableToByteStringConverter.java",
-    "ByteStringToParcelableConverter.java",
-    "TypeProtoConverters.java",
-    "ProtoUtils.java",
-    "InteractionRequest.java",
-    "GenericRemoteMessage.java",
-    "RemoteMessageSerializer.java",
-    "RemoteMessageDeserializer.java",
-    "BuilderReflector.java",
-    "ProtoReflector.java",
-]
-
-android_library(
-    name = "aidls",
-    custom_package = "androidx.test.espresso.remote",
-    idl_import_root = "idls",
-    idl_srcs = glob(["idls/**"]),
-    visibility = ["//visibility:public"],
-    deps = ["@com_google_protobuf//:protobuf_javalite"],
-)
-
-android_library(
-    name = "protoUtils",
-    srcs = PROTO_UTILS,
-    visibility = ["//visibility:public"],
-    deps = [
-        ":aidls",
-        ":exceptions",
-        ":interface",
-        ":reflectionUtils",
-        ":registry",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-REMOTE_EXCEPTIONS = [
-    "RemoteEspressoException.java",
-    "RemoteProtocolException.java",
-    "NoRemoteEspressoInstanceException.java",
-]
-
-android_library(
-    name = "exceptions",
-    srcs = REMOTE_EXCEPTIONS,
-    visibility = ["//visibility:public"],
-    deps = [
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "@com_google_protobuf//:protobuf_javalite",
-    ],
-)
-
-BINDABLE = [
-    "Bindable.java",
-]
-
-android_library(
-    name = "bindable",
-    srcs = BINDABLE,
-    deps = ["@com_google_protobuf//:protobuf_javalite"],
-)
-
-android_library(
-    name = "remote",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_INTERFACES + PROTO_UTILS + REMOTE_EXCEPTIONS + BINDABLE,
-    ),
-    deps = [
-        ":aidls",
-        ":exceptions",
-        ":interface",
-        ":protoUtils",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:data-interaction-remote",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/action:remote_view_actions",
-        "//espresso/core/java/androidx/test/espresso/assertion:remote_view_assertions",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_view_matchers",
-        "//espresso/core/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:bindable",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/web/java/androidx/test/espresso/web/action:remote_web_actions",
-        "//espresso/web/java/androidx/test/espresso/web/assertion:remote_web_assertions",
-        "//espresso/web/java/androidx/test/espresso/web/matcher:remote_web_matchers",
-        "//espresso/web/java/androidx/test/espresso/web/model:remote_web_model_atoms",
-        "//espresso/web/java/androidx/test/espresso/web/sugar:remote_sugar",
-        "//espresso/web/java/androidx/test/espresso/web/webdriver:remote_webdriver_atoms",
-        "//runner/android_junit_runner",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-filegroup(
-    name = "espresso_remote_src",
-    srcs = [
-        ":libbindable-src.jar",
-        ":libexceptions-src.jar",
-        ":libinterface-src.jar",
-        ":libprotoUtils-src.jar",
-        ":libreflectionUtils-src.jar",
-        ":libregistry-src.jar",
-        ":libremote-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "espresso_remote_src_jars",
-    srcs = [
-        ":espresso_remote_src",
-    ],
-)
-
-
-
-axt_release_lib(
-    name = "espresso_remote_release",
-    jarjar_rules = "release_jarjar_rules.txt",
-    keep_spec = "androidx/test/espresso",
-    overlapping_jars = [
-        "//espresso/core/java/androidx/test/espresso:espresso_core_release_no_deps.jar",
-        "//espresso/web/java/androidx/test/espresso/web:espresso_web_release_no_deps.jar",
-        "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_release_no_deps.jar",
-    ],
-    proguard_library = ":proguard_library.cfg",
-    proguard_specs = [
-        "//:proguard_binary.cfg",
-        "//espresso:proguard_binary.cfg",
-    ],
-    remove_spec = "androidx/test/espresso/remote/R[$$\\.]",
-    deps = [
-        ":remote",
-    ],
-)
-
-maven_artifact(
-    name = "espresso_remote_maven_artifact",
-    src = ":espresso_remote_release.aar",
-    artifact_deps = [
-        "androidx.test:runner:%s" % RUNNER_VERSION,
-        "androidx.test.espresso:espresso-core:%s" % ESPRESSO_VERSION,
-        "androidx.test.espresso:espresso-web:%s" % ESPRESSO_VERSION,
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-    ],
-    artifact_id = "espresso-remote",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":espresso_remote_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/core/java/androidx/test/espresso/remote/ConstructorInvocation.java b/espresso/core/java/androidx/test/espresso/remote/ConstructorInvocation.java
index 8204090f1..2e464957b 100644
--- a/espresso/core/java/androidx/test/espresso/remote/ConstructorInvocation.java
+++ b/espresso/core/java/androidx/test/espresso/remote/ConstructorInvocation.java
@@ -16,15 +16,15 @@
  */
 package androidx.test.espresso.remote;
 
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+import static androidx.test.internal.util.LogUtil.lazyArg;
 import static androidx.test.internal.util.LogUtil.logDebug;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
 
+import android.util.LruCache;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -34,8 +34,8 @@
 /** Reflectively invokes the constructor of a declared class. */
 public final class ConstructorInvocation {
   private static final String TAG = "ConstructorInvocation";
-  private static final Cache<ConstructorKey, Constructor<?>> constructorCache =
-      CacheBuilder.newBuilder().maximumSize(256 /* LRU eviction after max size exceeded */).build();
+  private static final LruCache<ConstructorKey, Constructor<?>> constructorCache =
+      new LruCache<>(256 /* LRU eviction after max size exceeded */);
 
   private final Class<?> clazz;
   @Nullable private final Class<? extends Annotation> annotationClass;
@@ -66,7 +66,7 @@ public ConstructorInvocation(
 
   @VisibleForTesting
   static void invalidateCache() {
-    constructorCache.invalidateAll();
+    constructorCache.evictAll();
   }
 
   /**
@@ -79,20 +79,19 @@ public Object invokeConstructor(Object... constructorParams) {
     return invokeConstructorExplosively(constructorParams);
   }
 
-  @SuppressWarnings("unchecked") // raw type for constructor can not be avoided
   private Object invokeConstructorExplosively(Object... constructorParams) {
     Object returnValue = null;
     Constructor<?> constructor = null;
     ConstructorKey constructorKey = new ConstructorKey(clazz, parameterTypes);
     try {
       // Lookup constructor in cache
-      constructor = constructorCache.getIfPresent(constructorKey);
+      constructor = constructorCache.get(constructorKey);
       if (null == constructor) {
         logDebug(
             TAG,
             "Cache miss for constructor: %s(%s). Loading into cache.",
             clazz.getSimpleName(),
-            Arrays.toString(constructorParams));
+            lazyArg(() -> Arrays.toString(constructorParams)));
         // Lookup constructor using annotation class
         if (annotationClass != null) {
           for (Constructor<?> candidate : clazz.getDeclaredConstructors()) {
@@ -118,7 +117,7 @@ private Object invokeConstructorExplosively(Object... constructorParams) {
             TAG,
             "Cache hit for constructor: %s(%s).",
             clazz.getSimpleName(),
-            Arrays.toString(constructorParams));
+            lazyArg(() -> Arrays.toString(constructorParams)));
       }
 
       constructor.setAccessible(true);
@@ -150,7 +149,8 @@ private Object invokeConstructorExplosively(Object... constructorParams) {
       throw new RemoteProtocolException(
           String.format(Locale.ROOT, "Constructor not accessible: %s", constructor.getName()), se);
     } finally {
-      logDebug(TAG, "%s(%s)", clazz.getSimpleName(), Arrays.toString(constructorParams));
+      logDebug(
+          TAG, "%s(%s)", clazz.getSimpleName(), lazyArg(() -> Arrays.toString(constructorParams)));
     }
     return returnValue;
   }
diff --git a/espresso/core/java/androidx/test/espresso/remote/MethodInvocation.java b/espresso/core/java/androidx/test/espresso/remote/MethodInvocation.java
index 23ef37285..b4b496c4d 100644
--- a/espresso/core/java/androidx/test/espresso/remote/MethodInvocation.java
+++ b/espresso/core/java/androidx/test/espresso/remote/MethodInvocation.java
@@ -16,15 +16,14 @@
  */
 package androidx.test.espresso.remote;
 
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static androidx.test.internal.util.LogUtil.logDebug;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
 
+import android.util.LruCache;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -33,8 +32,8 @@
 /** Reflectively invokes a method of a declared instance. */
 final class MethodInvocation {
   private static final String TAG = "MethodInvocation";
-  private static final Cache<MethodKey, Method> methodCache =
-      CacheBuilder.newBuilder().maximumSize(256 /* LRU eviction after max size exceeded */).build();
+  private static final LruCache<MethodKey, Method> methodCache =
+      new LruCache<>(256 /* LRU eviction after max size exceeded */);
 
   private final Class<?> clazz;
   @Nullable private final Object instance;
@@ -75,7 +74,7 @@ private static Method getDeclaredMethod(MethodKey methodKey) throws NoSuchMethod
 
   private static Method getMethodInternal(MethodKey methodKey, boolean declaredMethod)
       throws NoSuchMethodException {
-    Method method = methodCache.getIfPresent(methodKey);
+    Method method = methodCache.get(methodKey);
     if (null == method) {
       logDebug(
           TAG,
@@ -102,7 +101,7 @@ private static Method getMethodInternal(MethodKey methodKey, boolean declaredMet
 
   @VisibleForTesting
   public static void invalidateCache() {
-    methodCache.invalidateAll();
+    methodCache.evictAll();
   }
 
   /**
diff --git a/espresso/core/java/androidx/test/espresso/remote/NoopRemoteInteraction.java b/espresso/core/java/androidx/test/espresso/remote/NoopRemoteInteraction.java
index b28bec1cf..5933d4fc8 100644
--- a/espresso/core/java/androidx/test/espresso/remote/NoopRemoteInteraction.java
+++ b/espresso/core/java/androidx/test/espresso/remote/NoopRemoteInteraction.java
@@ -34,6 +34,15 @@ public boolean isRemoteProcess() {
     return false;
   }
 
+  /**
+   * Creates a callable to run Espresso check interaction on remote processes
+   *
+   * @param rootMatcher the root matcher to use.
+   * @param viewMatcher the view matcher to use.
+   * @param iBinders a list of binders to pass along to the remote process instance
+   * @param viewAssertion the view assertion to use.
+   * @return the created Callable
+   */
   @Override
   public Callable<Void> createRemoteCheckCallable(
       Matcher<Root> rootMatcher,
@@ -48,6 +57,15 @@ public Void call() throws Exception {
     };
   }
 
+  /**
+   * Creates a callable to run Espresso perform interaction on remote processes
+   *
+   * @param rootMatcher the root matcher to use.
+   * @param viewMatcher the view matcher to use.
+   * @param iBinders a list of binders to pass along to the remote process instance
+   * @param viewActions one or more actions to execute.
+   * @return
+   */
   @Override
   public Callable<Void> createRemotePerformCallable(
       Matcher<Root> rootMatcher,
diff --git a/espresso/core/java/androidx/test/espresso/remote/RemoteInteraction.java b/espresso/core/java/androidx/test/espresso/remote/RemoteInteraction.java
index d7f120f7a..92b35f643 100644
--- a/espresso/core/java/androidx/test/espresso/remote/RemoteInteraction.java
+++ b/espresso/core/java/androidx/test/espresso/remote/RemoteInteraction.java
@@ -33,9 +33,17 @@
 public interface RemoteInteraction {
   static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
 
-  /** @return {@code true} if the current Espresso instance running in a remote process. */
+  /** Returns {@code true} if the current Espresso instance running in a remote process. */
   boolean isRemoteProcess();
 
+  /**
+   * Returns {code true} if the current Espresso instance is communicating with another Espresso
+   * instance in a remote process.
+   */
+  default boolean isRemoteClient() {
+    return false;
+  }
+
   /**
    * Creates a callable to run Espresso check interaction on remote processes
    *
@@ -44,7 +52,7 @@ public interface RemoteInteraction {
    * @param rootMatcher the root matcher to use.
    * @param viewMatcher the view matcher to use.
    * @param iBinders a list of binders to pass along to the remote process instance
-   * @param viewAssert the assertion to check.
+   * @param viewAssert the view assertion to use.
    * @return a {@link Callable} that will perform the check pending completion of the task.
    */
   Callable<Void> createRemoteCheckCallable(
@@ -61,8 +69,8 @@ Callable<Void> createRemoteCheckCallable(
    *
    * @param rootMatcher the root matcher to use.
    * @param viewMatcher the view matcher to use.
-   * @param viewActions one or more actions to execute.
    * @param iBinders a list of binders to pass along to the remote process instance
+   * @param viewActions one or more actions to execute.
    * @return a {@link Callable} that performs the action.
    */
   Callable<Void> createRemotePerformCallable(
diff --git a/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD b/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD
new file mode 100644
index 000000000..962bf46db
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD
@@ -0,0 +1,22 @@
+# Description:
+#  Annotations for espresso remote.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+REMOTE_MSG_ANNOTATIONS = [
+    "RemoteMsgField.java",
+    "RemoteMsgConstructor.java",
+]
+
+android_library(
+    name = "remote_msg_annotations",
+    srcs = REMOTE_MSG_ANNOTATIONS,
+    visibility = ["//visibility:public"],
+)
diff --git a/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD.bazel b/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD.bazel
deleted file mode 100644
index 117ca777d..000000000
--- a/espresso/core/java/androidx/test/espresso/remote/annotation/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-# Description:
-#  Annotations for espresso remote.
-
-licenses(["notice"])
-
-package(default_visibility = [
-    "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-])
-
-REMOTE_MSG_ANNOTATIONS = [
-    "RemoteMsgField.java",
-    "RemoteMsgConstructor.java",
-]
-
-android_library(
-    name = "remote_msg_annotations",
-    srcs = REMOTE_MSG_ANNOTATIONS,
-    visibility = ["//visibility:public"],
-)
diff --git a/espresso/core/java/androidx/test/espresso/remote/idls/androidx/test/espresso/remote/IInteractionExecutionStatus.aidl b/espresso/core/java/androidx/test/espresso/remote/idls/androidx/test/espresso/remote/IInteractionExecutionStatus.aidl
index 7f2988335..21f43fca7 100644
--- a/espresso/core/java/androidx/test/espresso/remote/idls/androidx/test/espresso/remote/IInteractionExecutionStatus.aidl
+++ b/espresso/core/java/androidx/test/espresso/remote/idls/androidx/test/espresso/remote/IInteractionExecutionStatus.aidl
@@ -16,7 +16,11 @@
 
 package androidx.test.espresso.remote;
 
-/** Enables the ability to share interaction execution status cross process */
+/**
+* Enables the ability to share interaction execution status cross process
+* @hide
+*/
+@JavaPassthrough(annotation="@androidx.annotation.RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP)")
 interface IInteractionExecutionStatus {
   /**
    * Returns {@code false} if the given interaction was already executed on the
diff --git a/espresso/core/java/androidx/test/espresso/remote/release_jarjar_rules.txt b/espresso/core/java/androidx/test/espresso/remote/release_jarjar_rules.txt
deleted file mode 100644
index 65394f175..000000000
--- a/espresso/core/java/androidx/test/espresso/remote/release_jarjar_rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-rule com.google.common.base.Optional androidx.test.espresso.core.internal.deps.guava.base.Optional
-rule com.google.common.** androidx.test.espresso.remote.internal.deps.guava.@1
-rule com.google.android.aidl.** androidx.test.espresso.remote.internal.deps.aidl.@1
-rule com.google.protobuf.** androidx.test.espresso.remote.internal.deps.protobuf.@1
-rule com.google.devtools.build.android.desugar.runtime.** androidx.test.espresso.remote.internal.deps.desugar.@1
diff --git a/espresso/core/java/androidx/test/espresso/util/BUILD b/espresso/core/java/androidx/test/espresso/util/BUILD
new file mode 100644
index 000000000..9c6e3cbcd
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/BUILD
@@ -0,0 +1,27 @@
+# Description:
+#  Utility classes
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+kt_android_library(
+    name = "util",
+    srcs = glob([
+        "*.java",
+        "*.kt",
+    ]),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/core/internal/deps/guava/base",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/util/BUILD.bazel b/espresso/core/java/androidx/test/espresso/util/BUILD.bazel
deleted file mode 100644
index a3c9032b9..000000000
--- a/espresso/core/java/androidx/test/espresso/util/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description:
-#  Utility classes
-
-licenses(["notice"])
-
-package(default_visibility = ["//visibility:public"])
-
-android_library(
-    name = "util",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-    ],
-)
diff --git a/espresso/core/java/androidx/test/espresso/util/EspressoOptional.java b/espresso/core/java/androidx/test/espresso/util/EspressoOptional.java
index 6b8f21c66..cedaf5b43 100644
--- a/espresso/core/java/androidx/test/espresso/util/EspressoOptional.java
+++ b/espresso/core/java/androidx/test/espresso/util/EspressoOptional.java
@@ -16,97 +16,109 @@
 
 package androidx.test.espresso.util;
 
-import com.google.common.annotations.Beta;
-import com.google.common.base.Function;
-import com.google.common.base.Optional;
-import com.google.common.base.Supplier;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+
+import androidx.annotation.Nullable;
+import androidx.test.espresso.core.internal.deps.guava.base.Function;
+import androidx.test.espresso.core.internal.deps.guava.base.Optional;
+import androidx.test.espresso.core.internal.deps.guava.base.Supplier;
 import java.util.Set;
 
 /**
- * This class is a wrapper around {@link com.google.common.base.Optional} in order to avoid having
- * public references to Guava API.
+ * This class is a reimplementation of {@link com.google.common.base.Optional} to maintain API
+ * compatibility with older versions of espresso.
  *
  * @param <T> the type of instance that can be contained. {@code Optional} is naturally covariant on
  *     this type, so it is safe to cast an {@code Optional<T>} to {@code Optional<S>} for any
  *     supertype {@code S} of {@code T}.
  * @see com.google.common.base.Optional
+ * @deprecated use androidx.annotation.Nullable/NonNull instead
  */
+@Deprecated
 public final class EspressoOptional<T> {
 
-  private final Optional<T> delegate;
+  private static final EspressoOptional ABSENT = new EspressoOptional<>(null);
+  @Nullable private final T value;
 
   public static <T> EspressoOptional<T> of(T reference) {
-    return new EspressoOptional<>(Optional.of(reference));
+    return new EspressoOptional<>(checkNotNull(reference));
   }
 
   public static <T> EspressoOptional<T> absent() {
-    return new EspressoOptional<T>(Optional.absent());
+    return ABSENT;
   }
 
   public static <T> EspressoOptional<T> fromNullable(T nullableReference) {
-    return new EspressoOptional<>(Optional.fromNullable(nullableReference));
+    return new EspressoOptional<>(nullableReference);
   }
 
-  private EspressoOptional(Optional<T> op) {
-    delegate = op;
+  private EspressoOptional(@Nullable T value) {
+    this.value = value;
   }
 
   public boolean isPresent() {
-    return delegate.isPresent();
+    return value != null;
   }
 
   public T get() {
-    return delegate.get();
+    return checkNotNull(value);
   }
 
   public Optional<T> or(Optional<? extends T> secondChoice) {
-    return delegate.or(secondChoice);
+    return isPresent() ? Optional.of(value) : (Optional<T>) secondChoice;
   }
 
   public T or(Supplier<? extends T> supplier) {
-    return delegate.or(supplier);
+    return isPresent() ? value : supplier.get();
   }
 
   public T or(T defaultValue) {
-    return delegate.or(defaultValue);
+    return isPresent() ? value : defaultValue;
   }
 
   public T orNull() {
-    return delegate.orNull();
+    return isPresent() ? value : null;
   }
 
   public Set<T> asSet() {
-    return delegate.asSet();
+    return isPresent() ? singleton(value) : emptySet();
   }
 
   @Override
   public boolean equals(Object object) {
     if (object instanceof EspressoOptional) {
       EspressoOptional<?> other = (EspressoOptional<?>) object;
-      return other.delegate.equals(this.delegate);
+      if (isPresent()) {
+        return value.equals(other.get());
+      } else if (!other.isPresent()) {
+        return true;
+      }
     }
     return false;
   }
 
   @Override
   public int hashCode() {
-    return delegate.hashCode();
+    // copy the guava implementation
+    return isPresent() ? 0x598df91c + value.hashCode() : 0x79a31aac;
   }
 
   @Override
   public String toString() {
-    return delegate.toString();
+    return isPresent() ? value.toString() : "null";
   }
 
   public <V> Optional<V> transform(Function<? super T, V> function) {
-    return delegate.transform(function);
+    return Optional.fromNullable(value).transform(function);
   }
 
-  @Beta
   public static <T> Iterable<T> presentInstances(
       final Iterable<? extends Optional<? extends T>> optionals) {
     return Optional.presentInstances(optionals);
   }
 
+
   private static final long serialVersionUID = 0;
 }
diff --git a/espresso/core/java/androidx/test/espresso/util/HumanReadables.java b/espresso/core/java/androidx/test/espresso/util/HumanReadables.java
index 719178a4c..27648c9f0 100644
--- a/espresso/core/java/androidx/test/espresso/util/HumanReadables.java
+++ b/espresso/core/java/androidx/test/espresso/util/HumanReadables.java
@@ -17,10 +17,11 @@
 package androidx.test.espresso.util;
 
 import static androidx.test.espresso.util.TreeIterables.depthFirstViewTraversalWithDistance;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static java.lang.Math.max;
 
 import android.content.res.Resources;
 import android.database.Cursor;
-import android.os.Build;
 import android.util.Printer;
 import android.util.StringBuilderPrinter;
 import android.view.View;
@@ -30,23 +31,30 @@
 import android.widget.Checkable;
 import android.widget.TextView;
 import androidx.test.espresso.util.TreeIterables.ViewAndDistance;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /** Text converters for various Android objects. */
 public final class HumanReadables {
 
+  /** Regex that matches a valid Java identifier. */
+  private static final String JAVA_ID = "\\p{javaJavaIdentifierStart}\\p{javaJavaIdentifierPart}*";
+
+  /**
+   * Pattern that matches a result from the default Object.toString method; that is, a
+   * fully-qualified Java class name, an at sign ("@"), and an unsigned hexadecimal hash code. In a
+   * match, group 2 will be the subsequence containing the hexadecimal value.
+   */
+  private static final Pattern OBJECT_HASH_CODE_PATTERN =
+      Pattern.compile(JAVA_ID + "(\\." + JAVA_ID + ")*@([0-9A-Fa-f]+)");
+
   private HumanReadables() {}
 
   /**
-   * Prints out an error message feature the view hierarchy starting at the rootView.
+   * Prints out an error message featuring the view hierarchy starting at the rootView.
    *
    * @param rootView the root of the hierarchy tree to print out.
    * @param problemViews list of the views that you would like to point out are causing the error
@@ -60,9 +68,34 @@ private HumanReadables() {}
   public static String getViewHierarchyErrorMessage(
       View rootView,
       final List<View> problemViews,
-      String errorHeader,
+      final String errorHeader,
       final String problemViewSuffix) {
-    Preconditions.checkArgument(problemViews == null || problemViewSuffix != null);
+    return getViewHierarchyErrorMessage(
+        rootView, problemViews, errorHeader, problemViewSuffix, Integer.MAX_VALUE);
+
+  }
+
+  /**
+   * Prints out an error message featuring the view hierarchy starting at the rootView.
+   *
+   * @param rootView the root of the hierarchy tree to print out.
+   * @param problemViews list of the views that you would like to point out are causing the error
+   *     message or null, if you want to skip this feature.
+   * @param errorHeader the header of the error message (should contain the description of why the
+   *     error is happening).
+   * @param problemViewSuffix the message to append to the view description in the tree printout.
+   *     Required if problemViews is supplied. Otherwise, null is acceptable.
+   * @param maxMsgLen the maximum message length. Use {@link Integer#MAX_VALUE} to avoid truncating
+   *     the message.
+   * @return a string for human consumption.
+   */
+  public static String getViewHierarchyErrorMessage(
+      View rootView,
+      final List<View> problemViews,
+      final String errorHeader,
+      final String problemViewSuffix,
+      int maxMsgLen) {
+    checkArgument(problemViews == null || problemViewSuffix != null);
     StringBuilder errorMessage = new StringBuilder(errorHeader);
     if (problemViewSuffix != null) {
       errorMessage.append(
@@ -70,28 +103,36 @@ public static String getViewHierarchyErrorMessage(
               Locale.ROOT, "\nProblem views are marked with '%s' below.", problemViewSuffix));
     }
 
-    String viewHierarchyDump =
-        Joiner.on("\n|\n")
-            .join(
-                Iterables.transform(
-                    depthFirstViewTraversalWithDistance(rootView),
-                    new Function<ViewAndDistance, String>() {
-                      @Override
-                      public String apply(ViewAndDistance viewAndDistance) {
-                        String formatString = "+%s%s ";
-                        if (problemViews != null
-                            && problemViews.contains(viewAndDistance.getView())) {
-                          formatString += problemViewSuffix;
-                        }
-                        return String.format(
-                            Locale.ROOT,
-                            formatString,
-                            Strings.padStart(">", viewAndDistance.getDistanceFromRoot() + 1, '-'),
-                            HumanReadables.describe(viewAndDistance.getView()));
-                      }
-                    }));
+    List<String> tokens = new ArrayList<>();
+
+    for (ViewAndDistance viewAndDistance : depthFirstViewTraversalWithDistance(rootView)) {
+      // Build a string that looks like "+----->View description [suffix]"
+      StringBuilder token = new StringBuilder();
+      token.append('+');
+      for (int i = 0; i < viewAndDistance.getDistanceFromRoot(); i++) {
+        token.append('-');
+      }
+      token.append('>');
+      token.append(HumanReadables.describe(viewAndDistance.getView()));
+      token.append(' ');
+      if (problemViews != null && problemViews.contains(viewAndDistance.getView())) {
+        token.append(problemViewSuffix);
+      }
+      tokens.add(token.toString());
+    }
+
+    String viewHierarchyDump = StringJoinerKt.joinToString(tokens, "\n|\n");
 
     errorMessage.append("\n\nView Hierarchy:\n").append(viewHierarchyDump);
+
+    if (maxMsgLen < Integer.MAX_VALUE) {
+      String suffix = " [truncated]";
+      if (errorMessage.length() + suffix.length() > maxMsgLen) {
+        errorMessage.delete(max(0, maxMsgLen - suffix.length()), errorMessage.length());
+        errorMessage.append(suffix);
+      }
+    }
+
     return errorMessage.toString();
   }
 
@@ -105,10 +146,8 @@ public static String describe(Cursor c) {
     String[] columns = c.getColumnNames();
     for (int i = 0; i < columns.length; i++) {
       result.append(columns[i]).append(":");
-      int type = Cursor.FIELD_TYPE_STRING;
-      if (Build.VERSION.SDK_INT > 10) {
-        type = c.getType(i);
-      }
+
+      int type = c.getType(i);
       switch (type) {
         case Cursor.FIELD_TYPE_STRING:
           result.append("\"").append(c.getString(i)).append("\"");
@@ -155,8 +194,11 @@ public static String describe(View v) {
     if (null == v) {
       return "null";
     }
-    ToStringHelper helper = MoreObjects.toStringHelper(v).add("id", v.getId());
-    if (v.getId() != -1 && v.getResources() != null && !isViewIdGenerated(v.getId())) {
+    ToStringHelper helper = new ToStringHelper(v).add("id", v.getId());
+    if (v.getId() != View.NO_ID
+        && v.getId() != 0
+        && v.getResources() != null
+        && !isViewIdGenerated(v.getId())) {
       try {
         helper.add("res-name", v.getResources().getResourceEntryName(v.getId()));
       } catch (Resources.NotFoundException ignore) {
@@ -193,7 +235,7 @@ public static String describe(View v) {
         .add("is-focusable", v.isFocusable())
         .add("is-layout-requested", v.isLayoutRequested())
         .add("is-selected", v.isSelected())
-        .add("layout-params", v.getLayoutParams())
+        .add("layout-params", replaceHashCodes(v.getLayoutParams()))
         .add("tag", v.getTag());
 
     if (null != v.getRootView()) {
@@ -213,11 +255,7 @@ public static String describe(View v) {
       sb.append("]");
       helper.add("editor-info", sb.toString().replace("\n", " "));
     }
-
-    if (Build.VERSION.SDK_INT > 10) {
-      helper.add("x", v.getX()).add("y", v.getY());
-    }
-
+    helper.add("x", v.getX()).add("y", v.getY());
     if (v instanceof TextView) {
       innerDescribe((TextView) v, helper);
     }
@@ -230,6 +268,19 @@ public static String describe(View v) {
     return helper.toString();
   }
 
+  /** Replaces every hexadecimal hash code with "YYYYYY". */
+  private static String replaceHashCodes(Object instance) {
+    if (instance == null) {
+      return null;
+    }
+    String str = instance.toString();
+    Matcher matcher = OBJECT_HASH_CODE_PATTERN.matcher(str);
+    if (matcher.find()) {
+      str = str.substring(0, matcher.start(2)) + "YYYYYY" + str.substring(matcher.end(2));
+    }
+    return str;
+  }
+
   private static void innerDescribe(TextView textBox, ToStringHelper helper) {
     if (null != textBox.getText()) {
       helper.add("text", textBox.getText());
diff --git a/espresso/core/java/androidx/test/espresso/util/Iterables.kt b/espresso/core/java/androidx/test/espresso/util/Iterables.kt
new file mode 100644
index 000000000..50aab0c3e
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/Iterables.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("IterablesKt")
+
+package androidx.test.espresso.util
+
+import androidx.annotation.RestrictTo
+import org.hamcrest.Matcher
+
+/**
+ * A wrapper around kotlin' filter extension that takes a Matcher.
+ *
+ * @param iterable the sequence of items to filter
+ * @param matcher the [Matcher] to perform the filtering.
+ * @return subset of iterable that matched
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+fun <T> filter(iterable: Iterable<T>, matcher: Matcher<T>): Iterable<T> {
+  return iterable.filter { matcher.matches(it) }
+}
+
+/**
+ * A variant of [filter] that returns a [List]
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+fun <T> filterToList(iterable: Iterable<T>, matcher: Matcher<T>): List<T> {
+  return filter(iterable, matcher).toList()
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/Iterators.java b/espresso/core/java/androidx/test/espresso/util/Iterators.java
new file mode 100644
index 000000000..306b693aa
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/Iterators.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.util;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * A reimplementation of needed methods from Guava, to avoid the direct dependency.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public class Iterators {
+
+  private Iterators() {}
+
+  /**
+   * Converts an iterator into a array.
+   *
+   * @param iterator the {@link Iterator} to convert
+   * @param clazz the element type
+   * @return an array of all of the iterators' elements
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY_GROUP)
+  public static <T> T[] toArray(Iterator<T> iterator, Class<T> clazz) {
+    ArrayList<T> arrayList = new ArrayList<>();
+    while (iterator.hasNext()) {
+      arrayList.add(iterator.next());
+    }
+    return arrayList.toArray((T[]) Array.newInstance(clazz, arrayList.size()));
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/StringJoiner.kt b/espresso/core/java/androidx/test/espresso/util/StringJoiner.kt
new file mode 100644
index 000000000..8619d82e4
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/StringJoiner.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@file:JvmName("StringJoinerKt")
+
+package androidx.test.espresso.util
+
+import androidx.annotation.RestrictTo
+
+/**
+ * A simplification wrapper around kotlin's joinToString.
+ *
+ * kotlin's joinToString has many parameters and thus is a bit unwieldy to call directly from java.
+ * This method exposes just the needed parameters for most cases.
+ *
+ * @param the [Iterable] whose elements should be joined
+ * @param delimiter the separator to add between each element
+ * @return the combined [String]
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+fun joinToString(iterable: Iterable<kotlin.Any>, delimiter: String): String {
+  return iterable.joinToString(separator = delimiter)
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/Throwables.java b/espresso/core/java/androidx/test/espresso/util/Throwables.java
new file mode 100644
index 000000000..d19acfa73
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/Throwables.java
@@ -0,0 +1,31 @@
+package androidx.test.espresso.util;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import androidx.annotation.RestrictTo;
+
+/**
+ * Re-implementation of needed methods from Guava's Throwables to avoid the direct dependency
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class Throwables {
+
+  private Throwables() {}
+
+  /**
+   * Re-throw the exception if its a {@link RuntimeException} or {@link Error}. Otherwise ignore.
+   *
+   * @param throwable the exception
+   */
+  public static void throwIfUnchecked(Throwable throwable) {
+    checkNotNull(throwable);
+    if (throwable instanceof RuntimeException) {
+      throw (RuntimeException) throwable;
+    }
+    if (throwable instanceof Error) {
+      throw (Error) throwable;
+    }
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/ToStringHelper.kt b/espresso/core/java/androidx/test/espresso/util/ToStringHelper.kt
new file mode 100644
index 000000000..b8f118e06
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/ToStringHelper.kt
@@ -0,0 +1,27 @@
+package androidx.test.espresso.util
+
+import androidx.annotation.RestrictTo
+
+/**
+ * Simplified version of guava's ToStringHelper.
+ *
+ * Used to help pretty prints an object and a set of its members.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+class ToStringHelper constructor(obj: Object) {
+
+  private val clazzName = obj::class.simpleName
+  private val nameValuePairs = mutableMapOf<String, String>()
+
+  fun add(name: String, obj: Object?): ToStringHelper {
+    nameValuePairs[name] = obj?.toString() ?: "null"
+    return this
+  }
+
+  override fun toString(): String {
+    val s = nameValuePairs.map { (k, v) -> "$k=$v" }.joinToString(", ")
+    return "$clazzName{$s}"
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/TracingUtil.java b/espresso/core/java/androidx/test/espresso/util/TracingUtil.java
new file mode 100644
index 000000000..25046a57e
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/TracingUtil.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.util;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility methods for tracing.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public final class TracingUtil {
+  private static final int SPAN_NAME_MAX_LEN = 100;
+  private static final String SPAN_NAME_EXCLUDE = "[^0-9A-Za-z._$()\\[\\] /:-]";
+
+  private TracingUtil() {}
+
+  /**
+   * Generates a span name according to multiple optional arguments.
+   *
+   * @param prefix User-defined prefix string, e.g. Espresso.
+   * @param methodName The name of method being traced, e.g. onView, perform, and check.
+   * @param arguments An optional list of description of arguments, e.g. user-defined description,
+   *     ViewAction's class name, and description of Matcher.
+   * @return a string as the name of a span.
+   */
+  public static String getSpanName(String prefix, String methodName, Object... arguments) {
+    // Sanitize all input data.
+    String processedPrefix = sanitizeName(prefix, SPAN_NAME_EXCLUDE, -1);
+    String processedMethodName = sanitizeName(methodName, SPAN_NAME_EXCLUDE, -1);
+
+    List<String> processedArguments = new ArrayList<>();
+    if (arguments != null) {
+      for (Object argument : arguments) {
+        if (argument == null) {
+          continue;
+        }
+        String processedArgument = sanitizeName(argument.toString(), SPAN_NAME_EXCLUDE, -1);
+        if (!processedArgument.isEmpty()) {
+          processedArguments.add(processedArgument);
+        }
+      }
+    }
+
+    // Assemble processed strings.
+    String spanName = processedPrefix;
+    if (!processedPrefix.isEmpty() && !processedMethodName.isEmpty()) {
+      spanName += ".";
+    }
+    spanName += processedMethodName;
+    if (!processedArguments.isEmpty()) {
+      spanName += "(" + StringJoinerKt.joinToString(processedArguments, ", ") + ")";
+    }
+
+    // Check the length.
+    spanName = sanitizeName(spanName, null, SPAN_NAME_MAX_LEN);
+    return spanName;
+  }
+
+  /**
+   * Generates a short string indicating the class type of the given element.
+   *
+   * @param element An object instance.
+   * @param defaultName The default result in case the class type is not accessible.
+   * @return a string as the class name.
+   */
+  public static String getClassName(Object element, String defaultName) {
+    // Note: getSimpleName() may return an empty string for an anonymous class.
+    // Ideally we would use Class.getTypeName() but this is not supported in legacy
+    // Android with compiler < 1.8.
+    String name = element == null ? null : element.getClass().getSimpleName();
+    if (name == null || name.length() == 0) {
+      name = defaultName;
+    }
+    return name == null ? "" : name;
+  }
+
+  /**
+   * Generates a span name according to multiple optional arguments.
+   *
+   * @param name The input name to be processed.
+   * @param exclude A regex pattern indicating the characters to exclude.
+   * @param maxLength The maximum length of the name; the substring out of the length will be
+   *     deleted; skip the length check if maxLength is negative.
+   * @return a string as the name.
+   */
+  private static String sanitizeName(String name, String exclude, int maxLength) {
+    if (name == null) {
+      return "";
+    }
+
+    String newName = name;
+    if (exclude != null && exclude.length() > 0) {
+      newName = newName.replaceAll(exclude, "").trim();
+    }
+
+    if (maxLength > 0 && newName.length() > maxLength) {
+      newName = newName.substring(0, maxLength).trim();
+    }
+    return newName;
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/TreeIterables.java b/espresso/core/java/androidx/test/espresso/util/TreeIterables.java
index 975ebdd17..53c0b051b 100644
--- a/espresso/core/java/androidx/test/espresso/util/TreeIterables.java
+++ b/espresso/core/java/androidx/test/espresso/util/TreeIterables.java
@@ -16,22 +16,20 @@
 
 package androidx.test.espresso.util;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.View;
 import android.view.ViewGroup;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import androidx.annotation.VisibleForTesting;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import kotlin.collections.AbstractIterator;
 
 /**
  * Utility methods for iterating over tree structured items.
@@ -61,14 +59,11 @@ public static Iterable<ViewAndDistance> depthFirstViewTraversalWithDistance(View
     final DistanceRecordingTreeViewer<View> distanceRecorder =
         new DistanceRecordingTreeViewer<View>(root, VIEW_TREE_VIEWER);
 
-    return Iterables.transform(
-        depthFirstTraversal(root, distanceRecorder),
-        new Function<View, ViewAndDistance>() {
-          @Override
-          public ViewAndDistance apply(View view) {
-            return new ViewAndDistance(view, distanceRecorder.getDistance(view));
-          }
-        });
+    List<ViewAndDistance> viewAndDistanceList = new ArrayList<>();
+    for (View view : depthFirstTraversal(root, distanceRecorder)) {
+      viewAndDistanceList.add(new ViewAndDistance(view, distanceRecorder.getDistance(view)));
+    }
+    return viewAndDistanceList;
   }
 
   /**
@@ -104,7 +99,7 @@ public static Iterable<View> breadthFirstViewTraversal(View root) {
   static <T> Iterable<T> depthFirstTraversal(final T root, final TreeViewer<T> viewer) {
     checkNotNull(root);
     checkNotNull(viewer);
-    return new TreeTraversalIterable<T>(root, TraversalStrategy.DEPTH_FIRST, viewer);
+    return new TreeTraversalIterable<>(root, TraversalStrategy.DEPTH_FIRST, viewer);
   }
 
   /**
@@ -136,17 +131,17 @@ private TreeTraversalIterable(
 
     @Override
     public Iterator<T> iterator() {
-      final LinkedList<T> nodes = Lists.newLinkedList();
+      final LinkedList<T> nodes = new LinkedList<>();
       nodes.add(root);
       return new AbstractIterator<T>() {
         @Override
-        public T computeNext() {
+        protected void computeNext() {
           if (nodes.isEmpty()) {
-            return endOfData();
+            done();
           } else {
             T nextItem = checkNotNull(traversalStrategy.next(nodes), "Null items not allowed!");
             traversalStrategy.combineNewChildren(nodes, treeViewer.children(nextItem));
-            return nextItem;
+            setNext(nextItem);
           }
         }
       };
@@ -187,7 +182,7 @@ public Collection<View> children(View view) {
       if (view instanceof ViewGroup) {
         ViewGroup group = (ViewGroup) view;
         int childCount = group.getChildCount();
-        List<View> children = Lists.newArrayList();
+        List<View> children = new ArrayList<>();
         for (int i = 0; i < childCount; i++) {
           children.add(group.getChildAt(i));
         }
@@ -211,7 +206,7 @@ public Collection<View> children(View view) {
   @VisibleForTesting
   static class DistanceRecordingTreeViewer<T> implements TreeViewer<T> {
     private final T root;
-    private final Map<T, Integer> nodeToDistance = Maps.newHashMap();
+    private final Map<T, Integer> nodeToDistance = new HashMap<>();
     private final TreeViewer<T> delegateViewer;
 
     DistanceRecordingTreeViewer(T root, TreeViewer<T> delegateViewer) {
diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD b/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD
new file mode 100644
index 000000000..8fbfec08d
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/concurrent/BUILD
@@ -0,0 +1,25 @@
+# Description:
+#  Utility classes
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso:__subpackages__"],
+)
+
+android_library(
+    name = "concurrent",
+    srcs = glob([
+        "*.java",
+        "*.kt",
+    ]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/ExecutionList.java b/espresso/core/java/androidx/test/espresso/util/concurrent/ExecutionList.java
new file mode 100644
index 000000000..6a256f9b2
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/concurrent/ExecutionList.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.util.concurrent;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import android.util.Log;
+import androidx.annotation.GuardedBy;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.Executor;
+
+/**
+ * Minimal fork of Guava's ExecutionList to avoid the full dependency.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+final class ExecutionList {
+
+  /**
+   * The runnable, executor pairs to execute. This acts as a stack threaded through the {@link
+   * RunnableExecutorPair#next} field.
+   */
+  private RunnableExecutorPair runnables;
+
+  @GuardedBy("this")
+  private boolean executed;
+
+  /** Creates a new, empty {@link ExecutionList}. */
+  ExecutionList() {}
+
+  /**
+   * Adds the {@code Runnable} and accompanying {@code Executor} to the list of listeners to
+   * execute. If execution has already begun, the listener is executed immediately.
+   *
+   * <p>When selecting an executor, note that {@code directExecutor} is dangerous in some cases. See
+   * the discussion in the {@link ListenableFuture#addListener ListenableFuture.addListener}
+   * documentation.
+   */
+  void add(Runnable runnable, Executor executor) {
+    // Fail fast on a null. We throw NPE here because the contract of Executor states that it throws
+    // NPE on null listener, so we propagate that contract up into the add method as well.
+    checkNotNull(runnable, "Runnable was null.");
+    checkNotNull(executor, "Executor was null.");
+
+    // Lock while we check state. We must maintain the lock while adding the new pair so that
+    // another thread can't run the list out from under us. We only add to the list if we have not
+    // yet started execution.
+    synchronized (this) {
+      if (!executed) {
+        runnables = new RunnableExecutorPair(runnable, executor, runnables);
+        return;
+      }
+    }
+    // Execute the runnable immediately. Because of scheduling this may end up getting called before
+    // some of the previously added runnables, but we're OK with that. If we want to change the
+    // contract to guarantee ordering among runnables we'd have to modify the logic here to allow
+    // it.
+    executeListener(runnable, executor);
+  }
+
+  /**
+   * Runs this execution list, executing all existing pairs in the order they were added. However,
+   * note that listeners added after this point may be executed before those previously added, and
+   * note that the execution order of all listeners is ultimately chosen by the implementations of
+   * the supplied executors.
+   *
+   * <p>This method is idempotent. Calling it several times in parallel is semantically equivalent
+   * to calling it exactly once.
+   *
+   * @since 10.0 (present in 1.0 as {@code run})
+   */
+  void execute() {
+    // Lock while we update our state so the add method above will finish adding any listeners
+    // before we start to run them.
+    RunnableExecutorPair list;
+    synchronized (this) {
+      if (executed) {
+        return;
+      }
+      executed = true;
+      list = runnables;
+      runnables = null; // allow GC to free listeners even if this stays around for a while.
+    }
+    // If we succeeded then list holds all the runnables we to execute. The pairs in the stack are
+    // in the opposite order from how they were added so we need to reverse the list to fulfill our
+    // contract.
+    // This is somewhat annoying, but turns out to be very fast in practice. Alternatively, we could
+    // drop the contract on the method that enforces this queue like behavior since depending on it
+    // is likely to be a bug anyway.
+
+    // N.B. All writes to the list and the next pointers must have happened before the above
+    // synchronized block, so we can iterate the list without the lock held here.
+    RunnableExecutorPair reversedList = null;
+    while (list != null) {
+      RunnableExecutorPair tmp = list;
+      list = list.next;
+      tmp.next = reversedList;
+      reversedList = tmp;
+    }
+    while (reversedList != null) {
+      executeListener(reversedList.runnable, reversedList.executor);
+      reversedList = reversedList.next;
+    }
+  }
+
+  /**
+   * Submits the given runnable to the given {@link Executor} catching and logging all {@linkplain
+   * RuntimeException runtime exceptions} thrown by the executor.
+   */
+  private static void executeListener(Runnable runnable, Executor executor) {
+    try {
+      executor.execute(runnable);
+    } catch (RuntimeException e) {
+      // Log it and keep going -- bad runnable and/or executor. Don't punish the other runnables if
+      // we're given a bad one. We only catch RuntimeException because we want Errors to propagate
+      // up.
+      Log.e(
+          "ExecutionList",
+          "RuntimeException while executing runnable " + runnable + " with executor " + executor,
+          e);
+    }
+  }
+
+  private static final class RunnableExecutorPair {
+    final Runnable runnable;
+    final Executor executor;
+    @Nullable RunnableExecutorPair next;
+
+    RunnableExecutorPair(
+        Runnable runnable, Executor executor, @Nullable RunnableExecutorPair next) {
+      this.runnable = runnable;
+      this.executor = executor;
+      this.next = next;
+    }
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/ListenableFutureTask.java b/espresso/core/java/androidx/test/espresso/util/concurrent/ListenableFutureTask.java
new file mode 100644
index 000000000..fa31e5097
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/concurrent/ListenableFutureTask.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.util.concurrent;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.FutureTask;
+
+/**
+ * Minimal fork of Guava's ListenableFutureTask to avoid the full dependency.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public class ListenableFutureTask<V> extends FutureTask<V> implements ListenableFuture<V> {
+
+  // The execution list to hold our listeners.
+  private final ExecutionList executionList = new ExecutionList();
+
+  /**
+   * Creates a {@code ListenableFutureTask} that will upon running, execute the given {@code
+   * Callable}.
+   *
+   * @param callable the callable task
+   */
+  public static <V> ListenableFutureTask<V> create(Callable<V> callable) {
+    return new ListenableFutureTask<>(callable);
+  }
+
+  protected ListenableFutureTask(Callable<V> callable) {
+    super(callable);
+  }
+
+  @Override
+  public void addListener(Runnable listener, Executor exec) {
+    executionList.add(listener, exec);
+  }
+
+  /** Internal implementation detail used to invoke the listeners. */
+  @Override
+  protected void done() {
+    executionList.execute();
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/ListeningExecutorService.java b/espresso/core/java/androidx/test/espresso/util/concurrent/ListeningExecutorService.java
new file mode 100644
index 000000000..896831d8a
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/concurrent/ListeningExecutorService.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.util.concurrent;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.List;
+import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A minimal implementation of Guava's ListeningExecutorService.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public class ListeningExecutorService extends AbstractExecutorService {
+
+  private final ExecutorService delegate;
+
+  public ListeningExecutorService(ExecutorService delegate) {
+    this.delegate = delegate;
+  }
+
+  @Override
+  protected final <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
+    return ListenableFutureTask.create(callable);
+  }
+
+  @Override
+  public void shutdown() {
+    delegate.shutdown();
+  }
+
+  @Override
+  public List<Runnable> shutdownNow() {
+    return delegate.shutdownNow();
+  }
+
+  @Override
+  public boolean isShutdown() {
+    return delegate.isShutdown();
+  }
+
+  @Override
+  public boolean isTerminated() {
+    return delegate.isTerminated();
+  }
+
+  @Override
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+    return delegate.awaitTermination(timeout, unit);
+  }
+
+  @Override
+  public <T> ListenableFuture<T> submit(Callable<T> remotePerformCallable) {
+    return (ListenableFuture<T>) super.submit(remotePerformCallable);
+  }
+
+  @Override
+  public void execute(Runnable command) {
+    delegate.execute(command);
+  }
+}
diff --git a/espresso/core/java/androidx/test/espresso/util/concurrent/ThreadFactoryBuilder.java b/espresso/core/java/androidx/test/espresso/util/concurrent/ThreadFactoryBuilder.java
new file mode 100644
index 000000000..bd491452c
--- /dev/null
+++ b/espresso/core/java/androidx/test/espresso/util/concurrent/ThreadFactoryBuilder.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.util.concurrent;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.util.Locale;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * A minimal implementation of Guava's ThreadFactoryBuilder
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public class ThreadFactoryBuilder {
+
+  private String nameFormat;
+
+  public ThreadFactoryBuilder setNameFormat(String nameFormat) {
+    String unused = format(nameFormat, 0); // fail fast if the format is bad or null
+    this.nameFormat = nameFormat;
+    return this;
+  }
+
+  public ThreadFactory build() {
+    // espresso usages currently always set nameFormat, so lets just assert its nonnull to
+    // simplify logic
+    checkNotNull(nameFormat);
+    ThreadFactory backingFactory = Executors.defaultThreadFactory();
+    AtomicLong count = new AtomicLong(0);
+    return r -> {
+      Thread thread = backingFactory.newThread(r);
+      thread.setName(format(nameFormat, count.getAndIncrement()));
+      return thread;
+    };
+  }
+
+  private static String format(String format, Object... args) {
+    return String.format(Locale.ROOT, format, args);
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/AmbiguousViewMatcherExceptionTest.java b/espresso/core/javatests/androidx/test/espresso/AmbiguousViewMatcherExceptionTest.java
index 8dd770022..aabab0bc3 100644
--- a/espresso/core/javatests/androidx/test/espresso/AmbiguousViewMatcherExceptionTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/AmbiguousViewMatcherExceptionTest.java
@@ -23,6 +23,7 @@
 import static org.hamcrest.Matchers.notNullValue;
 
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -44,35 +45,32 @@ public class AmbiguousViewMatcherExceptionTest {
   private View child2;
   private View child3;
   private View child4;
+  private View child5;
+  private View child6;
 
   @Before
   public void setUp() throws Exception {
     alwaysTrueMatcher = notNullValue(View.class);
     testView = new RelativeLayout(getInstrumentation().getContext());
-    child1 = new TextView(getInstrumentation().getContext());
-    child1.setId(1);
-    child2 = new TextView(getInstrumentation().getContext());
-    child2.setId(2);
-    child3 = new TextView(getInstrumentation().getContext());
-    child3.setId(3);
-    child4 = new TextView(getInstrumentation().getContext());
-    child4.setId(4);
-    testView.addView(child1);
-    testView.addView(child2);
-    testView.addView(child3);
-    testView.addView(child4);
+    child1 = createView(testView, 1);
+    child2 = createView(testView, 2);
+    child3 = createView(testView, 3);
+    child4 = createView(testView, 4);
+    child5 = createView(testView, 5);
+    child6 = createView(testView, 6);
   }
 
+
   @Test
   public void exceptionContainsMatcherDescription() {
     StringBuilder matcherDescription = new StringBuilder();
     alwaysTrueMatcher.describeTo(new StringDescription(matcherDescription));
-    assertThat(createException().getMessage(), containsString(matcherDescription.toString()));
+    assertThat(createException4Views().getMessage(), containsString(matcherDescription.toString()));
   }
 
   @Test
   public void exceptionContainsView() {
-    String exceptionMessage = createException().getMessage();
+    String exceptionMessage = createException4Views().getMessage();
 
     assertThat(
         "missing elements",
@@ -85,8 +83,47 @@ public void exceptionContainsView() {
             containsString("{id=-1,"))); // root
   }
 
-  private AmbiguousViewMatcherException createException() {
+  @Test
+  public void exceptionMessageWithViewList() {
+    String exceptionMessage = createException4Views().getMessage();
+
+    assertThat(
+        exceptionMessage.replaceAll("\\{[^}]+\\}", "{...}").replaceAll("[\n\r]+", "\n"),
+        containsString(
+            "'not null' matches 5 views in the hierarchy:\n"
+                + "- [1] RelativeLayout{...}\n"
+                + "- [2] TextView{...}\n"
+                + "- [3] TextView{...}\n"
+                + "- [4] TextView{...}\n"
+                + "- [5] TextView{...}\n"
+                + "Problem views are marked with '****MATCHES****' below."));
+  }
+
+  @Test
+  public void exceptionMessageWithTruncatedViewList() {
+    String exceptionMessage = createException6Views().getMessage();
+
+    assertThat(
+        exceptionMessage.replaceAll("\\{[^}]+\\}", "{...}").replaceAll("[\n\r]+", "\n"),
+        containsString(
+            "'not null' matches 7 views in the hierarchy:\n"
+                + "- [1] RelativeLayout{...}\n"
+                + "- [2] TextView{...}\n"
+                + "- [3] TextView{...}\n"
+                + "- [4] TextView{...}\n"
+                + "- [5] TextView{...}\n"
+                + "- [truncated, listing 5 out of 7 views].\n"
+                + "Problem views are marked with '****MATCHES****' below."));
+  }
+
+  private static View createView(ViewGroup parent, int index) {
+    View v = new TextView(getInstrumentation().getContext());
+    v.setId(index);
+    parent.addView(v);
+    return v;
+  }
 
+  private AmbiguousViewMatcherException createException4Views() {
     return new AmbiguousViewMatcherException.Builder()
         .withViewMatcher(alwaysTrueMatcher)
         .withRootView(testView)
@@ -95,4 +132,14 @@ private AmbiguousViewMatcherException createException() {
         .withOtherAmbiguousViews(child2, child3, child4)
         .build();
   }
+
+  private AmbiguousViewMatcherException createException6Views() {
+    return new AmbiguousViewMatcherException.Builder()
+        .withViewMatcher(alwaysTrueMatcher)
+        .withRootView(testView)
+        .withView1(testView)
+        .withView2(child1)
+        .withOtherAmbiguousViews(child2, child3, child4, child5, child6)
+        .build();
+  }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/AppNotIdleExceptionTest.java b/espresso/core/javatests/androidx/test/espresso/AppNotIdleExceptionTest.java
index 391243e1f..6e97ada6a 100644
--- a/espresso/core/javatests/androidx/test/espresso/AppNotIdleExceptionTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/AppNotIdleExceptionTest.java
@@ -19,6 +19,7 @@
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import android.os.Handler;
@@ -78,9 +79,15 @@ public void run() {
       onView(withId(R.id.request_button)).perform(click());
       fail("Espresso failed to throw AppNotIdleException");
     } catch (AppNotIdleException expected) {
-      // Do Nothing. Test pass.
+      assertThat(
+          expected.getMessage(),
+          new StringPatternMatcher(
+              "Looped for \\d+ iterations over \\d+ SECONDS\\. "
+                  + "The following Idle Conditions failed MAIN_LOOPER_HAS_IDLED"
+                  + "\\(last message: [^\\)]+\\)\\."));
     } finally {
       continueBeingBusy.getAndSet(false);
     }
   }
+
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/BUILD b/espresso/core/javatests/androidx/test/espresso/BUILD
new file mode 100644
index 000000000..f8cf1f52e
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/BUILD
@@ -0,0 +1,176 @@
+# Description:
+#   Tests for espresso core
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:axt_android_application_test.bzl",
+    "axt_android_application_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "utils",
+    srcs = [
+        "StringPatternMatcher.java",
+        "TestTracer.java",
+    ],
+    visibility = [
+        "//espresso/core/javatests/androidx/test/espresso:__subpackages__",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "AmbiguousViewMatcherExceptionTest",
+    srcs = ["AmbiguousViewMatcherExceptionTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "AppNotIdleExceptionTest",
+    srcs = ["AppNotIdleExceptionTest.java"],
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "EspressoEdgeCaseTest",
+    srcs = ["EspressoEdgeCaseTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_application_test(
+    name = "EspressoTest",
+    srcs = ["EspressoTest.java"],
+    instruments = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "InteractionResultsHandlerTest",
+    srcs = ["InteractionResultsHandlerTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "NoMatchingViewExceptionTest",
+    srcs = ["NoMatchingViewExceptionTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "OnIdleTest",
+    srcs = ["OnIdleTest.java"],
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ViewInteractionTest",
+    srcs = ["ViewInteractionTest.java"],
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/internal/data",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/BUILD.bazel
deleted file mode 100644
index aaabb724b..000000000
--- a/espresso/core/javatests/androidx/test/espresso/BUILD.bazel
+++ /dev/null
@@ -1,48 +0,0 @@
-# Description: Tests for espresso core
-# Description:
-#   Tests for espresso core
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["*.java"]),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:data-interaction-remote",
-        "//espresso/core/java/androidx/test/espresso/action:remote_view_actions",
-        "//espresso/core/java/androidx/test/espresso/base",
-        "//espresso/core/java/androidx/test/espresso/internal/data",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_view_matchers",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:bindable",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/EspressoEdgeCaseTest.java b/espresso/core/javatests/androidx/test/espresso/EspressoEdgeCaseTest.java
index 8c2616693..214163d11 100644
--- a/espresso/core/javatests/androidx/test/espresso/EspressoEdgeCaseTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/EspressoEdgeCaseTest.java
@@ -33,6 +33,7 @@
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.SendActivity;
 import java.util.concurrent.Callable;
@@ -214,6 +215,7 @@ public void recoveryFromTimeOutExceptionDynamic() {
   }
 
   @Test
+  @SdkSuppress(maxSdkVersion = 28) // TODO(b/248121335)
   public void recoveryFromAsyncTaskTimeout() throws Exception {
     IdlingPolicies.setMasterPolicyTimeout(2, TimeUnit.SECONDS);
     try {
@@ -230,7 +232,7 @@ public Void doInBackground(Void... params) {
                     }
                   }.execute();
                   // block test execution until loopMainThreadForAtLeast call
-                  // would be satisified
+                  // would be satisfied
                   controller.loopMainThreadForAtLeast(1000);
                 }
               });
@@ -249,7 +251,6 @@ public Void doInBackground(Void... params) {
     onView(withId(R.id.enter_data_edit_text)).check(matches(withText("Har Har")));
   }
 
-
   private abstract static class TestAction implements ViewAction {
     @Override
     public String getDescription() {
diff --git a/espresso/core/javatests/androidx/test/espresso/EspressoTest.java b/espresso/core/javatests/androidx/test/espresso/EspressoTest.java
index eb9ee305a..1ef054b3b 100644
--- a/espresso/core/javatests/androidx/test/espresso/EspressoTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/EspressoTest.java
@@ -17,6 +17,7 @@
 package androidx.test.espresso;
 
 import static androidx.test.espresso.Espresso.onData;
+import static androidx.test.espresso.Espresso.onIdle;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static androidx.test.espresso.Espresso.openContextualActionModeOverflowMenu;
@@ -28,34 +29,42 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static com.google.common.truth.Truth.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.any;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasValue;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.rules.ExpectedException.none;
 
 import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.assertion.ViewAssertions;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.tracing.Tracing;
 import androidx.test.ui.app.ActionBarTestActivity;
 import androidx.test.ui.app.KeyboardTestActivity;
 import androidx.test.ui.app.MainActivity;
 import androidx.test.ui.app.R;
-import androidx.test.ui.app.SendActivity;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.hamcrest.Matcher;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 
 /**
@@ -68,7 +77,30 @@ public class EspressoTest {
   @Rule
   public ActivityScenarioRule<MainActivity> rule = new ActivityScenarioRule<>(MainActivity.class);
 
-  @Rule public ExpectedException expectedException = none();
+  private TestTracer tracer;
+
+  @Before
+  public void setUp() throws Exception {
+    tracer =
+        new TestTracer() {
+          @NonNull
+          @Override
+          public String rewriteSpanName(@NonNull String spanName) {
+            // Replace the IDs with a constant string "ID" to get rid of the unstable value of these
+            // IDs.
+            // The ID may contain non-digits but always starts with digits, different from class
+            // types.
+            // The string may be cut off by sanitization of length.
+            return spanName.replaceAll("[0-9]+", "<ID>");
+          }
+        };
+    Tracing.getInstance().registerTracer(tracer);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    Tracing.getInstance().unregisterTracer(tracer);
+  }
 
   @Test
   public void openOverflowFromActionBar() {
@@ -78,6 +110,72 @@ public void openOverflowFromActionBar() {
     openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
     onView(withText("World")).perform(click());
     onView(withId(R.id.text_action_bar_result)).check(matches(withText("World")));
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.onView(is assignable from class class"
+                + " android.widget.AdapterView)",
+            "+-endSpan: Espresso.onView(is assignable from class class"
+                + " android.widget.AdapterView)",
+            "beginSpan: Espresso.perform(AdapterDataLoaderAction, is assignable from class class"
+                + " android.widget.AdapterView)",
+            "beginSpan: Espresso.doPerform(ListViewid<ID> res-namelist visibilityVISIBLE"
+                + " width<ID> height<ID> has-focustru",
+            "+-endSpan: Espresso.doPerform(ListViewid<ID> res-namelist visibilityVISIBLE width<ID>"
+                + " height<ID> has-focustru",
+            "+-endSpan: Espresso.perform(AdapterDataLoaderAction, is assignable from class class"
+                + " android.widget.AdapterView)",
+            "beginSpan: Espresso.onView(displaying data matching: (an instance of java.util.Map and"
+                + " map containing [ANYTHING",
+            "+-endSpan: Espresso.onView(displaying data matching: (an instance of java.util.Map and"
+                + " map containing [ANYTHING",
+            "beginSpan: Espresso.perform(GeneralClickAction, displaying data matching: (an instance"
+                + " of java.util.Map and map",
+            "beginSpan: Espresso.doPerform(TextViewid<ID> res-nametext<ID> visibilityVISIBLE"
+                + " width<ID> height<ID> has-focusfal",
+            "+-endSpan: Espresso.doPerform(TextViewid<ID> res-nametext<ID> visibilityVISIBLE"
+                + " width<ID> height<ID> has-focusfal",
+            "+-endSpan: Espresso.perform(GeneralClickAction, displaying data matching: (an instance"
+                + " of java.util.Map and map",
+            "beginSpan: Espresso.onView(view.getId() is <ID>)",
+            "+-endSpan: Espresso.onView(view.getId() is <ID>)",
+            "beginSpan: Espresso.perform(GeneralClickAction, view.getId() is <ID>)",
+            "beginSpan: Espresso.doPerform(AppCompatButtonid<ID> res-namehide_contextual_action_bar"
+                + " visibilityVISIBLE",
+            "+-endSpan: Espresso.doPerform(AppCompatButtonid<ID> res-namehide_contextual_action_bar"
+                + " visibilityVISIBLE",
+            "+-endSpan: Espresso.perform(GeneralClickAction, view.getId() is <ID>)",
+            "beginSpan: Espresso.openActionBarOverflowOrOptionsMenu",
+            "beginSpan: Espresso.onView(view.getRootView() to equal view)",
+            "+-endSpan: Espresso.onView(view.getRootView() to equal view)",
+            "beginSpan: Espresso.perform(KeyEventAction, view.getRootView() to equal view)",
+            "beginSpan: Espresso.doPerform(DecorViewid-<ID> visibilityVISIBLE width<ID> height<ID>"
+                + " has-focusfalse has-focusabletr",
+            "+-endSpan: Espresso.doPerform(DecorViewid-<ID> visibilityVISIBLE width<ID> height<ID>"
+                + " has-focusfalse has-focusabletr",
+            "+-endSpan: Espresso.perform(KeyEventAction, view.getRootView() to equal view)",
+            "+-endSpan: Espresso.openActionBarOverflowOrOptionsMenu",
+            "beginSpan: Espresso.onView(an instance of android.widget.TextView and view.getText()"
+                + " with or without transforma",
+            "+-endSpan: Espresso.onView(an instance of android.widget.TextView and view.getText()"
+                + " with or without transforma",
+            "beginSpan: Espresso.perform(GeneralClickAction, an instance of android.widget.TextView"
+                + " and view.getText() with",
+            "beginSpan: Espresso.doPerform(AppCompatTextViewid<ID> res-nametitle visibilityVISIBLE"
+                + " width<ID> height<ID> h",
+            "+-endSpan: Espresso.doPerform(AppCompatTextViewid<ID> res-nametitle visibilityVISIBLE"
+                + " width<ID> height<ID> h",
+            "+-endSpan: Espresso.perform(GeneralClickAction, an instance of android.widget.TextView"
+                + " and view.getText() with",
+            "beginSpan: Espresso.onView(view.getId() is <ID>)",
+            "+-endSpan: Espresso.onView(view.getId() is <ID>)",
+            "beginSpan: Espresso.check(MatchesViewAssertion, view.getId() is <ID>)",
+            "beginSpan: Espresso.doCheck(AppCompatTextViewid<ID> res-nametext_action_bar_result"
+                + " visibilityVISIBLE widt",
+            "+-endSpan: Espresso.doCheck(AppCompatTextViewid<ID> res-nametext_action_bar_result"
+                + " visibilityVISIBLE widt",
+            "+-endSpan: Espresso.check(MatchesViewAssertion, view.getId() is <ID>)"));
   }
 
   @Test
@@ -87,42 +185,106 @@ public void openOverflowInActionMode() {
     openContextualActionModeOverflowMenu();
     onView(withText("Key")).perform(click());
     onView(withId(R.id.text_action_bar_result)).check(matches(withText("Key")));
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.onView(is assignable from class class"
+                + " android.widget.AdapterView)",
+            "+-endSpan: Espresso.onView(is assignable from class class"
+                + " android.widget.AdapterView)",
+            "beginSpan: Espresso.perform(AdapterDataLoaderAction, is assignable from class class"
+                + " android.widget.AdapterView)",
+            "beginSpan: Espresso.doPerform(ListViewid<ID> res-namelist visibilityVISIBLE"
+                + " width<ID> height<ID> has-focustru",
+            "+-endSpan: Espresso.doPerform(ListViewid<ID> res-namelist visibilityVISIBLE width<ID>"
+                + " height<ID> has-focustru",
+            "+-endSpan: Espresso.perform(AdapterDataLoaderAction, is assignable from class class"
+                + " android.widget.AdapterView)",
+            "beginSpan: Espresso.onView(displaying data matching: (an instance of java.util.Map and"
+                + " map containing [ANYTHING",
+            "+-endSpan: Espresso.onView(displaying data matching: (an instance of java.util.Map and"
+                + " map containing [ANYTHING",
+            "beginSpan: Espresso.perform(GeneralClickAction, displaying data matching: (an instance"
+                + " of java.util.Map and map",
+            "beginSpan: Espresso.doPerform(TextViewid<ID> res-nametext<ID> visibilityVISIBLE"
+                + " width<ID> height<ID> has-focusfal",
+            "+-endSpan: Espresso.doPerform(TextViewid<ID> res-nametext<ID> visibilityVISIBLE"
+                + " width<ID> height<ID> has-focusfal",
+            "+-endSpan: Espresso.perform(GeneralClickAction, displaying data matching: (an instance"
+                + " of java.util.Map and map",
+            "beginSpan: Espresso.openContextualActionModeOverflowMenu",
+            "beginSpan: Espresso.onView(view.getRootView() to equal view)",
+            "+-endSpan: Espresso.onView(view.getRootView() to equal view)",
+            "beginSpan: Espresso.perform(TransitionBridgingViewAction, view.getRootView() to equal"
+                + " view)",
+            "beginSpan: Espresso.doPerform(DecorViewid-<ID> visibilityVISIBLE width<ID> height<ID>"
+                + " has-focusfalse has-focusabletr",
+            "+-endSpan: Espresso.doPerform(DecorViewid-<ID> visibilityVISIBLE width<ID> height<ID>"
+                + " has-focusfalse has-focusabletr",
+            "+-endSpan: Espresso.perform(TransitionBridgingViewAction, view.getRootView() to equal"
+                + " view)",
+            "beginSpan: Espresso.onView((((view has effective visibility VISIBLE and"
+                + " view.getGlobalVisibleRect() to return n",
+            "+-endSpan: Espresso.onView((((view has effective visibility VISIBLE and"
+                + " view.getGlobalVisibleRect() to return n",
+            "beginSpan: Espresso.perform(GeneralClickAction, (((view has effective visibility"
+                + " VISIBLE and view.getGlobalVisi",
+            "beginSpan: Espresso.doPerform(OverflowMenuButtonid-<ID> descMore options"
+                + " visibilityVISIBLE width<ID> height<ID> has-fo",
+            "+-endSpan: Espresso.doPerform(OverflowMenuButtonid-<ID> descMore options"
+                + " visibilityVISIBLE width<ID> height<ID> has-fo",
+            "+-endSpan: Espresso.perform(GeneralClickAction, (((view has effective visibility"
+                + " VISIBLE and view.getGlobalVisi",
+            "+-endSpan: Espresso.openContextualActionModeOverflowMenu",
+            "beginSpan: Espresso.onView(an instance of android.widget.TextView and view.getText()"
+                + " with or without transforma",
+            "+-endSpan: Espresso.onView(an instance of android.widget.TextView and view.getText()"
+                + " with or without transforma",
+            "beginSpan: Espresso.perform(GeneralClickAction, an instance of android.widget.TextView"
+                + " and view.getText() with",
+            "beginSpan: Espresso.doPerform(AppCompatTextViewid<ID> res-nametitle visibilityVISIBLE"
+                + " width<ID> height<ID> h",
+            "+-endSpan: Espresso.doPerform(AppCompatTextViewid<ID> res-nametitle visibilityVISIBLE"
+                + " width<ID> height<ID> h",
+            "+-endSpan: Espresso.perform(GeneralClickAction, an instance of android.widget.TextView"
+                + " and view.getText() with",
+            "beginSpan: Espresso.onView(view.getId() is <ID>)",
+            "+-endSpan: Espresso.onView(view.getId() is <ID>)",
+            "beginSpan: Espresso.check(MatchesViewAssertion, view.getId() is <ID>)",
+            "beginSpan: Espresso.doCheck(AppCompatTextViewid<ID> res-nametext_action_bar_result"
+                + " visibilityVISIBLE widt",
+            "+-endSpan: Espresso.doCheck(AppCompatTextViewid<ID> res-nametext_action_bar_result"
+                + " visibilityVISIBLE widt",
+            "+-endSpan: Espresso.check(MatchesViewAssertion, view.getId() is <ID>)"));
   }
 
   @Test
-  public void closeSoftKeyboard() {
-    onData(allOf(instanceOf(Map.class), hasValue(SendActivity.class.getSimpleName())))
+  public void closeSoftKeyboard() throws InterruptedException {
+    onData(allOf(instanceOf(Map.class), hasValue(KeyboardTestActivity.class.getSimpleName())))
         .perform(click());
+    // click on the edit text which bring the soft keyboard up
+    onView(withId(R.id.editTextUserInput)).perform(typeText("Espresso"));
 
-    onView(withId(R.id.enter_data_edit_text))
-        .perform(
-            new ViewAction() {
-              @Override
-              public Matcher<View> getConstraints() {
-                return any(View.class);
-              }
-
+    onView(withId(R.id.editTextUserInput))
+        .check(
+            new ViewAssertion() {
               @Override
-              public void perform(UiController uiController, View view) {
-                // This doesn't do anything if hardware keyboard is present - that is, soft keyboard
-                // is _not_ present. Whether it's present or not can be verified under the following
-                // device settings: Settings > Language & Input > Under Keyboard and input method
+              public void check(View view, NoMatchingViewException noViewFoundException) {
                 InputMethodManager imm =
                     (InputMethodManager)
-                        getInstrumentation()
-                            .getTargetContext()
-                            .getSystemService(Context.INPUT_METHOD_SERVICE);
-                imm.showSoftInput(view, 0);
-                uiController.loopMainThreadUntilIdle();
-              }
-
-              @Override
-              public String getDescription() {
-                return "show soft input";
+                        view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+                assertTrue(imm.isActive(view));
               }
             });
 
-    onView(withId(R.id.enter_data_edit_text)).perform(ViewActions.closeSoftKeyboard());
+    onView(withId(R.id.editTextUserInput)).perform(ViewActions.closeSoftKeyboard());
+
+    assertThat(tracer.getSpans())
+        .containsAtLeast(
+            "beginSpan: Espresso.perform(CloseKeyboardAction, view.getId() is <ID>)",
+            "+-endSpan: Espresso.perform(CloseKeyboardAction, view.getId() is <ID>)")
+        .inOrder();
   }
 
   /**
@@ -143,6 +305,14 @@ public void closeSoftKeyboardRetry() {
     onView(withId(R.id.editTextUserInput))
         .perform(typeText(", just works!"), ViewActions.closeSoftKeyboard());
     onView(withId(R.id.changeTextBt)).perform(click());
+
+    assertThat(tracer.getSpans())
+        .containsAtLeast(
+            "beginSpan: Espresso.perform(CloseKeyboardAction, view.getId() is"
+                + " <ID>/androidx.test.ui.app:id/editTextUse",
+            "+-endSpan: Espresso.perform(CloseKeyboardAction, view.getId() is"
+                + " <ID>/androidx.test.ui.app:id/editTextUse")
+        .inOrder();
   }
 
   @Test
@@ -209,6 +379,71 @@ public void emptyArrayOfResources() {
     assertTrue(Espresso.unregisterIdlingResources());
   }
 
+  @Test
+  public void onView_thrownFromScenarioOnActivity() {
+    rule.getScenario()
+        .onActivity(
+            activity -> {
+              IllegalStateException thrown =
+                  assertThrows(
+                      IllegalStateException.class,
+                      () ->
+                          onView(withId(android.R.id.list))
+                              .check(matches(withText("ActionBarTestActivity")))
+                              .perform(click()));
+
+              assertThat(
+                  thrown.getMessage(),
+                  containsString("Method cannot be called on the main application thread"));
+            });
+
+    // onView start & end span
+    assertThat(tracer.getSpans()).hasSize(2);
+  }
+
+  @Test
+  public void onData_throwsFromScenarioOnActivity() {
+    rule.getScenario()
+        .onActivity(
+            activity -> {
+              IllegalStateException thrown =
+                  assertThrows(
+                      IllegalStateException.class,
+                      () ->
+                          onData(
+                                  allOf(
+                                      instanceOf(Map.class),
+                                      hasValue(ActionBarTestActivity.class.getSimpleName())))
+                              .perform(click()));
+
+              assertThat(
+                  thrown.getMessage(),
+                  containsString("Method cannot be called on the main application thread"));
+            });
+
+    // onView start & end span
+    assertThat(tracer.getSpans()).hasSize(2);
+  }
+
+  @Test
+  public void onIdle_worksFromScenarioOnActivity() {
+    rule.getScenario().onActivity(activity -> onIdle());
+  }
+
+  @Test
+  public void onIdle_worksFromMainThread() throws Exception {
+    CountDownLatch latch = new CountDownLatch(1);
+
+    Handler handler = new Handler(Looper.getMainLooper());
+    handler.postAtFrontOfQueue(
+        () -> {
+          onIdle();
+          latch.countDown();
+        });
+
+    latch.await();
+  }
+
   private static class DummyIdlingResource implements IdlingResource {
     private String name;
 
diff --git a/espresso/core/javatests/androidx/test/espresso/InteractionResultsHandlerTest.java b/espresso/core/javatests/androidx/test/espresso/InteractionResultsHandlerTest.java
index d0fd3528a..00a0285c2 100644
--- a/espresso/core/javatests/androidx/test/espresso/InteractionResultsHandlerTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/InteractionResultsHandlerTest.java
@@ -23,11 +23,10 @@
 import static org.junit.Assert.fail;
 
 import androidx.test.espresso.remote.NoRemoteEspressoInstanceException;
+import androidx.test.espresso.util.concurrent.ListeningExecutorService;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -46,11 +45,11 @@
 @SmallTest
 public class InteractionResultsHandlerTest {
   private static final ListeningExecutorService TEST_EXECUTOR_1 =
-      MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
+      new ListeningExecutorService(Executors.newSingleThreadExecutor());
   private static final ListeningExecutorService TEST_EXECUTOR_2 =
-      MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
+      new ListeningExecutorService(Executors.newSingleThreadExecutor());
   private static final ListeningExecutorService TEST_EXECUTOR_3 =
-      MoreExecutors.listeningDecorator(Executors.newSingleThreadExecutor());
+      new ListeningExecutorService(Executors.newSingleThreadExecutor());
 
   List<ListenableFuture<Void>> interactionsList;
 
@@ -89,9 +88,9 @@ public void firstSuccessfulInteractionShouldCancelAllOthers() throws Throwable {
     CountDownLatch latch1 = new CountDownLatch(1);
     CountDownLatch latch2 = new CountDownLatch(1);
     CountDownLatch latch3 = new CountDownLatch(1);
-    interactionsList.add(TEST_EXECUTOR_1.submit(getBockingCallable(100, latch1, null)));
-    interactionsList.add(TEST_EXECUTOR_1.submit(getBockingCallable(500, latch2, null)));
-    interactionsList.add(TEST_EXECUTOR_2.submit(getBockingCallable(500, latch3, null)));
+    interactionsList.add(TEST_EXECUTOR_1.submit(getBlockingCallable(100, latch1, null)));
+    interactionsList.add(TEST_EXECUTOR_1.submit(getBlockingCallable(500, latch2, null)));
+    interactionsList.add(TEST_EXECUTOR_2.submit(getBlockingCallable(500, latch3, null)));
 
     InteractionResultsHandler.gatherAnyResult(interactionsList);
 
@@ -113,8 +112,8 @@ public void verifyAllInteractionsFinishWhenNoSuccessfulInteractionExists() throw
 
     CountDownLatch latch1 = new CountDownLatch(1);
     CountDownLatch latch2 = new CountDownLatch(1);
-    interactionsList.add(TEST_EXECUTOR_1.submit(getBockingCallable(100, latch1, throwsRunnable)));
-    interactionsList.add(TEST_EXECUTOR_2.submit(getBockingCallable(500, latch2, throwsRunnable)));
+    interactionsList.add(TEST_EXECUTOR_1.submit(getBlockingCallable(100, latch1, throwsRunnable)));
+    interactionsList.add(TEST_EXECUTOR_2.submit(getBlockingCallable(500, latch2, throwsRunnable)));
 
     try {
       InteractionResultsHandler.gatherAnyResult(interactionsList);
@@ -143,9 +142,9 @@ public void verifyInteractionExceptionTakesPrecedenceOverNoRemoteInstanceExcepti
     CountDownLatch noRemoteLatch = new CountDownLatch(1);
     interactionsList.add(
         TEST_EXECUTOR_1.submit(
-            getBockingCallable(500, noActivityLatch, noActivityExceptionRunnable)));
+            getBlockingCallable(500, noActivityLatch, noActivityExceptionRunnable)));
     interactionsList.add(
-        TEST_EXECUTOR_2.submit(getBockingCallable(100, noRemoteLatch, noRemoteExceptionRunnable)));
+        TEST_EXECUTOR_2.submit(getBlockingCallable(100, noRemoteLatch, noRemoteExceptionRunnable)));
 
     try {
       InteractionResultsHandler.gatherAnyResult(interactionsList);
@@ -185,11 +184,11 @@ public void run() {
     CountDownLatch assertLatch = new CountDownLatch(1);
     interactionsList.add(
         TEST_EXECUTOR_1.submit(
-            getBockingCallable(500, noActivityLatch, noActivityExceptionRunnable)));
+            getBlockingCallable(500, noActivityLatch, noActivityExceptionRunnable)));
     interactionsList.add(
-        TEST_EXECUTOR_2.submit(getBockingCallable(400, noRemoteLatch, noRemoteExceptionRunnable)));
+        TEST_EXECUTOR_2.submit(getBlockingCallable(400, noRemoteLatch, noRemoteExceptionRunnable)));
     interactionsList.add(
-        TEST_EXECUTOR_3.submit(getBockingCallable(100, assertLatch, assertionErrorRunnable)));
+        TEST_EXECUTOR_3.submit(getBlockingCallable(100, assertLatch, assertionErrorRunnable)));
 
     try {
       InteractionResultsHandler.gatherAnyResult(interactionsList);
@@ -226,9 +225,9 @@ public void verifyMultipleConcurrentInteractionsOnDifferentThreadsReportSuccess(
       final CountDownLatch noRemoteLatch = new CountDownLatch(1);
 
       final ListenableFuture<Void> noRemoteFuture =
-          TEST_EXECUTOR_2.submit(getBockingCallable(0, noRemoteLatch, noRemoteExceptionRunnable));
+          TEST_EXECUTOR_2.submit(getBlockingCallable(0, noRemoteLatch, noRemoteExceptionRunnable));
       final ListenableFuture<Void> successFutures =
-          TEST_EXECUTOR_1.submit(getBockingCallable(0, successfulLatch, null));
+          TEST_EXECUTOR_1.submit(getBlockingCallable(0, successfulLatch, null));
 
       interactionsList.add(noRemoteFuture);
       interactionsList.add(successFutures);
@@ -244,7 +243,7 @@ public void execute(Runnable r) {
     }
   }
 
-  private Callable<Void> getBockingCallable(
+  private Callable<Void> getBlockingCallable(
       final long millis, final CountDownLatch latch, final Runnable runnable) {
     return new Callable<Void>() {
       @Override
diff --git a/espresso/core/javatests/androidx/test/espresso/OnIdleTest.java b/espresso/core/javatests/androidx/test/espresso/OnIdleTest.java
index 976d93527..f55521a9e 100644
--- a/espresso/core/javatests/androidx/test/espresso/OnIdleTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/OnIdleTest.java
@@ -87,6 +87,12 @@ public Void call() {
       assertThat(countDownLatch.await(10, TimeUnit.SECONDS), is(false));
     } catch (AppNotIdleException expected) {
       assertThat(expected, instanceOf(AppNotIdleException.class));
+      assertThat(
+          expected.getMessage(),
+          new StringPatternMatcher(
+              "Looped for \\d+ iterations over \\d+ SECONDS\\. "
+                  + "The following Idle Conditions failed "
+                  + "DYNAMIC_TASKS_HAVE_IDLED\\(busy resources=testResource\\)\\."));
     } finally {
       assertThat(Espresso.unregisterIdlingResources(resource), is(true));
     }
@@ -109,6 +115,12 @@ public Void call() {
       assertThat(countDownLatch.await(10, TimeUnit.SECONDS), is(false));
     } catch (AppNotIdleException expected) {
       assertThat(expected, instanceOf(AppNotIdleException.class));
+      assertThat(
+          expected.getMessage(),
+          new StringPatternMatcher(
+              "Looped for \\d+ iterations over \\d+ SECONDS\\. "
+                  + "The following Idle Conditions failed "
+                  + "DYNAMIC_TASKS_HAVE_IDLED\\(busy resources=testResource\\)\\."));
     } finally {
       assertThat(IdlingRegistry.getInstance().unregister(resource), is(true));
     }
@@ -124,6 +136,12 @@ public void onIdle_neverIdleResourceThrowsAppNotIdleException_withIdlingRegistry
       fail("Expected AppNotIdleException to be thrown");
     } catch (AppNotIdleException expected) {
       assertThat(expected, instanceOf(AppNotIdleException.class));
+      assertThat(
+          expected.getMessage(),
+          new StringPatternMatcher(
+              "Looped for \\d+ iterations over \\d+ SECONDS\\. "
+                  + "The following Idle Conditions failed "
+                  + "DYNAMIC_TASKS_HAVE_IDLED\\(busy resources=testResource\\)\\."));
     } finally {
       assertThat(IdlingRegistry.getInstance().unregister(resource), is(true));
     }
diff --git a/espresso/core/javatests/androidx/test/espresso/StringPatternMatcher.java b/espresso/core/javatests/androidx/test/espresso/StringPatternMatcher.java
new file mode 100644
index 000000000..ca7cf2892
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/StringPatternMatcher.java
@@ -0,0 +1,16 @@
+package androidx.test.espresso;
+
+import org.hamcrest.core.SubstringMatcher;
+
+/** Simulates the MatchesPattern available in Hamcrest 2. */
+class StringPatternMatcher extends SubstringMatcher {
+
+  public StringPatternMatcher(String substringRegexPattern) {
+    super(/* relationship= */ "matching", /* ignoringCase= */ false, substringRegexPattern);
+  }
+
+  @Override
+  protected boolean evalSubstringOf(String s) {
+    return s.matches(substring);
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/TestTracer.java b/espresso/core/javatests/androidx/test/espresso/TestTracer.java
new file mode 100644
index 000000000..b6ba49ff4
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/TestTracer.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso;
+
+import androidx.annotation.NonNull;
+import androidx.test.platform.tracing.Tracer;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A test utility {@link Tracer} implementation used during tests to capture trace spans.
+ *
+ * <p>Usage:
+ *
+ * <pre>
+ *   TestTracer tracer = new TestTracer();
+ *   Tracing.getInstance().registerTracer(tracer);
+ *   ... perform test
+ *   assertThat(tracer.getActions()).containsExactly("span1", "span2").inOrder();
+ *   Tracing.getInstance().unregisterTracer(tracer);
+ * </pre>
+ */
+public class TestTracer implements Tracer {
+  private final List<String> spans = new ArrayList<>();
+
+  public List<String> getSpans() {
+    return spans;
+  }
+
+  /**
+   * Test implementation should override this method to adjust the span names to remove any test
+   * variance. See example of usage in ViewInteractionTest.
+   */
+  @NonNull
+  public String rewriteSpanName(@NonNull String spanName) {
+    return spanName;
+  }
+
+  @NonNull
+  @Override
+  public Span beginSpan(@NonNull String name) {
+    name = rewriteSpanName(name);
+    spans.add("beginSpan: " + name);
+    return new TestUtilTracerSpan(name, 0);
+  }
+
+  class TestUtilTracerSpan implements Span {
+    private final String spanName;
+    private final int level;
+
+    public TestUtilTracerSpan(@NonNull String spanName, int level) {
+      this.spanName = spanName;
+      this.level = level;
+    }
+
+    @NonNull
+    @Override
+    public Span beginChildSpan(@NonNull String name) {
+      name = rewriteSpanName(name);
+      spans.add(repeat("| ", level) + "+ childSpan: " + name);
+      return new TestUtilTracerSpan(name, level + 1);
+    }
+
+    @Override
+    public void close() {
+      spans.add(repeat("| ", level) + "+-endSpan: " + spanName);
+    }
+  }
+
+  private static String repeat(String token, int n) {
+    StringBuilder builder = new StringBuilder();
+    for (int i = 0; i < n; i++) {
+      builder.append(token);
+    }
+    return builder.toString();
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/ViewInteractionTest.java b/espresso/core/javatests/androidx/test/espresso/ViewInteractionTest.java
index 1cff65c81..41de412e0 100644
--- a/espresso/core/javatests/androidx/test/espresso/ViewInteractionTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/ViewInteractionTest.java
@@ -16,10 +16,12 @@
 
 package androidx.test.espresso;
 
+import static androidx.test.espresso.util.Throwables.throwIfUnchecked;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static com.google.common.base.Throwables.throwIfUnchecked;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.instanceOf;
@@ -38,20 +40,23 @@
 
 import android.os.IBinder;
 import android.view.View;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.base.InterruptableUiController;
 import androidx.test.espresso.internal.data.TestFlowVisualizer;
 import androidx.test.espresso.matcher.RootMatchers;
 import androidx.test.espresso.remote.Bindable;
 import androidx.test.espresso.remote.NoRemoteEspressoInstanceException;
 import androidx.test.espresso.remote.RemoteInteraction;
+import androidx.test.espresso.util.concurrent.ListeningExecutorService;
+import androidx.test.espresso.util.concurrent.ThreadFactoryBuilder;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.internal.platform.os.ControlledLooper;
+import androidx.test.platform.concurrent.DirectExecutor;
 import androidx.test.platform.io.PlatformTestStorageRegistry;
+import androidx.test.platform.tracing.Tracing;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -63,6 +68,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.hamcrest.MockitoHamcrest;
@@ -81,7 +87,7 @@ public class ViewInteractionTest {
   @Mock private ControlledLooper mockControlledLooper;
 
   private FailureHandler failureHandler;
-  private Executor testExecutor = MoreExecutors.directExecutor();
+  private Executor testExecutor = DirectExecutor.INSTANCE;
   private ActivityLifecycleMonitor realLifecycleMonitor;
   private ViewInteraction testInteraction;
   private View rootView;
@@ -90,6 +96,7 @@ public class ViewInteractionTest {
   private Matcher<View> actionConstraint;
   private AtomicReference<Matcher<Root>> rootMatcherRef;
   private AtomicReference<Boolean> needsActivity;
+  private TestTracer tracer;
 
   private static Callable<Void> createSuccessfulListenableFutureStub() {
     return new Callable<Void>() {
@@ -120,10 +127,32 @@ public void handle(Throwable error, Matcher<View> viewMatcher) {
           }
         };
     when(mockRemoteInteraction.isRemoteProcess()).thenReturn(true);
+
+    // perform(mockAction) and check(mockAssertion) calls report the mock proxy class name in
+    // their span output, which is currently "$Proxy8" and "$Proxy9". It is reasonable to expect
+    // this could vary with different Mockito versions, thus we re-write the tracer span names to
+    // ensure test stability.
+    final String mockActionName = mockAction.getClass().getSimpleName();
+    final String mockAssertionName = mockAssertion.getClass().getSimpleName();
+
+    tracer =
+        new TestTracer() {
+          @NonNull
+          @Override
+          public String rewriteSpanName(@NonNull String spanName) {
+            return spanName
+                .replace(mockActionName, "MockAction")
+                .replace(mockAssertionName, "MockAssert")
+                .replaceAll("\\((\\w+), .*\\)$", "($1, Matcher Description)")
+                .replaceAll("(onView)\\(.*\\)$", "$1(Matcher Description)");
+          }
+        };
+    Tracing.getInstance().registerTracer(tracer);
   }
 
   @After
   public void tearDown() throws Exception {
+    Tracing.getInstance().unregisterTracer(tracer);
     ActivityLifecycleMonitorRegistry.registerInstance(realLifecycleMonitor);
   }
 
@@ -140,6 +169,12 @@ public void verifyPerformViewViolatesConstraints() {
         throw re;
       }
     }
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.perform(MockAction, Matcher Description)",
+            "+-endSpan: Espresso.perform(MockAction, Matcher Description)"));
   }
 
   @Test
@@ -155,6 +190,16 @@ public void verifyPerformPropagatesException() {
       verify(mockAction).perform(mockUiController, targetView);
       assertThat(exceptionToRaise, is(re));
     }
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.perform(MockAction, Matcher Description)"));
   }
 
   @Test
@@ -171,6 +216,16 @@ public void verifyCheckPropagatesException() {
       verify(mockAssertion).check(targetView, null);
       assertThat(re, is(exceptionToRaise));
     }
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "beginSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -188,6 +243,28 @@ public void verifyPerformTwiceUpdatesPreviouslyMatched() {
 
     testInteraction.check(mockAssertion);
     verify(mockAssertion).check(secondView, null);
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "beginSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -199,6 +276,22 @@ public void verifyPerformAndCheck() {
 
     testInteraction.check(mockAssertion);
     verify(mockAssertion).check(targetView, null);
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "beginSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -207,6 +300,16 @@ public void verifyCheck() {
     initWithViewInteraction();
     testInteraction.check(mockAssertion);
     verify(mockAssertion).check(targetView, null);
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "beginSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -215,6 +318,8 @@ public void verifyInRootUpdatesRef() {
     Matcher<Root> testMatcher = nullValue(Root.class);
     testInteraction.inRoot(testMatcher);
     assertEquals(testMatcher, rootMatcherRef.get());
+
+    assertThat(tracer.getSpans(), empty());
   }
 
   @Test
@@ -225,6 +330,8 @@ public void verifyInRoot_NullHandling() {
       fail("should throw");
     } catch (NullPointerException expected) {
     }
+
+    assertThat(tracer.getSpans(), empty());
   }
 
   @Test
@@ -239,6 +346,14 @@ public void verifyCheck_ViewCannotBeFound() {
     initWithViewInteraction();
     testInteraction.check(mockAssertion);
     verify(mockAssertion).check(null, noViewException);
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "beginSpan: Espresso.doCheck(null)",
+            "+-endSpan: Espresso.doCheck(null)",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -251,6 +366,16 @@ public void verifyFailureHandler() {
     testInteraction.withFailureHandler(customFailureHandler).perform(mockAction);
     verify(mockAction).perform(mockUiController, targetView);
     verify(customFailureHandler).handle(exceptionToRaise, viewMatcher);
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.perform(MockAction, Matcher Description)",
+            "beginSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.doPerform(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-w",
+            "+-endSpan: Espresso.perform(MockAction, Matcher Description)"));
   }
 
   @Test
@@ -268,8 +393,8 @@ public Void call() throws Exception {
     when(mockRemoteInteraction.isRemoteProcess()).thenReturn(false);
     // noinspection unchecked
     when(mockRemoteInteraction.createRemoteCheckCallable(
-            any(Matcher.class),
-            any(Matcher.class),
+            ArgumentMatchers.any(),
+            ArgumentMatchers.any(),
             MockitoHamcrest.argThat(
                 allOf(
                     hasEntry(
@@ -280,6 +405,16 @@ public Void call() throws Exception {
     initWithViewInteraction();
     testInteraction.check(mockAssertion);
     verify(mockAssertion).check(targetView, null);
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "beginSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.doCheck(Viewid-1 visibilityVISIBLE width0 height0 has-focusfalse"
+                + " has-focusablefalse has-win",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -301,10 +436,11 @@ public Void call() throws Exception {
     when(mockViewFinder.getView()).thenThrow(noActivityResumed);
     // enable remote interaction
     when(mockRemoteInteraction.isRemoteProcess()).thenReturn(false);
+    when(mockRemoteInteraction.isRemoteClient()).thenReturn(true);
     // noinspection unchecked
     when(mockRemoteInteraction.createRemoteCheckCallable(
-            any(Matcher.class),
-            any(Matcher.class),
+            ArgumentMatchers.any(),
+            ArgumentMatchers.any(),
             MockitoHamcrest.argThat(
                 allOf(
                     hasEntry(
@@ -325,8 +461,8 @@ public Void call() throws Exception {
       // noinspection unchecked
       verify(mockRemoteInteraction)
           .createRemoteCheckCallable(
-              any(Matcher.class),
-              any(Matcher.class),
+              ArgumentMatchers.any(),
+              ArgumentMatchers.any(),
               MockitoHamcrest.argThat(
                   allOf(
                       hasEntry(
@@ -334,6 +470,12 @@ public Void call() throws Exception {
                           instanceOf(IBinder.class)))),
               any(ViewAssertion.class));
     }
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -346,14 +488,20 @@ public void verifyFailingCheckWithSuccessfulRemoteInteraction() {
     // noinspection unchecked
     verify(mockRemoteInteraction)
         .createRemoteCheckCallable(
-            any(Matcher.class),
-            any(Matcher.class),
+            ArgumentMatchers.any(),
+            ArgumentMatchers.any(),
             MockitoHamcrest.argThat(
                 allOf(
                     hasEntry(
                         equalTo(RemoteInteraction.BUNDLE_EXECUTION_STATUS),
                         instanceOf(IBinder.class)))),
             any(ViewAssertion.class));
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(MockAssert, Matcher Description)",
+            "+-endSpan: Espresso.check(MockAssert, Matcher Description)"));
   }
 
   @Test
@@ -371,8 +519,8 @@ public void verifyPerformWithMultipleIBinders() {
     // noinspection unchecked
     verify(mockRemoteInteraction)
         .createRemotePerformCallable(
-            any(Matcher.class),
-            any(Matcher.class),
+            ArgumentMatchers.any(),
+            ArgumentMatchers.any(),
             MockitoHamcrest.argThat(
                 allOf(
                     hasEntry(
@@ -383,6 +531,12 @@ public void verifyPerformWithMultipleIBinders() {
 
     verify(bindableMock).getId();
     verify(bindableMock).getIBinder();
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.perform(BindableViewAction, Matcher Description)",
+            "+-endSpan: Espresso.perform(BindableViewAction, Matcher Description)"));
   }
 
   @Test
@@ -401,8 +555,8 @@ public void verifyCheckWithMultipleIBinders() {
     // noinspection unchecked
     verify(mockRemoteInteraction)
         .createRemoteCheckCallable(
-            any(Matcher.class),
-            any(Matcher.class),
+            ArgumentMatchers.any(),
+            ArgumentMatchers.any(),
             MockitoHamcrest.argThat(
                 allOf(
                     hasEntry(
@@ -413,6 +567,12 @@ public void verifyCheckWithMultipleIBinders() {
 
     verify(bindableMock).getId();
     verify(bindableMock).getIBinder();
+
+    assertThat(
+        tracer.getSpans(),
+        contains(
+            "beginSpan: Espresso.check(BindableViewAssertion, Matcher Description)",
+            "+-endSpan: Espresso.check(BindableViewAssertion, Matcher Description)"));
   }
 
   private void initWithViewInteraction() {
@@ -428,7 +588,7 @@ private void initWithViewInteraction() {
             rootMatcherRef,
             needsActivity,
             mockRemoteInteraction,
-            MoreExecutors.listeningDecorator(
+            new ListeningExecutorService(
                 new ThreadPoolExecutor(
                     0 /*corePoolSize*/,
                     5 /*maximumPoolSize*/,
@@ -437,20 +597,21 @@ private void initWithViewInteraction() {
                     new LinkedBlockingQueue<Runnable>(),
                     new ThreadFactoryBuilder().setNameFormat("Espresso Remote #%d").build())),
             mockControlledLooper,
-            TestFlowVisualizer.getInstance(PlatformTestStorageRegistry.getInstance()));
+            TestFlowVisualizer.getInstance(PlatformTestStorageRegistry.getInstance()),
+            Tracing.getInstance());
   }
 
   private void initWithRunPerformWithSuccessfulRemoteInteraction() {
     initWithRemoteInteraction();
     when(mockRemoteInteraction.createRemotePerformCallable(
-            any(Matcher.class), any(Matcher.class), anyMap(), any(ViewAction.class)))
+            ArgumentMatchers.any(), ArgumentMatchers.any(), anyMap(), any(ViewAction.class)))
         .thenReturn(createSuccessfulListenableFutureStub());
   }
 
   private void initWithRunCheckWithSuccessfulRemoteInteraction() {
     initWithRemoteInteraction();
     when(mockRemoteInteraction.createRemoteCheckCallable(
-            any(Matcher.class), any(Matcher.class), anyMap(), any(ViewAssertion.class)))
+            ArgumentMatchers.any(), ArgumentMatchers.any(), anyMap(), any(ViewAssertion.class)))
         .thenReturn(createSuccessfulListenableFutureStub());
   }
 
@@ -464,6 +625,7 @@ private void initWithRemoteInteraction() {
 
     // enable remote interaction
     when(mockRemoteInteraction.isRemoteProcess()).thenReturn(false);
+    when(mockRemoteInteraction.isRemoteClient()).thenReturn(true);
   }
 
   private static final class BindableViewAction implements ViewAction, Bindable {
diff --git a/espresso/core/javatests/androidx/test/espresso/action/AdapterDataIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/AdapterDataIntegrationTest.java
index e1edb7a20..f4749f4eb 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/AdapterDataIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/AdapterDataIntegrationTest.java
@@ -34,6 +34,7 @@
 import androidx.test.ui.app.LongListActivity;
 import androidx.test.ui.app.R;
 import java.util.Map;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,11 +49,17 @@ public class AdapterDataIntegrationTest {
       new ActivityScenarioRule<>(LongListActivity.class);
 
   @Test
+  @Ignore // flaky
   public void clickAroundList() {
     onData(allOf(is(instanceOf(Map.class)), hasEntry(is(LongListActivity.STR), is("item: 99"))))
         .perform(click());
     onView(withId(R.id.selection_row_value)).check(matches(withText("99")));
 
+    // approximately 1-2% of the time this click isn't delivered to the onClickListener for unknown
+    // reasons
+    // the click is delivered to the right coordinates, but just appears to get silently swallowed
+    // by
+    // the android platform
     onData(allOf(is(instanceOf(Map.class)), hasEntry(is(LongListActivity.STR), is("item: 1"))))
         .perform(click());
 
diff --git a/espresso/core/javatests/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsgTest.java b/espresso/core/javatests/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsgTest.java
deleted file mode 100644
index 1c64e39bd..000000000
--- a/espresso/core/javatests/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsgTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.espresso.action;
-
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.hamcrest.object.IsCompatibleType.typeCompatibleWith;
-import static org.junit.Assert.assertThat;
-
-import androidx.test.espresso.matcher.RemoteHamcrestCoreMatchers13;
-import androidx.test.espresso.proto.action.ViewActions.AdapterDataLoaderActionProto;
-import androidx.test.espresso.remote.RemoteDescriptorRegistry;
-import androidx.test.espresso.remote.TypeProtoConverters;
-import androidx.test.espresso.util.EspressoOptional;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SmallTest;
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/** Tests for {@link AdapterDataLoaderActionRemoteMsg} */
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class AdapterDataLoaderActionRemoteMsgTest {
-  private static final EspressoOptional<Integer> NO_INT = EspressoOptional.absent();
-  private static final EspressoOptional<Integer> EXPECTED_INT = EspressoOptional.of(5);
-  private static final String EXPECTED_STRING = "Cortado";
-
-  private static AdapterDataLoaderActionProto toProto(
-      EspressoOptional<Integer> expectedInt, String expectedString) {
-    Matcher<String> stringMatcher = allOf(instanceOf(String.class), is(expectedString));
-    AdapterDataLoaderAction adapterDataLoaderAction =
-        new AdapterDataLoaderAction(
-            stringMatcher, expectedInt, AdapterViewProtocols.standardProtocol());
-
-    return new AdapterDataLoaderActionRemoteMsg(adapterDataLoaderAction).toProto();
-  }
-
-  @Before
-  public void initRegistry() {
-    RemoteHamcrestCoreMatchers13.init(RemoteDescriptorRegistry.getInstance());
-    RemoteViewActions.init(RemoteDescriptorRegistry.getInstance());
-  }
-
-  @Test
-  public void transformationToProto() {
-    AdapterDataLoaderActionProto adapterDataLoaderActionProto =
-        toProto(EXPECTED_INT, EXPECTED_STRING);
-
-    assertThat(adapterDataLoaderActionProto.getAtPosition(), equalTo(EXPECTED_INT.get()));
-    assertThat(adapterDataLoaderActionProto.getDataToLoadMatcher(), notNullValue());
-    assertThat(
-        TypeProtoConverters.<Class<? extends AdapterViewProtocol>>byteStringToType(
-            adapterDataLoaderActionProto.getAdapterViewProtocolClass()),
-        typeCompatibleWith(AdapterViewProtocol.class));
-  }
-
-  @Test
-  public void transformationToProto_noPosition_SetsNoProtoConstant() {
-    AdapterDataLoaderActionProto adapterDataLoaderActionProto = toProto(NO_INT, EXPECTED_STRING);
-
-    assertThat(
-        adapterDataLoaderActionProto.getAtPosition(),
-        equalTo(AdapterDataLoaderActionRemoteMsg.NO_POSITION_SET));
-    assertThat(adapterDataLoaderActionProto.getDataToLoadMatcher(), notNullValue());
-  }
-
-  @Test
-  public void transformationFromProto() {
-    AdapterDataLoaderActionProto adapterDataLoaderActionProto =
-        toProto(EXPECTED_INT, EXPECTED_STRING);
-
-    AdapterDataLoaderAction adapterDataLoaderAction =
-        AdapterDataLoaderActionRemoteMsg.FROM.fromProto(adapterDataLoaderActionProto);
-
-    assertThat(adapterDataLoaderAction.atPosition.get(), notNullValue());
-    assertThat(adapterDataLoaderAction.atPosition, equalTo(EXPECTED_INT));
-    assertThat(
-        EXPECTED_STRING, (Matcher<? super String>) adapterDataLoaderAction.dataToLoadMatcher);
-    assertThat(adapterDataLoaderAction.adapterViewProtocol, instanceOf(AdapterViewProtocol.class));
-  }
-
-  @Test
-  public void transformationFromProto_noPosition_SetsOptionalAbsent() {
-    AdapterDataLoaderActionProto adapterDataLoaderActionProto = toProto(NO_INT, EXPECTED_STRING);
-
-    AdapterDataLoaderAction adapterDataLoaderAction =
-        AdapterDataLoaderActionRemoteMsg.FROM.fromProto(adapterDataLoaderActionProto);
-
-    assertThat(adapterDataLoaderAction.atPosition, equalTo(EspressoOptional.<Integer>absent()));
-  }
-}
diff --git a/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml b/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml
new file mode 100644
index 000000000..239a6ba37
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/action/AndroidManifest_key.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.espresso.action" >
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
+
+    <application/>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="androidx.test.ui.app">
+    </instrumentation>
+
+</manifest>
diff --git a/espresso/core/javatests/androidx/test/espresso/action/BUILD b/espresso/core/javatests/androidx/test/espresso/action/BUILD
new file mode 100644
index 000000000..00b0f49ad
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/action/BUILD
@@ -0,0 +1,409 @@
+# Description:
+#   Tests for espresso actions
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:axt_android_application_test.bzl",
+    "axt_android_application_test",
+)
+load("//build_extensions:phone_devices.bzl", "apis", "devices")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "AdapterDataIntegrationTest",
+    srcs = ["AdapterDataIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ClickActionIntegrationTest",
+    srcs = ["ClickActionIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ClickOnScaledViewIntegrationTest",
+    srcs = ["ClickOnScaledViewIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "EditorActionIntegrationTest",
+    srcs = ["EditorActionIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "EspressoActionsWithTestFlowTest",
+    srcs = ["EspressoActionsWithTestFlowTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/internal/data",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/storage/java/androidx/test/services/storage",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "EspressoKeyBuilderTest",
+    srcs = ["EspressoKeyBuilderTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "EventActionIntegrationTest",
+    srcs = ["EventActionIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "GeneralLocationTest",
+    srcs = ["GeneralLocationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+# this test has a hardcode reliance on testapp's MainActivity being in a separate testapp package
+axt_android_application_test(
+    name = "KeyEventActionIntegrationTest",
+    srcs = ["KeyEventActionIntegrationTest.java"],
+    instruments = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
+    manifest = "AndroidManifest_key.xml",
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "MotionEventsUnitTest",
+    srcs = ["MotionEventsUnitTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "OpenLinkActionTest",
+    srcs = ["OpenLinkActionTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "PaddingActivityTest",
+    srcs = ["PaddingActivityTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "RepeatActionUntilViewStateIntegrationTest",
+    srcs = ["RepeatActionUntilViewStateIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ReplaceTextActionIntegrationTest",
+    srcs = ["ReplaceTextActionIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ScrollToActionIntegrationTest",
+    srcs = ["ScrollToActionIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "SwipeActionIntegrationTest",
+    srcs = ["SwipeActionIntegrationTest.java"],
+    # flaky on APIs < 30
+    device_list = devices(apis(min_api = 30)),
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "TypeTextActionIntegrationTest",
+    srcs = ["TypeTextActionIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "TypeTextActionTest",
+    srcs = ["TypeTextActionTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "WindowOrderingIntegrationTest",
+    srcs = ["WindowOrderingIntegrationTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "CaptureToBitmapActionTest",
+    srcs =
+        ["CaptureToBitmapActionTest.kt"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:espresso_compiletime",
+        "//ext/junit",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/action/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/action/BUILD.bazel
deleted file mode 100644
index bd8d96410..000000000
--- a/espresso/core/javatests/androidx/test/espresso/action/BUILD.bazel
+++ /dev/null
@@ -1,56 +0,0 @@
-# Description:
-#   Tests for espresso actions
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["*.java"],
-        exclude = [
-            # exclude flaky b/63597999
-            "SwipeActionIntegrationTest.java",
-        ],
-    ),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//:androidx_annotation",
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/action:remote_view_actions",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/internal/data",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/proto/action:ui_interaction_view_actions_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/intents/java/androidx/test/espresso/intent:intents",
-        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//services/storage/java/androidx/test/services/storage",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:javax_inject_javax_inject",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/action/CaptureToBitmapActionTest.kt b/espresso/core/javatests/androidx/test/espresso/action/CaptureToBitmapActionTest.kt
new file mode 100644
index 000000000..41c3b20e6
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/action/CaptureToBitmapActionTest.kt
@@ -0,0 +1,26 @@
+package androidx.test.espresso.action
+
+import androidx.test.core.graphics.writeToTestStorage
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.captureToBitmap
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.ui.app.MainActivity
+import java.io.IOException
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/** A simple scuba test to ensure captureToImage works from hjava */
+@RunWith(AndroidJUnit4::class)
+class CaptureToBitmapActionTest {
+  @JvmField @Rule var activityScenarioRule = ActivityScenarioRule(MainActivity::class.java)
+
+  @Test
+  @Throws(IOException::class)
+  fun captureToBitmapAndSave() {
+    onView(ViewMatchers.isRoot())
+      .perform(captureToBitmap { bitmap -> bitmap.writeToTestStorage("captureToBitmapAndSave") })
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/action/ClickActionIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/ClickActionIntegrationTest.java
index b4feb8733..e8483f4d3 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/ClickActionIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/ClickActionIntegrationTest.java
@@ -22,14 +22,12 @@
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.junit.Assert.assertTrue;
 
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.ui.app.LargeViewActivity;
 import androidx.test.ui.app.R;
 import org.junit.Rule;
@@ -52,8 +50,6 @@ public void clickActionTesting() {
     onView(withId(R.id.large_view)).check(matches(withText("Ouch!!!")));
   }
 
-  // Right-click support does not exist pre API_14
-  @SdkSuppress(minSdkVersion = 14)
   @Test
   public void rightClickTest() {
     onView(withId(R.id.large_view))
@@ -62,17 +58,4 @@ public void rightClickTest() {
     onView(withText(R.string.context_item_2_text)).check(matches(isDisplayed()));
     onView(withText(R.string.context_item_3_text)).check(matches(isDisplayed()));
   }
-
-  @Test
-  @SdkSuppress(maxSdkVersion = 13)
-  public void rightClickTest_unsupportedApiLevel() {
-    boolean exceptionThrown = false;
-    try {
-      onView(withId(R.id.large_view)).perform(click(0, 0));
-    } catch (UnsupportedOperationException e) {
-      exceptionThrown = true;
-    } finally {
-      assertTrue(exceptionThrown);
-    }
-  }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/action/ClickOnScaledViewIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/ClickOnScaledViewIntegrationTest.java
index addf25360..fbbeeb0e1 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/ClickOnScaledViewIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/ClickOnScaledViewIntegrationTest.java
@@ -23,7 +23,6 @@
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.ScaledViewActivity;
 import org.junit.Rule;
@@ -39,21 +38,13 @@ public class ClickOnScaledViewIntegrationTest {
       new ActivityScenarioRule<>(ScaledViewActivity.class);
 
   @Test
-  @SdkSuppress(minSdkVersion = 12)
   public void clickUnscaledView() {
     onView(withId(R.id.scaled_view)).perform(click());
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 12)
   public void clickToScaleAndClickAgain() {
     onView(withId(R.id.scaled_view)).perform(click());
     onView(withId(R.id.scaled_view)).perform(click());
   }
-
-  // placeholder test to avoid the 'no tests found' error on api 10
-  // TODO: yuck, find a better solution
-  @Test
-  @SdkSuppress(maxSdkVersion = 10)
-  public void emptyTest() {}
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/action/EditorActionIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/EditorActionIntegrationTest.java
index f37e2a7ab..090137914 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/EditorActionIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/EditorActionIntegrationTest.java
@@ -33,10 +33,10 @@
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.Suppress;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.SendActivity;
 import org.hamcrest.CustomTypeSafeMatcher;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -68,7 +68,7 @@ public void pressImeActionButtonOnSearchBox() {
    * Test only passes if run in isolation. Unless Gradle supports a single instrumentation per test
    * this test is ignored"
    */
-  @Suppress
+  @Ignore
   @Test
   public void pressImeActionButtonOnNonEditorWidget() {
     expectedException.expect(PerformException.class);
diff --git a/espresso/core/javatests/androidx/test/espresso/action/EspressoActionsWithTestFlowTest.java b/espresso/core/javatests/androidx/test/espresso/action/EspressoActionsWithTestFlowTest.java
index d6557a525..e3b19b91a 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/EspressoActionsWithTestFlowTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/EspressoActionsWithTestFlowTest.java
@@ -30,7 +30,6 @@
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.platform.io.PlatformTestStorageRegistry;
-import androidx.test.services.storage.TestStorage;
 import androidx.test.services.storage.internal.TestStorageUtil;
 import androidx.test.ui.app.LargeViewActivity;
 import androidx.test.ui.app.R;
@@ -88,7 +87,7 @@ public void clickActionTestingOfTestFlowOutput() throws IOException {
       assertThat(testFlowVisualizer.getLastActionIndexAndIncrement()).isEqualTo(2);
       InputStream outputGalleryFile =
           TestStorageUtil.getInputStream(
-              TestStorage.getOutputFileUri("output_gallery.html"),
+              PlatformTestStorageRegistry.getInstance().getOutputFileUri("output_gallery.html"),
               InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver());
       int size = outputGalleryFile.available();
       byte[] directFileContents = new byte[size];
@@ -130,7 +129,7 @@ public void testFlowVisualizerIfFeatureIsOffShowBreakage() {
           FileNotFoundException.class,
           () ->
               TestStorageUtil.getInputStream(
-                  TestStorage.getOutputFileUri("output_gallery.html"),
+                  PlatformTestStorageRegistry.getInstance().getOutputFileUri("output_gallery.html"),
                   InstrumentationRegistry.getInstrumentation()
                       .getTargetContext()
                       .getContentResolver()));
diff --git a/espresso/core/javatests/androidx/test/espresso/action/EspressoKeyBuilderTest.java b/espresso/core/javatests/androidx/test/espresso/action/EspressoKeyBuilderTest.java
index 5524c7f9d..21f90300f 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/EspressoKeyBuilderTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/EspressoKeyBuilderTest.java
@@ -18,7 +18,6 @@
 
 import static org.junit.Assert.assertEquals;
 
-import android.os.Build;
 import android.view.KeyEvent;
 import androidx.test.espresso.action.EspressoKey.Builder;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -51,12 +50,7 @@ public void buildWithShiftPressed() {
   public void buildWithCtrlPressed() {
     EspressoKey key = new Builder().withKeyCode(KEY_CODE).withCtrlPressed(true).build();
     assertEquals(KEY_CODE, key.getKeyCode());
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-      assertEquals(KeyEvent.META_CTRL_ON, key.getMetaState());
-    } else {
-      assertEquals(0, key.getMetaState());
-    }
+    assertEquals(KeyEvent.META_CTRL_ON, key.getMetaState());
   }
 
   @Test
@@ -77,12 +71,7 @@ public void buildWithAllMetaKeysPressed() {
             .build();
 
     assertEquals(KEY_CODE, key.getKeyCode());
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-      assertEquals(
-          KeyEvent.META_SHIFT_ON | KeyEvent.META_CTRL_ON | KeyEvent.META_ALT_ON,
-          key.getMetaState());
-    } else {
-      assertEquals(KeyEvent.META_SHIFT_ON | KeyEvent.META_ALT_ON, key.getMetaState());
-    }
+    assertEquals(
+        KeyEvent.META_SHIFT_ON | KeyEvent.META_CTRL_ON | KeyEvent.META_ALT_ON, key.getMetaState());
   }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/action/EventActionIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/EventActionIntegrationTest.java
index 8f92708f0..55a7b70c0 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/EventActionIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/EventActionIntegrationTest.java
@@ -103,7 +103,6 @@ public void perform(UiController uiController, View view) {
         .check(matches(isDisplayed()));
   }
 
-  @SdkSuppress(minSdkVersion = 15)
   @Test
   public void longClickTesting() {
     onView(withText(is(activity.getString(R.string.text_long_click))))
@@ -114,7 +113,6 @@ public void longClickTesting() {
         .check(matches(isDisplayed()));
   }
 
-  @SdkSuppress(minSdkVersion = 15)
   @Test
   public void doubleClickTesting() {
     onView(withText(is(activity.getString(R.string.text_double_click))))
diff --git a/espresso/core/javatests/androidx/test/espresso/action/KeyEventActionIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/KeyEventActionIntegrationTest.java
index 6bcc96790..3f1b92397 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/KeyEventActionIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/KeyEventActionIntegrationTest.java
@@ -43,11 +43,10 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
-import androidx.test.filters.Suppress;
 import androidx.test.ui.app.MainActivity;
 import androidx.test.ui.app.R;
 import java.util.Map;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -64,7 +63,7 @@ public class KeyEventActionIntegrationTest {
    * Test only passes if run in isolation. Unless Gradle supports a single instrumentation per test
    * this test is ignored"
    */
-  @Suppress
+  @Ignore
   @Test
   public void clickBackOnRootAction() {
     ActivityScenario.launch(MainActivity.class);
@@ -95,7 +94,6 @@ public void clickBackOnNonRootActionNoLatte() {
   }
 
   @SuppressWarnings("unchecked")
-  @SdkSuppress(minSdkVersion = 10)
   @FlakyTest
   public void clickOnBackFromFragment() {
     Intent fragmentStack =
diff --git a/espresso/core/javatests/androidx/test/espresso/action/MotionEventsUnitTest.java b/espresso/core/javatests/androidx/test/espresso/action/MotionEventsUnitTest.java
new file mode 100644
index 000000000..3561f37a9
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/action/MotionEventsUnitTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.action;
+
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_UP;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.os.Build;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class MotionEventsUnitTest {
+  private static final float[] PRECISION = new float[] {1f, 2f};
+  private static final float[] COORDINATES = new float[] {10f, 20f};
+  private static final float[] COORDINATES_1 = new float[] {30f, 40f};
+  private static final int BUTTON_STATE = 12;
+
+  private static final int DEFAULT_BUTTON_STATE = MotionEvent.BUTTON_PRIMARY;
+  /**
+   * This is the default source for events generated by Espresso. The Android platform's default
+   * source for events obtained through {@link MotionEvent#obtain} may be different.
+   */
+  private static final int DEFAULT_SOURCE = InputDevice.SOURCE_UNKNOWN;
+
+  private static final int DEFAULT_TOOL_TYPE = MotionEvent.TOOL_TYPE_UNKNOWN;
+
+  private static void verifyEvent(
+      MotionEvent event,
+      int action,
+      long downTime,
+      float[] coords,
+      float[] precision,
+      int source,
+      int buttonState,
+      int toolType) {
+    assertWithMessage("not null").that(event).isNotNull();
+    assertWithMessage("action").that(event.getAction()).isEqualTo(action);
+    assertWithMessage("down time").that(event.getDownTime()).isEqualTo(downTime);
+    assertWithMessage("X").that(event.getX()).isEqualTo(coords[0]);
+    assertWithMessage("Y").that(event.getY()).isEqualTo(coords[1]);
+    assertWithMessage("X precision").that(event.getXPrecision()).isEqualTo(precision[0]);
+    assertWithMessage("Y precision").that(event.getYPrecision()).isEqualTo(precision[1]);
+    assertWithMessage("source").that(event.getSource()).isEqualTo(source);
+    assertWithMessage("button state").that(event.getButtonState()).isEqualTo(buttonState);
+    assertWithMessage("tool type").that(event.getToolType(0)).isEqualTo(toolType);
+  }
+
+  @Test
+  public void testObtainDown() {
+    final MotionEvent event = MotionEvents.obtainDownEvent(COORDINATES, PRECISION);
+    verifyEvent(
+        event,
+        ACTION_DOWN,
+        event.getEventTime(),
+        COORDINATES,
+        PRECISION,
+        DEFAULT_SOURCE,
+        DEFAULT_BUTTON_STATE,
+        DEFAULT_TOOL_TYPE);
+  }
+
+  @Test
+  public void testObtainDownWithCustomSource() {
+    final MotionEvent event =
+        MotionEvents.obtainDownEvent(
+            COORDINATES, PRECISION, InputDevice.SOURCE_MOUSE, BUTTON_STATE);
+    verifyEvent(
+        event,
+        ACTION_DOWN,
+        event.getEventTime(),
+        COORDINATES,
+        PRECISION,
+        InputDevice.SOURCE_MOUSE,
+        BUTTON_STATE,
+        MotionEvent.TOOL_TYPE_MOUSE);
+  }
+
+  @Test
+  public void testObtainMovement() {
+    final MotionEvent down =
+        MotionEvents.obtainDownEvent(
+            COORDINATES, PRECISION, InputDevice.SOURCE_MOUSE, BUTTON_STATE);
+    final MotionEvent move = MotionEvents.obtainMovement(down, COORDINATES_1);
+    verifyEvent(
+        move,
+        ACTION_MOVE,
+        down.getEventTime(),
+        COORDINATES_1,
+        PRECISION,
+        InputDevice.SOURCE_MOUSE,
+        BUTTON_STATE,
+        MotionEvent.TOOL_TYPE_MOUSE);
+  }
+
+  @Test
+  public void testObtainUp() {
+    final MotionEvent down =
+        MotionEvents.obtainDownEvent(
+            COORDINATES, PRECISION, InputDevice.SOURCE_MOUSE, BUTTON_STATE);
+    final MotionEvent up = MotionEvents.obtainUpEvent(down, COORDINATES_1);
+    verifyEvent(
+        up,
+        ACTION_UP,
+        down.getEventTime(),
+        COORDINATES_1,
+        PRECISION,
+        InputDevice.SOURCE_MOUSE,
+        BUTTON_STATE,
+        MotionEvent.TOOL_TYPE_MOUSE);
+  }
+
+  /** Regression test for #1458 */
+  @Test
+  public void testObtainUp_toolTypeFromDownEvent() {
+    final MotionEvent down =
+        MotionEvents.obtainDownEvent(
+            COORDINATES, PRECISION, InputDevice.SOURCE_TOUCHSCREEN, BUTTON_STATE);
+    // toolType here will be TOOL_TYPE_FINGER, but lets reset source
+    down.setSource(InputDevice.SOURCE_UNKNOWN);
+    final MotionEvent up = MotionEvents.obtainUpEvent(down, COORDINATES_1);
+    verifyEvent(
+        up,
+        ACTION_UP,
+        down.getEventTime(),
+        COORDINATES_1,
+        PRECISION,
+        InputDevice.SOURCE_UNKNOWN,
+        BUTTON_STATE,
+        MotionEvent.TOOL_TYPE_FINGER);
+  }
+
+  /** Regression test for #1840 */
+  @Test
+  @SuppressWarnings("deprecation") // Intentionally testing a deprecated but supported method.
+  public void testObtainMovement_deprecated() {
+    final MotionEvent move = MotionEvents.obtainMovement(100L, 100L, COORDINATES);
+    var expectedSource =
+        (Build.VERSION.SDK_INT < Build.VERSION_CODES.S_V2)
+            ? InputDevice.SOURCE_CLASS_NONE
+            : InputDevice.SOURCE_CLASS_POINTER;
+    verifyEvent(
+        move,
+        ACTION_MOVE,
+        100L, // Arbitrary value we set when calling obtainMovement.
+        COORDINATES,
+        new float[] {
+          1f, 1f
+        }, // Since we are evaluating obtainMovement we have the default precision.
+        expectedSource, // obtainMovement defaults to this.
+        MotionEvent.CLASSIFICATION_NONE, // The buttonState defaults to this.
+        MotionEvent.CLASSIFICATION_NONE); // The toolType defaults to this.
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/action/OpenLinkActionTest.java b/espresso/core/javatests/androidx/test/espresso/action/OpenLinkActionTest.java
index 936ff207d..edf281337 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/OpenLinkActionTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/OpenLinkActionTest.java
@@ -95,5 +95,4 @@ protected boolean matchesSafely(Throwable throwable) {
         });
     onView(withId(R.id.spanned)).perform(scrollTo(), openLinkWithText("bacon"));
   }
-
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/action/SwipeActionIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/SwipeActionIntegrationTest.java
index 25c34a89f..201134809 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/SwipeActionIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/SwipeActionIntegrationTest.java
@@ -29,9 +29,8 @@
 import static org.hamcrest.Matchers.allOf;
 
 import androidx.test.espresso.ViewAction;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.SwipeActivity;
 import org.junit.Rule;
@@ -39,10 +38,10 @@
 import org.junit.runner.RunWith;
 
 /** Integration tests for swiping actions. */
-@LargeTest
 @RunWith(AndroidJUnit4.class)
 public class SwipeActionIntegrationTest {
-  @Rule public ActivityTestRule<SwipeActivity> rule = new ActivityTestRule<>(SwipeActivity.class);
+  @Rule
+  public ActivityScenarioRule<SwipeActivity> rule = new ActivityScenarioRule<>(SwipeActivity.class);
 
   /** Tests that a small view can be swiped in both directions. */
   @Test
diff --git a/espresso/core/javatests/androidx/test/espresso/action/TypeTextActionTest.java b/espresso/core/javatests/androidx/test/espresso/action/TypeTextActionTest.java
index cf1862c6e..d109edb45 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/TypeTextActionTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/TypeTextActionTest.java
@@ -23,9 +23,9 @@
 import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import androidx.annotation.NonNull;
 import android.view.MotionEvent;
 import android.view.View;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.InjectEventSecurityException;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
diff --git a/espresso/core/javatests/androidx/test/espresso/action/WindowOrderingIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/action/WindowOrderingIntegrationTest.java
index ce4dfc347..9546b9ec6 100644
--- a/espresso/core/javatests/androidx/test/espresso/action/WindowOrderingIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/action/WindowOrderingIntegrationTest.java
@@ -28,7 +28,6 @@
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.SendActivity;
 import org.junit.Rule;
@@ -42,8 +41,6 @@ public class WindowOrderingIntegrationTest {
   @Rule
   public ActivityScenarioRule<SendActivity> rule = new ActivityScenarioRule<>(SendActivity.class);
 
-  // popup menus are post honeycomb.
-  @SdkSuppress(minSdkVersion = 11)
   @Test
   public void popupMenuTesting() {
     onView(withText(R.string.item_1_text)).check(doesNotExist());
diff --git a/espresso/core/javatests/androidx/test/espresso/assertion/BUILD b/espresso/core/javatests/androidx/test/espresso/assertion/BUILD
new file mode 100644
index 000000000..5183439ff
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/assertion/BUILD
@@ -0,0 +1,78 @@
+# Description:
+#   Tests for espresso assertions
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "LayoutAssertionsTest",
+    srcs = ["LayoutAssertionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "PositionAssertionsTest",
+    srcs = ["PositionAssertionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "PositionAssertionsUnitTest",
+    srcs = ["PositionAssertionsUnitTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ViewAssertionsTest",
+    srcs = ["ViewAssertionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/assertion/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/assertion/BUILD.bazel
deleted file mode 100644
index a3930724c..000000000
--- a/espresso/core/javatests/androidx/test/espresso/assertion/BUILD.bazel
+++ /dev/null
@@ -1,44 +0,0 @@
-# Description:
-#   Tests for espresso assertions
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["*.java"]),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/assertion:remote_view_assertions",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_view_matchers",
-        "//espresso/core/java/androidx/test/espresso/proto/assertion:ui_interaction_view_assertions_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:javax_inject_javax_inject",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/base/AndroidManifest.xml b/espresso/core/javatests/androidx/test/espresso/base/AndroidManifest.xml
deleted file mode 100644
index 8bac9ac0a..000000000
--- a/espresso/core/javatests/androidx/test/espresso/base/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.espresso.base.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-
-    </application>
-
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.ui.app" />
-
-</manifest>
diff --git a/espresso/core/javatests/androidx/test/espresso/base/AsyncTaskPoolMonitorTest.java b/espresso/core/javatests/androidx/test/espresso/base/AsyncTaskPoolMonitorTest.java
index 052f698b7..6efccd7aa 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/AsyncTaskPoolMonitorTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/AsyncTaskPoolMonitorTest.java
@@ -21,7 +21,6 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.Suppress;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
@@ -31,6 +30,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.After;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -97,7 +97,7 @@ public void run() {
   }
 
   // TODO(b/68003948): flaky
-  @Suppress
+  @Ignore
   @Test
   public void idleNotificationAndRestart() throws Exception {
 
@@ -153,7 +153,7 @@ public void run() {
   }
 
   // TODO(b/68003948): flaky
-  @Suppress
+  @Ignore
   @Test
   public void idleNotification_extraWork() throws Exception {
     final CountDownLatch firstRunLatch = new CountDownLatch(1);
diff --git a/espresso/core/javatests/androidx/test/espresso/base/BUILD b/espresso/core/javatests/androidx/test/espresso/base/BUILD
new file mode 100644
index 000000000..f43944c30
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/base/BUILD
@@ -0,0 +1,304 @@
+# Description:
+#   Tests for espresso base classes
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "util",
+    srcs = [
+        "CoordinatesUtil.java",
+        "OnDemandIdlingResource.java",
+    ],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+    ],
+)
+
+axt_android_library_test(
+    name = "AssertionErrorHandlerTest",
+    srcs =
+        ["AssertionErrorHandlerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "AsyncTaskPoolMonitorTest",
+    srcs =
+        ["AsyncTaskPoolMonitorTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "DefaultFailureHandlerTest",
+    srcs =
+        ["DefaultFailureHandlerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//services/storage",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "EspressoExceptionHandlerTest",
+    srcs =
+        ["EspressoExceptionHandlerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "EventInjectorTest",
+    srcs =
+        ["EventInjectorTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "IdlingResourceRegistryTest",
+    srcs =
+        ["IdlingResourceRegistryTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/javatests/androidx/test/espresso:utils",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//runner/rules",
+        "//services/storage",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "PerformExceptionHandlerTest",
+    srcs =
+        ["PerformExceptionHandlerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ThrowableHandlerTest",
+    srcs =
+        ["ThrowableHandlerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "UiControllerImplIntegrationTest",
+    srcs =
+        ["UiControllerImplIntegrationTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "UiControllerImplTest",
+    srcs =
+        ["UiControllerImplTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ViewFinderImplTest",
+    srcs =
+        ["ViewFinderImplTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:javax_inject_javax_inject",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ViewHierarchyExceptionHandlerTest",
+    srcs =
+        ["ViewHierarchyExceptionHandlerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/base",
+        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "EspressoIdleTest",
+    srcs = ["EspressoIdleTest.java"],
+    deps = [
+        "//espresso/core",
+        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/base/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/base/BUILD.bazel
deleted file mode 100644
index b1d1dfee4..000000000
--- a/espresso/core/javatests/androidx/test/espresso/base/BUILD.bazel
+++ /dev/null
@@ -1,66 +0,0 @@
-# Description:
-#   Tests for espresso base classes
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-UTIL_SRC = [
-    "CoordinatesUtil.java",
-    "OnDemandIdlingResource.java",
-]
-
-android_library(
-    name = "util",
-    testonly = 1,
-    srcs = UTIL_SRC,
-    deps = [
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-    ],
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["*.java"],
-        exclude = UTIL_SRC,
-    ),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        ":util",
-        "//:androidx_annotation",
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/base",
-        "//espresso/core/java/androidx/test/espresso/base:default_failure_handler",
-        "//espresso/core/java/androidx/test/espresso/base:idling_resource_registry",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//ext/junit",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:javax_inject_javax_inject",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/base/CoordinatesUtil.java b/espresso/core/javatests/androidx/test/espresso/base/CoordinatesUtil.java
index e8cee630a..dd2f3ac42 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/CoordinatesUtil.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/CoordinatesUtil.java
@@ -42,12 +42,13 @@ public void run() {
     return xyMiddle;
   }
 
-  static int[] getCoordinatesInMiddleOfSendButton(ActivityScenario activityScenario) {
+  static <A extends Activity> int[] getCoordinatesInMiddleOfSendButton(
+      ActivityScenario<A> activityScenario) {
     final int[] xyMiddle = new int[2];
     activityScenario.onActivity(
-        new ActivityAction() {
+        new ActivityAction<A>() {
           @Override
-          public void perform(Activity activity) {
+          public void perform(A activity) {
             final View sendButton = activity.findViewById(R.id.send_button);
             final int[] xy = new int[2];
             sendButton.getLocationOnScreen(xy);
diff --git a/espresso/core/javatests/androidx/test/espresso/base/DefaultFailureHandlerTest.java b/espresso/core/javatests/androidx/test/espresso/base/DefaultFailureHandlerTest.java
index 8fea3b23c..9ae8af739 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/DefaultFailureHandlerTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/DefaultFailureHandlerTest.java
@@ -16,24 +16,34 @@
 
 package androidx.test.espresso.base;
 
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
-import static com.google.common.base.Throwables.getStackTraceAsString;
+import static com.google.common.truth.Truth.assertThat;
+import static kotlin.ExceptionsKt.stackTraceToString;
 import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 import static org.junit.rules.ExpectedException.none;
 
-import androidx.annotation.NonNull;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.view.View;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.AmbiguousViewMatcherException;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
+import androidx.test.services.storage.internal.TestStorageUtil;
 import androidx.test.ui.app.MainActivity;
+import java.io.IOException;
+import java.io.InputStream;
 import junit.framework.AssertionFailedError;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.CustomTypeSafeMatcher;
@@ -93,6 +103,27 @@ public void ambiguousViewMatcherException() {
     onView(withMatchesThatReturns(true)).check(matches(isDisplayed()));
   }
 
+  @Test
+  public void screenshotSaved() throws IOException {
+    assertThrows(
+        NoMatchingViewException.class,
+        () -> onView(withMatchesThatReturns(false)).check(matches(not(isDisplayed()))));
+
+    // ensure a bitmap was written, and do some basic validity tests
+    Bitmap errorBitmap = readBitmapFromTestStorage("view-op-error-1.png");
+    assertThat(errorBitmap).isNotNull();
+    assertThat(errorBitmap.getByteCount()).isGreaterThan(100);
+  }
+
+  private Bitmap readBitmapFromTestStorage(String pathName) throws IOException {
+    Uri outputFileUri = PlatformTestStorageRegistry.getInstance().getOutputFileUri(pathName);
+    try (InputStream input =
+        TestStorageUtil.getInputStream(
+            outputFileUri, getApplicationContext().getContentResolver())) {
+      return BitmapFactory.decodeStream(input);
+    }
+  }
+
   private static Matcher<View> withMatchesThatReturns(final boolean returnValue) {
     return new BaseMatcher<View>() {
       @Override
@@ -112,7 +143,7 @@ private static CustomTypeSafeMatcher<Throwable> stackTraceContainsThisClass() {
     return new CustomTypeSafeMatcher<Throwable>("Stack Contains This Class") {
       @Override
       protected boolean matchesSafely(Throwable e) {
-        return getStackTraceAsString(e).contains(DefaultFailureHandlerTest.class.getSimpleName());
+        return stackTraceToString(e).contains(DefaultFailureHandlerTest.class.getSimpleName());
       }
     };
   }
diff --git a/espresso/core/javatests/androidx/test/espresso/base/EspressoIdleTest.java b/espresso/core/javatests/androidx/test/espresso/base/EspressoIdleTest.java
new file mode 100644
index 000000000..6c4a2ce0c
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/base/EspressoIdleTest.java
@@ -0,0 +1,116 @@
+package androidx.test.espresso.base;
+
+import static android.os.Looper.getMainLooper;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assume.assumeTrue;
+
+import android.os.Build.VERSION;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.TestLooperManager;
+import androidx.test.espresso.Espresso;
+import androidx.test.espresso.IdlingRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** A simple integration test for Espresso's main looper integration. */
+@RunWith(AndroidJUnit4.class)
+public class EspressoIdleTest {
+
+  @Test
+  public void onIdle_whenIdle() {
+    Espresso.onIdle();
+  }
+
+  @Test
+  public void onIdle_afterPost() {
+    AtomicBoolean wasRun = new AtomicBoolean(false);
+    new Handler(getMainLooper()).post(() -> wasRun.set(true));
+    Espresso.onIdle();
+    assertThat(wasRun.get()).isTrue();
+  }
+
+  @Test
+  public void onIdle_afterPostShortDelay() {
+    AtomicBoolean wasRun = new AtomicBoolean(false);
+    new Handler(getMainLooper())
+        .postDelayed(() -> wasRun.set(true), Interrogator.LOOKAHEAD_MILLIS - 1);
+    Espresso.onIdle();
+    assertThat(wasRun.get()).isTrue();
+  }
+
+  @Test
+  public void onIdle_afterPostLongDelay() {
+    AtomicBoolean wasRun = new AtomicBoolean(false);
+    new Handler(getMainLooper()).postDelayed(() -> wasRun.set(true), 10000);
+    Espresso.onIdle();
+    assertThat(wasRun.get()).isFalse();
+  }
+
+  @Test
+  public void onIdle_afterPost_backgroundLooper() {
+    HandlerThread ht = new HandlerThread("onIdle_afterPost_backgroundLooper");
+    ht.start();
+    Looper looper = ht.getLooper();
+
+    try {
+      IdlingRegistry.getInstance().registerLooperAsIdlingResource(looper);
+      AtomicBoolean wasRun = new AtomicBoolean(false);
+      new Handler(looper).post(() -> wasRun.set(true));
+      Espresso.onIdle();
+      assertThat(wasRun.get()).isTrue();
+    } finally {
+      IdlingRegistry.getInstance().unregisterLooperAsIdlingResource(looper);
+      ht.quit();
+    }
+  }
+
+  /** Verify TestLooperManager can be used after Espresso idle is run. */
+  @Test
+  public void onIdle_with_TestLooperManager() {
+    assumeTrue(VERSION.SDK_INT >= 36);
+
+    Espresso.onIdle();
+
+    TestLooperManager manager = getInstrumentation().acquireLooperManager(getMainLooper());
+    assertThat(manager).isNotNull();
+    manager.release();
+
+    Espresso.onIdle();
+  }
+
+  @Test
+  public void onIdle_backgroundLooper_with_TestLooperManager() throws InterruptedException {
+    assumeTrue(VERSION.SDK_INT >= 36);
+
+    HandlerThread ht = new HandlerThread("onIdle_backgroundLooper_with_TestLooperManager");
+    ht.start();
+    Looper looper = ht.getLooper();
+
+    IdlingRegistry.getInstance().registerLooperAsIdlingResource(looper);
+    Espresso.onIdle();
+    AtomicBoolean wasRun = new AtomicBoolean(false);
+    new Handler(looper).post(() -> wasRun.set(true));
+    Espresso.onIdle();
+    assertThat(wasRun.get()).isTrue();
+
+    IdlingRegistry.getInstance().unregisterLooperAsIdlingResource(looper);
+    Espresso.onIdle();
+
+    // The Looper IdlingResource releases its TestLooperManager asynchronously on
+    // the Looper thread. Post and wait for the Looper thread to clear
+    CountDownLatch latch = new CountDownLatch(1);
+    new Handler(looper).post(() -> latch.countDown());
+    latch.await();
+
+    TestLooperManager manager = getInstrumentation().acquireLooperManager(looper);
+    assertThat(manager).isNotNull();
+    manager.release();
+    ht.quit();
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/base/EventInjectorTest.java b/espresso/core/javatests/androidx/test/espresso/base/EventInjectorTest.java
index 9df48c8b4..86793a386 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/EventInjectorTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/EventInjectorTest.java
@@ -17,15 +17,12 @@
 package androidx.test.espresso.base;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
-import static org.junit.rules.ExpectedException.none;
 
-import android.app.Activity;
 import android.os.Build;
 import android.os.SystemClock;
-import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -34,172 +31,98 @@
 import androidx.test.espresso.InjectEventSecurityException;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.runner.lifecycle.ActivityLifecycleCallback;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.test.runner.lifecycle.Stage;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.SendActivity;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 
 /** Tests for {@link EventInjector}. */
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class EventInjectorTest {
-
-  @Rule public ExpectedException expectedException = none();
-
-  private static final String TAG = EventInjectorTest.class.getSimpleName();
   private EventInjector injector;
-  final AtomicBoolean injectEventWorked = new AtomicBoolean(false);
-  final AtomicBoolean injectEventThrewSecurityException = new AtomicBoolean(false);
-  final CountDownLatch latch = new CountDownLatch(1);
 
   @Before
   public void setUp() throws Exception {
-    if (Build.VERSION.SDK_INT > 15) {
-      InputManagerEventInjectionStrategy strat = new InputManagerEventInjectionStrategy();
-      strat.initialize();
-      injector = new EventInjector(strat);
-    } else {
-      WindowManagerEventInjectionStrategy strat = new WindowManagerEventInjectionStrategy();
-      strat.initialize();
-      injector = new EventInjector(strat);
-    }
+    injector = new EventInjector(new InputManagerEventInjectionStrategy());
   }
 
   @Test
   public void injectKeyEventUpWithNoDown() throws Exception {
-    ActivityScenario<SendActivity> scenario = ActivityScenario.launch(SendActivity.class);
+    try (ActivityScenario<SendActivity> scenario = ActivityScenario.launch(SendActivity.class)) {
 
-    scenario.onActivity(
-        sendActivity -> {
-          View view = sendActivity.findViewById(R.id.send_data_edit_text);
-          assertTrue(view.requestFocus());
-          latch.countDown();
-        });
+      scenario.onActivity(
+          sendActivity -> {
+            View view = sendActivity.findViewById(R.id.send_data_edit_text);
+            assertThat(view.requestFocus()).isTrue();
+          });
 
-    assertTrue("Timed out!", latch.await(10, TimeUnit.SECONDS));
-    KeyCharacterMap keyCharacterMap = UiControllerImpl.getKeyCharacterMap();
-    KeyEvent[] events = keyCharacterMap.getEvents("a".toCharArray());
-    assertTrue(injector.injectKeyEvent(events[1]));
+      KeyCharacterMap keyCharacterMap = UiControllerImpl.getKeyCharacterMap();
+      KeyEvent[] events = keyCharacterMap.getEvents("a".toCharArray());
+      assertThat(injector.injectKeyEvent(events[1])).isTrue();
+    }
   }
 
   @Test
   public void injectStaleKeyEvent() throws Exception {
-    ActivityScenario<SendActivity> scenario = ActivityScenario.launch(SendActivity.class);
+    try (ActivityScenario<SendActivity> scenario = ActivityScenario.launch(SendActivity.class)) {
 
-    scenario.onActivity(
-        sendActivity -> {
-          View view = sendActivity.findViewById(R.id.send_data_edit_text);
-          assertTrue(view.requestFocus());
-          latch.countDown();
-        });
+      scenario.onActivity(
+          sendActivity -> {
+            View view = sendActivity.findViewById(R.id.send_data_edit_text);
+            assertThat(view.requestFocus()).isTrue();
+          });
 
-    assertTrue("Timed out!", latch.await(10, TimeUnit.SECONDS));
-    assertFalse("SecurityException exception was thrown.", injectEventThrewSecurityException.get());
+      KeyCharacterMap keyCharacterMap = UiControllerImpl.getKeyCharacterMap();
+      KeyEvent[] events = keyCharacterMap.getEvents("a".toCharArray());
+      KeyEvent event = KeyEvent.changeTimeRepeat(events[0], 1, 0);
 
-    KeyCharacterMap keyCharacterMap = UiControllerImpl.getKeyCharacterMap();
-    KeyEvent[] events = keyCharacterMap.getEvents("a".toCharArray());
-    KeyEvent event = KeyEvent.changeTimeRepeat(events[0], 1, 0);
-
-    // Stale event does not fail for API < 13.
-    if (Build.VERSION.SDK_INT < 13) {
-      assertTrue(injector.injectKeyEvent(event));
-    } else {
-      assertFalse(injector.injectKeyEvent(event));
+      assertThat(injector.injectKeyEvent(event)).isFalse();
     }
   }
 
   @Test
-  public void injectKeyEvent_securityException() throws InjectEventSecurityException {
+  public void injectKeyEvent_securityException() throws Exception {
     KeyCharacterMap keyCharacterMap = UiControllerImpl.getKeyCharacterMap();
     KeyEvent[] events = keyCharacterMap.getEvents("a".toCharArray());
-    expectedException.expect(InjectEventSecurityException.class);
-    injector.injectKeyEvent(events[0]);
-  }
-
-  @Test
-  public void injectMotionEvent_securityException() throws Exception {
-    getInstrumentation()
-        .runOnMainSync(
-            new Runnable() {
-              @Override
-              public void run() {
-                MotionEvent down =
-                    MotionEvent.obtain(
-                        SystemClock.uptimeMillis(),
-                        SystemClock.uptimeMillis(),
-                        MotionEvent.ACTION_DOWN,
-                        0,
-                        0,
-                        0);
-                try {
-                  injector.injectMotionEvent(down);
-                  fail("InjectEventSecurityException not thrown");
-                } catch (InjectEventSecurityException expected) {
-                  injectEventThrewSecurityException.set(true);
-                }
-                latch.countDown();
-              }
-            });
 
-    latch.await(10, TimeUnit.SECONDS);
-    assertTrue(injectEventThrewSecurityException.get());
+    if (Build.VERSION.SDK_INT <= 32) {
+      assertThrows(InjectEventSecurityException.class, () -> injector.injectKeyEvent(events[0]));
+    } else {
+      assertThat(injector.injectKeyEvent(events[0])).isTrue();
+    }
   }
 
   @Test
-  public void injectMotionEvent_upEventFailure() throws InterruptedException {
-    final CountDownLatch activityStarted = new CountDownLatch(1);
-    ActivityLifecycleCallback callback =
-        new ActivityLifecycleCallback() {
-          @Override
-          public void onActivityLifecycleChanged(Activity activity, Stage stage) {
-            if (Stage.RESUMED == stage && activity instanceof SendActivity) {
-              activityStarted.countDown();
-            }
-          }
-        };
-    ActivityLifecycleMonitorRegistry.getInstance().addLifecycleCallback(callback);
-    try {
-      ActivityScenario activityScenario = ActivityScenario.launch(SendActivity.class);
-      assertTrue(activityStarted.await(20, TimeUnit.SECONDS));
-      final int[] xy = CoordinatesUtil.getCoordinatesInMiddleOfSendButton(activityScenario);
-
+  public void injectMotionEvent_securityException() throws Exception {
+    final MotionEvent down =
+        MotionEvent.obtain(
+            SystemClock.uptimeMillis(),
+            SystemClock.uptimeMillis(),
+            MotionEvent.ACTION_DOWN,
+            0,
+            0,
+            0);
+    // On API <= 32: injectMotionEvent throws an InjectEventSecurityException.
+    // On API >= 33: injectMotionEvent works for instrumentation and injects the event.
+    if (Build.VERSION.SDK_INT <= 32) {
       getInstrumentation()
           .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  MotionEvent up =
-                      MotionEvent.obtain(
-                          SystemClock.uptimeMillis(),
-                          SystemClock.uptimeMillis(),
-                          MotionEvent.ACTION_UP,
-                          xy[0],
-                          xy[1],
-                          0);
-
-                  try {
-                    injectEventWorked.set(injector.injectMotionEvent(up));
-                  } catch (InjectEventSecurityException e) {
-                    Log.e(TAG, "injectEvent threw a SecurityException");
-                  }
-                  up.recycle();
-                  latch.countDown();
+              () -> {
+                assertThrows(
+                    InjectEventSecurityException.class, () -> injector.injectMotionEvent(down));
+              });
+    } else {
+      getInstrumentation()
+          .runOnMainSync(
+              () -> {
+                try {
+                  assertThat(injector.injectMotionEvent(down)).isTrue();
+                } catch (InjectEventSecurityException e) {
+                  fail("InjectEventSecurityException unexpectedly thrown");
                 }
               });
-
-      latch.await(10, TimeUnit.SECONDS);
-      assertFalse(injectEventWorked.get());
-    } finally {
-      ActivityLifecycleMonitorRegistry.getInstance().removeLifecycleCallback(callback);
     }
   }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/base/IdlingResourceRegistryTest.java b/espresso/core/javatests/androidx/test/espresso/base/IdlingResourceRegistryTest.java
index 4863ccefa..de6808506 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/IdlingResourceRegistryTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/IdlingResourceRegistryTest.java
@@ -16,6 +16,10 @@
 
 package androidx.test.espresso.base;
 
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.Collections.emptySet;
+import static java.util.Collections.singleton;
+import static java.util.Collections.singletonList;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -24,12 +28,14 @@
 import android.os.HandlerThread;
 import android.os.Looper;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.IdlingResource;
+import androidx.test.espresso.TestTracer;
 import androidx.test.espresso.base.IdlingResourceRegistry.IdleNotificationCallback;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
+import androidx.test.platform.tracing.Tracing;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
@@ -37,6 +43,7 @@
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,12 +55,28 @@ public class IdlingResourceRegistryTest {
 
   private IdlingResourceRegistry registry;
   private Handler handler;
+  private TestTracer tracer;
 
   @Before
   public void setUp() throws Exception {
     Looper looper = Looper.getMainLooper();
     handler = new Handler(looper);
-    registry = new IdlingResourceRegistry(looper);
+    registry = new IdlingResourceRegistry(looper, Tracing.getInstance());
+    tracer =
+        new TestTracer() {
+          @NonNull
+          @Override
+          public String rewriteSpanName(@NonNull String spanName) {
+            // Remove thread ids from span names as they vary between tests.
+            return spanName.replaceAll("-[0-9]+-", "-ThreadId-");
+          }
+        };
+    Tracing.getInstance().registerTracer(tracer);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    Tracing.getInstance().unregisterTracer(tracer);
   }
 
   @Test
@@ -62,8 +85,8 @@ public void verifyRegisterUnRegister() throws Exception {
     r1.forceIdleNow();
     OnDemandIdlingResource r2 = new OnDemandIdlingResource("r2");
     r2.forceIdleNow();
-    registry.registerResources(Lists.newArrayList(r1));
-    registry.registerResources(Lists.newArrayList(r2));
+    registry.registerResources(singletonList(r1));
+    registry.registerResources(singletonList(r2));
     FutureTask<Boolean> resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
 
@@ -74,7 +97,7 @@ public void verifyRegisterUnRegister() throws Exception {
     handler.post(resourcesIdle);
     assertFalse(resourcesIdle.get());
 
-    registry.unregisterResources(Lists.newArrayList(r1));
+    registry.unregisterResources(singletonList(r1));
     resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertFalse(resourcesIdle.get());
@@ -83,16 +106,26 @@ public void verifyRegisterUnRegister() throws Exception {
     resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertTrue(resourcesIdle.get());
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r2",
+            "+-endSpan: IdleResource.r2")
+        .inOrder();
   }
 
   @Test
   public void registerDuplicates() {
     IdlingResource r1 = new OnDemandIdlingResource("r1");
     IdlingResource r1dup = new OnDemandIdlingResource("r1");
-    assertTrue(registry.registerResources(Lists.newArrayList(r1)));
-    assertFalse(registry.registerResources(Lists.newArrayList(r1)));
-    assertFalse(registry.registerResources(Lists.newArrayList(r1dup)));
+    assertTrue(registry.registerResources(singletonList(r1)));
+    assertFalse(registry.registerResources(singletonList(r1)));
+    assertFalse(registry.registerResources(singletonList(r1dup)));
     assertEquals(1, registry.getResources().size());
+
+    assertThat(tracer.getSpans()).containsExactly("beginSpan: IdleResource.r1").inOrder();
   }
 
   @Test
@@ -100,32 +133,34 @@ public void unregisterNeverRegistered() throws Exception {
     IdlingResource r1 = new OnDemandIdlingResource("r1");
     IdlingResource r2 = new OnDemandIdlingResource("r2");
 
-    assertTrue(registry.registerResources(Lists.newArrayList(r1)));
-    assertFalse(registry.unregisterResources(Lists.newArrayList(r2)));
+    assertTrue(registry.registerResources(singletonList(r1)));
+    assertFalse(registry.unregisterResources(singletonList(r2)));
 
     FutureTask<Boolean> resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
 
     // r1 should still be registered
     assertFalse(resourcesIdle.get());
+
+    assertThat(tracer.getSpans()).containsExactly("beginSpan: IdleResource.r1").inOrder();
   }
 
   @Test
   public void unregisteredResourceIsDisconnected() throws Exception {
     // This repros a bug where a resource which has been registered and then
     // unregistered could still send an onTransitionToIdle() message back to
-    // the IRR and corrupt it's internal data structures.
+    // the IRR and corrupt its internal data structures.
 
     OnDemandIdlingResource r1 = new OnDemandIdlingResource("r1");
     OnDemandIdlingResource r2 = new OnDemandIdlingResource("r2");
     OnDemandIdlingResource r3 = new OnDemandIdlingResource("r3");
 
-    assertTrue(registry.registerResources(Lists.newArrayList(r1, r2, r3)));
+    assertTrue(registry.registerResources(Arrays.asList(r1, r2, r3)));
 
     FutureTask<Boolean> resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertFalse(resourcesIdle.get());
-    assertTrue(registry.unregisterResources(Lists.newArrayList(r3)));
+    assertTrue(registry.unregisterResources(singletonList(r3)));
 
     resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
@@ -147,6 +182,16 @@ public void unregisteredResourceIsDisconnected() throws Exception {
 
     // if this is false, r3's message broke the IRR
     assertTrue(resourcesIdle.get());
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r2",
+            "beginSpan: IdleResource.r3",
+            "+-endSpan: IdleResource.r3",
+            "+-endSpan: IdleResource.r2",
+            "+-endSpan: IdleResource.r1")
+        .inOrder();
   }
 
   @Test
@@ -161,27 +206,33 @@ public void registerAndUnregisterIdling() throws Exception {
 
     r1.reset();
 
-    assertFalse(registry.unregisterResources(Lists.newArrayList(r1)));
+    assertFalse(registry.unregisterResources(singletonList(r1)));
 
     resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertTrue(resourcesIdle.get());
+
+    assertThat(tracer.getSpans()).isEmpty();
   }
 
   @Test
   public void registerAndUnregisterNeverIdling() throws Exception {
     IdlingResource r1 = new OnDemandIdlingResource("r1");
-    registry.registerResources(Lists.newArrayList(r1));
+    registry.registerResources(singletonList(r1));
 
     FutureTask<Boolean> resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertFalse(resourcesIdle.get());
 
-    registry.unregisterResources(Lists.newArrayList(r1));
+    registry.unregisterResources(singletonList(r1));
 
     resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertTrue(resourcesIdle.get());
+
+    assertThat(tracer.getSpans())
+        .containsExactly("beginSpan: IdleResource.r1", "+-endSpan: IdleResource.r1")
+        .inOrder();
   }
 
   @Test
@@ -189,21 +240,31 @@ public void registerAndUnregisterReturnValue() {
     IdlingResource r1 = new OnDemandIdlingResource("r1");
     IdlingResource r2 = new OnDemandIdlingResource("r2");
 
-    assertTrue(registry.registerResources(Lists.newArrayList(r1)));
-    assertFalse(registry.registerResources(Lists.newArrayList(r1)));
-    assertTrue(registry.registerResources(Lists.newArrayList(r2)));
+    assertTrue(registry.registerResources(singletonList(r1)));
+    assertFalse(registry.registerResources(singletonList(r1)));
+    assertTrue(registry.registerResources(singletonList(r2)));
 
     IdlingResource r3 = new OnDemandIdlingResource("r3");
-    assertFalse(registry.registerResources(Lists.newArrayList(r3, r3)));
+    assertFalse(registry.registerResources(Arrays.asList(r3, r3)));
 
     IdlingResource r4 = new OnDemandIdlingResource("r4");
-    assertFalse(registry.unregisterResources(Lists.newArrayList(r4)));
-
-    assertTrue(registry.unregisterResources(Lists.newArrayList(r1)));
-    assertFalse(registry.unregisterResources(Lists.newArrayList(r1)));
-    assertTrue(registry.unregisterResources(Lists.newArrayList(r2)));
-
-    assertFalse(registry.unregisterResources(Lists.newArrayList(r3, r3)));
+    assertFalse(registry.unregisterResources(singletonList(r4)));
+
+    assertTrue(registry.unregisterResources(singletonList(r1)));
+    assertFalse(registry.unregisterResources(singletonList(r1)));
+    assertTrue(registry.unregisterResources(singletonList(r2)));
+
+    assertFalse(registry.unregisterResources(Arrays.asList(r3, r3)));
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r2",
+            "beginSpan: IdleResource.r3",
+            "+-endSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r2",
+            "+-endSpan: IdleResource.r3")
+        .inOrder();
   }
 
   @Test
@@ -213,11 +274,19 @@ public void getResources() {
 
     assertEquals(0, registry.getResources().size());
 
-    registry.registerResources(Lists.newArrayList(r1, r2));
+    registry.registerResources(Arrays.asList(r1, r2));
     assertEquals(2, registry.getResources().size());
 
-    registry.unregisterResources(Lists.newArrayList(r1, r2));
+    registry.unregisterResources(Arrays.asList(r1, r2));
     assertEquals(0, registry.getResources().size());
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r2",
+            "+-endSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r2")
+        .inOrder();
   }
 
   @Test
@@ -227,22 +296,24 @@ public void allResourcesAreIdle() throws Exception {
     IdlingResource r3 = new OnDemandIdlingResource("r3");
     r1.forceIdleNow();
     r2.forceIdleNow();
-    registry.registerResources(Lists.newArrayList(r1, r2));
+    registry.registerResources(Arrays.asList(r1, r2));
     FutureTask<Boolean> resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertTrue(resourcesIdle.get());
 
-    registry.registerResources(Lists.newArrayList(r3));
+    registry.registerResources(singletonList(r3));
 
     resourcesIdle = createIdleCheckTask(registry);
     handler.post(resourcesIdle);
     assertFalse(resourcesIdle.get());
+
+    assertThat(tracer.getSpans()).containsExactly("beginSpan: IdleResource.r3").inOrder();
   }
 
   @Test
   public void allResourcesAreIdle_RepeatingToIdleTransitions() throws Exception {
     OnDemandIdlingResource r1 = new OnDemandIdlingResource("r1");
-    registry.registerResources(Lists.newArrayList(r1));
+    registry.registerResources(singletonList(r1));
     for (int i = 1; i <= 3; i++) {
       FutureTask<Boolean> resourcesIdle = createIdleCheckTask(registry);
       handler.post(resourcesIdle);
@@ -256,6 +327,16 @@ public void allResourcesAreIdle_RepeatingToIdleTransitions() throws Exception {
 
       r1.reset();
     }
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r1")
+        .inOrder();
   }
 
   @Test
@@ -268,7 +349,7 @@ public void notifyWhenAllResourcesAreIdle_success() throws InterruptedException
     OnDemandIdlingResource r1 = new OnDemandIdlingResource("r1");
     OnDemandIdlingResource r2 = new OnDemandIdlingResource("r2");
     OnDemandIdlingResource r3 = new OnDemandIdlingResource("r3");
-    registry.registerResources(Lists.newArrayList(r1, r2, r3));
+    registry.registerResources(Arrays.asList(r1, r2, r3));
 
     handler.post(
         new Runnable() {
@@ -315,6 +396,16 @@ public void allResourcesIdle() {
     assertTrue(allResourcesIdleLatch.await(200, TimeUnit.MILLISECONDS));
     assertEquals(1, busyWarningLatch.getCount());
     assertEquals(1, timeoutLatch.getCount());
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r2",
+            "beginSpan: IdleResource.r3",
+            "+-endSpan: IdleResource.r3",
+            "+-endSpan: IdleResource.r2",
+            "+-endSpan: IdleResource.r1")
+        .inOrder();
   }
 
   @Test
@@ -327,7 +418,7 @@ public void notifyWhenAllResourcesAreIdle_timeout() throws InterruptedException
     OnDemandIdlingResource r1 = new OnDemandIdlingResource("r1");
     OnDemandIdlingResource r2 = new OnDemandIdlingResource("r2");
     OnDemandIdlingResource r3 = new OnDemandIdlingResource("r3");
-    registry.registerResources(Lists.newArrayList(r1, r2, r3));
+    registry.registerResources(Arrays.asList(r1, r2, r3));
 
     handler.post(
         new Runnable() {
@@ -373,6 +464,15 @@ public void allResourcesIdle() {
     assertTrue("Should have timed out", timeoutLatch.await(2, TimeUnit.SECONDS));
     assertEquals(1, busysFromWarning.get().size());
     assertEquals(1, allResourcesIdleLatch.getCount());
+
+    assertThat(tracer.getSpans())
+        .containsExactly(
+            "beginSpan: IdleResource.r1",
+            "beginSpan: IdleResource.r2",
+            "beginSpan: IdleResource.r3",
+            "+-endSpan: IdleResource.r1",
+            "+-endSpan: IdleResource.r2")
+        .inOrder();
   }
 
   @Test
@@ -458,7 +558,7 @@ public Void call() throws Exception {
   @Test
   public void testSync_ofIdlingResource() {
     IdlingResource r1 = new OnDemandIdlingResource("r1");
-    registry.sync(Sets.newHashSet(r1), Sets.<Looper>newHashSet());
+    registry.sync(singleton(r1), emptySet());
     assertEquals(1, registry.getResources().size());
     assertTrue(registry.getResources().contains(r1));
   }
@@ -466,7 +566,7 @@ public void testSync_ofIdlingResource() {
   @Test
   public void testSync_ofLooperAsIdlingResource() {
     IdlingResource r1 = LooperIdlingResourceInterrogationHandler.forLooper(handler.getLooper());
-    registry.sync(Sets.newHashSet(r1), Sets.newHashSet(handler.getLooper()));
+    registry.sync(singleton(r1), singleton(handler.getLooper()));
     assertEquals(1, registry.getResources().size());
     String expectedLooperResourceName =
         LooperIdlingResourceInterrogationHandler.forLooper(handler.getLooper()).getName();
@@ -479,9 +579,9 @@ public void testSync_withMultiRegisterAndUnregister() {
     IdlingResource r2 = new OnDemandIdlingResource("r2");
 
     // Register r1 directly
-    assertTrue(registry.registerResources(Lists.newArrayList(r1)));
+    assertTrue(registry.registerResources(singletonList(r1)));
     // Sync with second r2 and a looper
-    registry.sync(Sets.newHashSet(r2), Sets.newHashSet(Looper.getMainLooper()));
+    registry.sync(singleton(r2), singleton(Looper.getMainLooper()));
     // Verify r2 and looper registered
     // Verify r1 is unregister
     assertEquals(2, registry.getResources().size());
@@ -499,11 +599,11 @@ public void testSync_withDuplicateRegisterAndUnregister() {
     IdlingResource newReg = new OnDemandIdlingResource("newReg");
 
     // Register "toUnReg" and "alreadyReg"
-    assertTrue(registry.registerResources(Lists.newArrayList(toUnReg)));
-    assertTrue(registry.registerResources(Lists.newArrayList(alreadyReg)));
+    assertTrue(registry.registerResources(singletonList(toUnReg)));
+    assertTrue(registry.registerResources(singletonList(alreadyReg)));
 
     // Sync with second "alreadyReg" and "newReg"
-    registry.sync(Sets.newHashSet(alreadyReg, newReg), Sets.<Looper>newHashSet());
+    registry.sync(Arrays.asList(alreadyReg, newReg), emptySet());
     // Verify toUnReg is unregistered
     // Verify alreadyReg stayed registered
     // verify newReg registered
@@ -513,15 +613,6 @@ public void testSync_withDuplicateRegisterAndUnregister() {
   }
 
   private FutureTask<Boolean> createIdleCheckTask(final IdlingResourceRegistry registry) {
-    Callable<Boolean> isIdle =
-        new Callable<Boolean>() {
-          @Override
-          public Boolean call() {
-
-            return registry.allResourcesAreIdle();
-          }
-        };
-
-    return new FutureTask<Boolean>(isIdle);
+    return new FutureTask<>(registry::allResourcesAreIdle);
   }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/base/NoMatchingViewExceptionHandlerTest.java b/espresso/core/javatests/androidx/test/espresso/base/NoMatchingViewExceptionHandlerTest.java
deleted file mode 100644
index 59c48dfe6..000000000
--- a/espresso/core/javatests/androidx/test/espresso/base/NoMatchingViewExceptionHandlerTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.espresso.base;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.assertThrows;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.view.View;
-import android.widget.TextView;
-import androidx.test.espresso.NoMatchingViewException;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.platform.io.PlatformTestStorage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
-import org.hamcrest.BaseMatcher;
-import org.hamcrest.Description;
-import org.hamcrest.Matcher;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnit;
-import org.mockito.junit.MockitoRule;
-
-@RunWith(AndroidJUnit4.class)
-public class NoMatchingViewExceptionHandlerTest {
-
-  @Rule public final MockitoRule mockito = MockitoJUnit.rule();
-
-  private final AtomicInteger failureCount = new AtomicInteger();
-  private NoMatchingViewExceptionHandler handler;
-  private Matcher<View> viewMatcher;
-  @Mock private PlatformTestStorage testStorage;
-
-  @Before
-  public void setUp() throws IOException {
-    when(testStorage.openOutputFile("view-hierarchy-1.txt"))
-        .thenReturn(new ByteArrayOutputStream());
-    handler =
-        new NoMatchingViewExceptionHandler(
-            testStorage, failureCount, NoMatchingViewException.class);
-    viewMatcher =
-        new BaseMatcher<View>() {
-          @Override
-          public boolean matches(Object o) {
-            return false;
-          }
-
-          @Override
-          public void describeTo(Description description) {
-            description.appendText("A view matcher");
-          }
-        };
-  }
-
-  @Test
-  public void handle_noMatchingViewException() throws IOException {
-    NoMatchingViewException noMatchingViewException =
-        new NoMatchingViewException.Builder()
-            .withViewMatcher(viewMatcher)
-            .withRootView(
-                new TextView(InstrumentationRegistry.getInstrumentation().getTargetContext()))
-            .build();
-    String viewHierarchyMsg =
-        "\n\nView Hierarchy:\n"
-            + "+>TextView{id=-1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
-            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
-            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
-            + " layout-params=null, tag=null, root-is-layout-requested=true,"
-            + " has-input-connection=false, x=0.0, y=0.0, text=, input-type=0, ime-target=false,"
-            + " has-links=false} ";
-
-    failureCount.incrementAndGet();
-    NoMatchingViewException thrown =
-        assertThrows(
-            NoMatchingViewException.class,
-            () -> handler.handle(noMatchingViewException, viewMatcher));
-
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains("No views in hierarchy found matching: A view matcher" + viewHierarchyMsg);
-    verify(testStorage).openOutputFile(eq("view-hierarchy-1.txt"));
-  }
-
-  @Test
-  public void handle_nonNoMatchingViewException() {
-    // No-op. No exception should be thrown.
-    handler.handle(new Throwable("A random error"), viewMatcher);
-  }
-}
diff --git a/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplIntegrationTest.java b/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplIntegrationTest.java
index 04e287f80..0f0bd5ec4 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplIntegrationTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplIntegrationTest.java
@@ -16,35 +16,35 @@
 
 package androidx.test.espresso.base;
 
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.typeText;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.os.Build;
 import android.os.Looper;
-import android.os.SystemClock;
-import android.util.Log;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.view.View;
+import android.widget.EditText;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.InjectEventSecurityException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.action.MotionEvents;
 import androidx.test.espresso.base.IdlingResourceRegistry.IdleNotificationCallback;
-import androidx.test.espresso.util.HumanReadables;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.platform.tracing.Tracing;
 import androidx.test.ui.app.R;
 import androidx.test.ui.app.SendActivity;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javax.inject.Provider;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -52,38 +52,13 @@
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class UiControllerImplIntegrationTest {
-  //
-  // @Rule
-  // public ActivityTestRule<SendActivity> rule =
-  //     new ActivityTestRule<SendActivity>(SendActivity.class, true, false) {
-  //       @Override
-  //       public SendActivity getActivity() {
-  //         SendActivity a = ActivityScenario.launch(SendActivity.class);
-  //         while (!a.hasWindowFocus()) {
-  //           getInstrumentation().waitForIdleSync();
-  //         }
-  //         return a;
-  //       }
-  //     };
 
-  private final AtomicBoolean injectEventWorked = new AtomicBoolean(false);
-  private final AtomicBoolean injectEventThrewSecurityException = new AtomicBoolean(false);
-  private final CountDownLatch focusLatch = new CountDownLatch(1);
-  private final CountDownLatch latch = new CountDownLatch(1);
   private UiController uiController;
 
   @Before
   public void setUp() throws Exception {
-    EventInjector injector = null;
-    if (Build.VERSION.SDK_INT > 15) {
-      InputManagerEventInjectionStrategy strat = new InputManagerEventInjectionStrategy();
-      strat.initialize();
-      injector = new EventInjector(strat);
-    } else {
-      WindowManagerEventInjectionStrategy strat = new WindowManagerEventInjectionStrategy();
-      strat.initialize();
-      injector = new EventInjector(strat);
-    }
+    EventInjector injector = new EventInjector(new InputManagerEventInjectionStrategy());
+
     uiController =
         new UiControllerImpl(
             injector,
@@ -95,11 +70,12 @@ public void setUp() throws Exception {
             new Provider<IdleNotifier<IdleNotificationCallback>>() {
               @Override
               public IdleNotifier<IdleNotificationCallback> get() {
-                return new IdlingResourceRegistry(Looper.getMainLooper()).asIdleNotifier();
+                return new IdlingResourceRegistry(Looper.getMainLooper(), Tracing.getInstance())
+                    .asIdleNotifier();
               }
             },
             Looper.getMainLooper(),
-            new IdlingResourceRegistry(Looper.getMainLooper()));
+            new IdlingResourceRegistry(Looper.getMainLooper(), Tracing.getInstance()));
   }
 
   @Test
@@ -111,132 +87,56 @@ public void injectKeyEvent() throws InterruptedException {
             try {
               KeyCharacterMap keyCharacterMap = UiControllerImpl.getKeyCharacterMap();
               KeyEvent[] events = keyCharacterMap.getEvents("a".toCharArray());
-              injectEventWorked.set(uiController.injectKeyEvent(events[0]));
-              latch.countDown();
+              assertThat(uiController.injectKeyEvent(events[0])).isTrue();
             } catch (InjectEventSecurityException e) {
-              injectEventThrewSecurityException.set(true);
+              throw new RuntimeException(e);
             }
           });
-
-      assertFalse("injectEvent threw a SecurityException", injectEventThrewSecurityException.get());
-      assertTrue("Timed out!", latch.await(10, TimeUnit.SECONDS));
-      assertTrue(injectEventWorked.get());
     }
   }
 
   @Test
-  public void testInjectString() throws InterruptedException {
-    final AtomicBoolean requestFocusSucceded = new AtomicBoolean(false);
-
+  public void testInjectString() throws InterruptedException, IOException {
+    // use TypeTextAction as proxy to test injectString, since it contains the necessary
+    // focus handling to make injectString reliable
     try (ActivityScenario<SendActivity> activityScenario =
         ActivityScenario.launch(SendActivity.class)) {
+      onView(withId(R.id.send_data_to_call_edit_text)).perform(typeText("Hello! \n&*$$$"));
+
       activityScenario.onActivity(
           activity -> {
-            final View view = activity.findViewById(R.id.send_data_to_call_edit_text);
-            Log.i("TEST", HumanReadables.describe(view));
-            requestFocusSucceded.set(view.requestFocus() && view.hasWindowFocus());
-            Log.i("TEST-post", HumanReadables.describe(view));
-            focusLatch.countDown();
+            EditText editText = activity.findViewById(R.id.send_data_to_call_edit_text);
+            assertThat(editText.getText().toString()).isEqualTo("Hello! \n&*$$$");
           });
-
-      assertTrue("requestFocus timed out!", focusLatch.await(2, TimeUnit.SECONDS));
-      assertTrue("requestFocus failed.", requestFocusSucceded.get());
-
-      getInstrumentation()
-          .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  try {
-                    injectEventWorked.set(uiController.injectString("Hello! \n&*$$$"));
-                    latch.countDown();
-                  } catch (InjectEventSecurityException e) {
-                    injectEventThrewSecurityException.set(true);
-                  }
-                }
-              });
-
-      assertFalse(
-          "SecurityException exception was thrown.", injectEventThrewSecurityException.get());
-      assertTrue("Timed out!", latch.await(20, TimeUnit.SECONDS));
-      assertTrue(injectEventWorked.get());
     }
   }
 
   @Test
   public void injectLargeString() throws InterruptedException {
-    final AtomicBoolean requestFocusSucceded = new AtomicBoolean(false);
-
     try (ActivityScenario<SendActivity> activityScenario =
         ActivityScenario.launch(SendActivity.class)) {
+      onView(withId(R.id.send_data_to_call_edit_text))
+          .perform(typeText("This is a string with 32 chars!!"));
+
       activityScenario.onActivity(
           activity -> {
-            final View view = activity.findViewById(R.id.send_data_to_call_edit_text);
-            Log.i("TEST", HumanReadables.describe(view));
-            requestFocusSucceded.set(view.requestFocus());
-            Log.i("TEST-post", HumanReadables.describe(view));
-
-            focusLatch.countDown();
+            EditText editText = activity.findViewById(R.id.send_data_to_call_edit_text);
+            assertThat(editText.getText().toString()).isEqualTo("This is a string with 32 chars!!");
           });
-
-      assertTrue("requestFocus timed out!", focusLatch.await(2, TimeUnit.SECONDS));
-      assertTrue("requestFocus failed.", requestFocusSucceded.get());
-
-      getInstrumentation()
-          .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  try {
-                    injectEventWorked.set(
-                        uiController.injectString("This is a string with 32 chars!!"));
-                    latch.countDown();
-                  } catch (InjectEventSecurityException e) {
-                    injectEventThrewSecurityException.set(true);
-                  }
-                }
-              });
-
-      assertFalse(
-          "SecurityException exception was thrown.", injectEventThrewSecurityException.get());
-      assertTrue("Timed out!", latch.await(20, TimeUnit.SECONDS));
-      assertTrue(injectEventWorked.get());
     }
   }
 
   @Test
   public void testInjectEmptyString() throws InterruptedException {
-    final AtomicBoolean requestFocusSucceded = new AtomicBoolean(false);
     try (ActivityScenario<SendActivity> activityScenario =
         ActivityScenario.launch(SendActivity.class)) {
+      onView(withId(R.id.send_data_to_call_edit_text)).perform(typeText(""));
+
       activityScenario.onActivity(
           activity -> {
-            final View view = activity.findViewById(R.id.send_data_to_call_edit_text);
-            requestFocusSucceded.set(view.requestFocus());
-            focusLatch.countDown();
+            EditText editText = activity.findViewById(R.id.send_data_to_call_edit_text);
+            assertThat(editText.getText().toString()).isEmpty();
           });
-
-      assertTrue("requestFocus timed out!", focusLatch.await(2, TimeUnit.SECONDS));
-      assertTrue("requestFocus failed.", requestFocusSucceded.get());
-
-      getInstrumentation()
-          .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  try {
-                    injectEventWorked.set(uiController.injectString(""));
-                    latch.countDown();
-                  } catch (InjectEventSecurityException e) {
-                    injectEventThrewSecurityException.set(true);
-                  }
-                }
-              });
-
-      assertFalse(
-          "SecurityException exception was thrown.", injectEventThrewSecurityException.get());
-      assertTrue("Timed out!", latch.await(20, TimeUnit.SECONDS));
-      assertTrue(injectEventWorked.get());
     }
   }
 
@@ -244,97 +144,74 @@ public void run() {
   public void injectStringSecurityException() throws InterruptedException {
     getInstrumentation()
         .runOnMainSync(
-            new Runnable() {
-              @Override
-              public void run() {
-                try {
-                  injectEventWorked.set(uiController.injectString("Hello! \n&*$$$"));
-                  latch.countDown();
-                } catch (InjectEventSecurityException e) {
-                  injectEventThrewSecurityException.set(true);
-                }
+            () -> {
+              try {
+                uiController.injectString("Hello! \n&*$$$");
+              } catch (InjectEventSecurityException e) {
+                // expected on API <= 32
+                return;
+              }
+              // On API <= 32: injectString throws an InjectEventSecurityException.
+              // On API >= 33: injectString works for instrumentation and injects the event.
+              if (Build.VERSION.SDK_INT <= 32) {
+                fail("InjectEventSecurityException not thrown");
               }
             });
-
-    assertTrue("SecurityException exception was thrown.", injectEventThrewSecurityException.get());
-    assertFalse("Did NOT time out!", latch.await(3, TimeUnit.SECONDS));
-    assertFalse(injectEventWorked.get());
   }
 
   @Test
-  public void injectMotionEvent() throws InterruptedException {
+  public void injectMotionEvent() throws InterruptedException, IOException {
     try (ActivityScenario<SendActivity> activityScenario =
         ActivityScenario.launch(SendActivity.class)) {
-      final int[] coords = CoordinatesUtil.getCoordinatesInMiddleOfSendButton(activityScenario);
 
+      final int[] intCoords = CoordinatesUtil.getCoordinatesInMiddleOfSendButton(activityScenario);
+      final float[] coords = new float[] {intCoords[0], intCoords[1]};
+      final float[] precision = new float[] {1f, 1f};
       getInstrumentation()
           .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  long downTime = SystemClock.uptimeMillis();
-                  try {
-                    MotionEvent event =
-                        MotionEvent.obtain(
-                            downTime,
-                            SystemClock.uptimeMillis(),
-                            MotionEvent.ACTION_DOWN,
-                            coords[0],
-                            coords[1],
-                            0);
+              () -> {
+                uiController.loopMainThreadForAtLeast(100);
 
-                    injectEventWorked.set(uiController.injectMotionEvent(event));
-                    event.recycle();
-                    latch.countDown();
-                  } catch (InjectEventSecurityException e) {
-                    injectEventThrewSecurityException.set(true);
-                  }
+                final MotionEvent downEvent = MotionEvents.obtainDownEvent(coords, precision);
+                final MotionEvent upEvent = MotionEvents.obtainUpEvent(downEvent, coords);
+                try {
+                  assertThat(uiController.injectMotionEvent(downEvent)).isTrue();
+                  assertThat(uiController.injectMotionEvent(upEvent)).isTrue();
+                } catch (InjectEventSecurityException e) {
+                  throw new RuntimeException(e);
+                } finally {
+                  downEvent.recycle();
+                  upEvent.recycle();
                 }
               });
-
-      assertFalse(
-          "SecurityException exception was thrown.", injectEventThrewSecurityException.get());
-      assertTrue("Timed out!", latch.await(10, TimeUnit.SECONDS));
-      assertTrue(injectEventWorked.get());
     }
   }
 
   @Test
+  @Ignore // flaky, uiController.injectMotionEventSequence can intermittently return false
   public void injectMotionEventSequence() throws InterruptedException {
     try (ActivityScenario<SendActivity> scenario = ActivityScenario.launch(SendActivity.class)) {
-      getInstrumentation().waitForIdleSync();
+
       final float[][] steps = CoordinatesUtil.getCoordinatesToDrag();
 
       getInstrumentation()
           .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  long downTime = SystemClock.uptimeMillis();
-                  List<MotionEvent> events = new ArrayList<>();
-                  try {
-                    MotionEvent down =
-                        MotionEvents.obtainDownEvent(steps[0], new float[] {16f, 16f});
-                    events.add(down);
-                    for (int i = 1; i < events.size() - 1; i++) {
-                      events.add(
-                          MotionEvents.obtainMovement(
-                              downTime, SystemClock.uptimeMillis(), steps[i]));
-                    }
-                    events.add(MotionEvents.obtainUpEvent(down, steps[steps.length - 1]));
-
-                    injectEventWorked.set(uiController.injectMotionEventSequence(events));
-                    latch.countDown();
-                  } catch (InjectEventSecurityException e) {
-                    injectEventThrewSecurityException.set(true);
+              () -> {
+                uiController.loopMainThreadForAtLeast(100);
+                List<MotionEvent> events = new ArrayList<>();
+                try {
+                  MotionEvent down = MotionEvents.obtainDownEvent(steps[0], new float[] {16f, 16f});
+                  events.add(down);
+                  for (int i = 1; i < events.size() - 1; i++) {
+                    events.add(MotionEvents.obtainMovement(down, steps[i]));
                   }
+                  events.add(MotionEvents.obtainUpEvent(down, steps[steps.length - 1]));
+
+                  assertThat(uiController.injectMotionEventSequence(events)).isTrue();
+                } catch (InjectEventSecurityException e) {
+                  throw new RuntimeException(e);
                 }
               });
-
-      assertFalse(
-          "SecurityException exception was thrown.", injectEventThrewSecurityException.get());
-      assertTrue("Timed out!", latch.await(10, TimeUnit.SECONDS));
-      assertTrue(injectEventWorked.get());
     }
   }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplTest.java b/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplTest.java
index 5bc6381a7..75d6e198e 100644
--- a/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/base/UiControllerImplTest.java
@@ -16,21 +16,27 @@
 
 package androidx.test.espresso.base;
 
+import static java.util.Collections.singletonList;
 import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.os.SystemClock;
 import android.util.Log;
+import androidx.test.espresso.AppNotIdleException;
+import androidx.test.espresso.IdlingPolicies;
+import androidx.test.espresso.IdlingPolicy;
 import androidx.test.espresso.IdlingResourceTimeoutException;
 import androidx.test.espresso.base.IdlingResourceRegistry.IdleNotificationCallback;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import com.google.common.collect.Lists;
+import androidx.test.platform.tracing.Tracing;
+import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -94,6 +100,10 @@ public Handler getHandler() {
 
   @Before
   public void setUp() throws Exception {
+    // Reset the master policy timeout to the default value.
+    IdlingPolicies.setMasterPolicyTimeout(2, TimeUnit.SECONDS);
+    IdlingPolicies.setIdlingResourceTimeout(1, TimeUnit.SECONDS);
+
     testThread = new LooperThread();
     testThread.setUncaughtExceptionHandler(
         new Thread.UncaughtExceptionHandler() {
@@ -103,19 +113,11 @@ public void uncaughtException(Thread thread, Throwable ex) {
           }
         });
     testThread.start();
-    idlingResourceRegistry = new IdlingResourceRegistry(testThread.getLooper());
+    idlingResourceRegistry =
+        new IdlingResourceRegistry(testThread.getLooper(), Tracing.getInstance());
     asyncPool =
         new ThreadPoolExecutor(3, 3, 1, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>());
-    EventInjector injector = null;
-    if (Build.VERSION.SDK_INT > 15) {
-      InputManagerEventInjectionStrategy strat = new InputManagerEventInjectionStrategy();
-      strat.initialize();
-      injector = new EventInjector(strat);
-    } else {
-      WindowManagerEventInjectionStrategy strat = new WindowManagerEventInjectionStrategy();
-      strat.initialize();
-      injector = new EventInjector(strat);
-    }
+    EventInjector injector = new EventInjector(new InputManagerEventInjectionStrategy());
 
     uiController.set(
         new UiControllerImpl(
@@ -134,6 +136,10 @@ public IdleNotifier<IdleNotificationCallback> get() {
 
   @After
   public void tearDown() throws Exception {
+    // Reset the master policy timeout to the default value.
+    IdlingPolicies.setMasterPolicyTimeout(60, TimeUnit.SECONDS);
+    IdlingPolicies.setIdlingResourceTimeout(26, TimeUnit.SECONDS);
+
     testThread.quitLooper();
     asyncPool.shutdown();
   }
@@ -326,10 +332,10 @@ public void run() {
                   }
                 }));
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(2, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!", latch.await(1, TimeUnit.SECONDS));
     assertEquals("Not all main thread tasks have checked in", 1L, latch.getCount());
     asyncTaskShouldComplete.countDown();
-    assertTrue("App should be idle.", latch.await(5, TimeUnit.SECONDS));
+    assertTrue("App should be idle.", latch.await(1, TimeUnit.SECONDS));
   }
 
   @Test
@@ -358,7 +364,7 @@ public void run() {
   @Test
   public void loopMainThreadUntilIdle_oneIdlingResource() throws InterruptedException {
     OnDemandIdlingResource fakeResource = new OnDemandIdlingResource("FakeResource");
-    idlingResourceRegistry.registerResources(Lists.newArrayList(fakeResource));
+    idlingResourceRegistry.registerResources(singletonList(fakeResource));
     final CountDownLatch latch = new CountDownLatch(1);
     assertTrue(
         testThread
@@ -373,9 +379,63 @@ public void run() {
                   }
                 }));
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(2, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
     fakeResource.forceIdleNow();
-    assertTrue("App should be idle.", latch.await(5, TimeUnit.SECONDS));
+    assertTrue("App should be idle.", latch.await(1, TimeUnit.SECONDS));
+  }
+
+  @Test
+  public void loopMainThreadUntilIdle_racyIdleResource() throws InterruptedException {
+    IdlingPolicies.setMasterPolicyTimeout(100, TimeUnit.MILLISECONDS);
+    OnDemandIdlingResource fakeResource = new OnDemandIdlingResource("FakeResource");
+    idlingResourceRegistry.registerResources(singletonList(fakeResource));
+    final CountDownLatch startedLatch = new CountDownLatch(1);
+    final CountDownLatch interruptedLatch = new CountDownLatch(1);
+    assertTrue(
+        testThread
+            .getHandler()
+            .post(
+                () -> {
+                  // This is the sequence of events we want:
+                  // - Resource starts busy.
+                  // - Resource becomes idle, event posted to queue to update idle registry.
+                  // - Timeout occurs, no more events will be processed.
+                  // - Espresso detects race condition while checking if the resource is idle.
+                  IdlingPolicy masterIdlingPolicy = IdlingPolicies.getMasterIdlingPolicy();
+                  long expectedTimeout =
+                      SystemClock.uptimeMillis()
+                          + masterIdlingPolicy
+                              .getIdleTimeoutUnit()
+                              .toMillis(masterIdlingPolicy.getIdleTimeout());
+                  testThread
+                      .getHandler()
+                      .post(
+                          () -> {
+                            Log.i(TAG, "Forcing resource to be idle.");
+                            fakeResource.forceIdleNow();
+                            // Busy wait until after the timeout to ensure race buster cannot run.
+                            try {
+                              Thread.sleep(200);
+                            } catch (InterruptedException e) {
+                              throw new RuntimeException(e);
+                            }
+                            assertTrue(
+                                "Sleep should bring us past the timeout.",
+                                SystemClock.uptimeMillis() > expectedTimeout);
+                          });
+
+                  Log.i(TAG, "Hijacking thread and looping it.");
+                  startedLatch.countDown();
+                  assertThrows(
+                      "Expected for loopMainThreadUntilIdle to be interrupted",
+                      AppNotIdleException.class,
+                      () -> uiController.get().loopMainThreadUntilIdle());
+                  interruptedLatch.countDown();
+                }));
+
+    assertTrue("looper has started.", startedLatch.await(2, TimeUnit.SECONDS));
+    assertTrue("App should be interrupted.", interruptedLatch.await(5, TimeUnit.SECONDS));
   }
 
   @Test
@@ -384,7 +444,7 @@ public void loopMainThreadUntilIdle_multipleIdlingResources() throws Interrupted
     OnDemandIdlingResource fakeResource2 = new OnDemandIdlingResource("FakeResource2");
     OnDemandIdlingResource fakeResource3 = new OnDemandIdlingResource("FakeResource3");
     // Register the first two right away and one later (once the wait for the first two begins).
-    idlingResourceRegistry.registerResources(Lists.newArrayList(fakeResource1, fakeResource2));
+    idlingResourceRegistry.registerResources(Arrays.asList(fakeResource1, fakeResource2));
     final CountDownLatch latch = new CountDownLatch(1);
     assertTrue(
         testThread
@@ -399,18 +459,22 @@ public void run() {
                   }
                 }));
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(1, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
     fakeResource1.forceIdleNow();
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(1, TimeUnit.SECONDS));
-    idlingResourceRegistry.registerResources(Lists.newArrayList(fakeResource3));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
+    idlingResourceRegistry.registerResources(singletonList(fakeResource3));
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(1, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
     fakeResource2.forceIdleNow();
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(1, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
     fakeResource3.forceIdleNow();
-    assertTrue("App should be idle.", latch.await(5, TimeUnit.SECONDS));
+    assertTrue("App should be idle.", latch.await(1, TimeUnit.SECONDS));
   }
 
   @Test
@@ -419,7 +483,7 @@ public void loopMainThreadUntilIdle_timeout() throws InterruptedException {
     OnDemandIdlingResource kindaCrappyResource = new OnDemandIdlingResource("KindaCrappyResource");
     OnDemandIdlingResource badResource = new OnDemandIdlingResource("VeryBadResource");
     idlingResourceRegistry.registerResources(
-        Lists.newArrayList(goodResource, kindaCrappyResource, badResource));
+        Arrays.asList(goodResource, kindaCrappyResource, badResource));
     final CountDownLatch latch = new CountDownLatch(1);
     assertTrue(
         testThread
@@ -437,13 +501,15 @@ public void run() {
                   }
                 }));
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(4, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
     goodResource.forceIdleNow();
     assertFalse(
-        "Should not have stopped looping the main thread yet!", latch.await(12, TimeUnit.SECONDS));
+        "Should not have stopped looping the main thread yet!",
+        latch.await(100, TimeUnit.MILLISECONDS));
     kindaCrappyResource.forceIdleNow();
     assertTrue(
-        "Should have caught IdlingResourceTimeoutException", latch.await(11, TimeUnit.SECONDS));
+        "Should have caught IdlingResourceTimeoutException", latch.await(900, TimeUnit.SECONDS));
   }
 
   @Test
@@ -509,4 +575,10 @@ public void run() {
         "UiController tasks never interrupted",
         latch.await(timeToWaitForIdle - 100, TimeUnit.MILLISECONDS));
   }
+
+  /** Verify uiController can be initialized on instrumentation thread. */
+  @Test
+  public void interruptInitialization() {
+    uiController.get().interruptEspressoTasks();
+  }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/base/ViewHierarchyExceptionHandlerTest.java b/espresso/core/javatests/androidx/test/espresso/base/ViewHierarchyExceptionHandlerTest.java
new file mode 100644
index 000000000..225864dee
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/base/ViewHierarchyExceptionHandlerTest.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.base;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.Collections.singletonMap;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import androidx.test.espresso.AmbiguousViewMatcherException;
+import androidx.test.espresso.NoMatchingViewException;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.io.PlatformTestStorage;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class ViewHierarchyExceptionHandlerTest {
+
+  @Rule public final MockitoRule mockito = MockitoJUnit.rule();
+
+  private final AtomicInteger failureCount = new AtomicInteger();
+  private ViewHierarchyExceptionHandler<NoMatchingViewException> noMatchingViewExceptionHandler;
+  private ViewHierarchyExceptionHandler<AmbiguousViewMatcherException>
+      ambiguousViewMatcherExceptionHandler;
+  private Matcher<View> alwaysFalseMatcher;
+  @Mock private PlatformTestStorage testStorage;
+  private PlatformTestStorage originalTestStorage;
+
+  @Before
+  public void setUp() throws IOException {
+    originalTestStorage = PlatformTestStorageRegistry.getInstance();
+    PlatformTestStorageRegistry.registerInstance(testStorage);
+    when(testStorage.openOutputFile("view-hierarchy-1.txt"))
+        .thenReturn(new ByteArrayOutputStream());
+    noMatchingViewExceptionHandler =
+        new ViewHierarchyExceptionHandler<>(
+
+            failureCount,
+            NoMatchingViewException.class,
+            DefaultFailureHandler.getNoMatchingViewExceptionTruncater());
+    ambiguousViewMatcherExceptionHandler =
+        new ViewHierarchyExceptionHandler<>(
+
+            failureCount,
+            AmbiguousViewMatcherException.class,
+            DefaultFailureHandler.getAmbiguousViewMatcherExceptionTruncater());
+    alwaysFalseMatcher =
+        new BaseMatcher<View>() {
+          @Override
+          public boolean matches(Object o) {
+            return false;
+          }
+
+          @Override
+          public void describeTo(Description description) {
+            description.appendText("A view matcher");
+          }
+        };
+  }
+
+  @After
+  public void tearDown() throws IOException {
+    PlatformTestStorageRegistry.registerInstance(originalTestStorage);
+  }
+
+  @Test
+  public void handle_noMatchingViewException() throws IOException {
+    NoMatchingViewException exceptionUnderTest =
+        new NoMatchingViewException.Builder()
+            .withViewMatcher(alwaysFalseMatcher)
+            .withRootView(new TextView(getInstrumentation().getTargetContext()))
+            .build();
+    String expectedMsg =
+        "\n\nView Hierarchy:\n"
+            + "+>TextView{id=-1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=null, tag=null, root-is-layout-requested=true,"
+            + " has-input-connection=false, x=0.0, y=0.0, text=, input-type=0, ime-target=false,"
+            + " has-links=false} ";
+
+    failureCount.incrementAndGet();
+    NoMatchingViewException thrown =
+        assertThrows(
+            NoMatchingViewException.class,
+            () -> noMatchingViewExceptionHandler.handle(exceptionUnderTest, alwaysFalseMatcher));
+
+    assertThat(thrown)
+        .hasMessageThat()
+        .contains("No views in hierarchy found matching: A view matcher" + expectedMsg);
+    verify(testStorage).openOutputFile(eq("view-hierarchy-1.txt"));
+  }
+
+  @Test
+  public void handle_nonNoMatchingViewException() {
+    // No-op. No exception should be thrown.
+    noMatchingViewExceptionHandler.handle(new Throwable("A random error"), alwaysFalseMatcher);
+  }
+
+  @Test
+  public void handle_ambiguousViewMatcherException() throws IOException {
+    ViewGroup layoutUnderTest = new RelativeLayout(getInstrumentation().getContext());
+    View child1 = new TextView(getInstrumentation().getContext());
+    child1.setId(1);
+    View child2 = new TextView(getInstrumentation().getContext());
+    child2.setId(2);
+    layoutUnderTest.addView(child1);
+    layoutUnderTest.addView(child2);
+
+    AmbiguousViewMatcherException exceptionUnderTest =
+        new AmbiguousViewMatcherException.Builder()
+            .withViewMatcher(alwaysFalseMatcher)
+            .withRootView(layoutUnderTest)
+            .withView1(layoutUnderTest)
+            .withView2(child1)
+            .withOtherAmbiguousViews(child2)
+            .build();
+
+    String expectedMsg =
+        "'A view matcher' matches 3 views in the hierarchy:\n"
+            + "- [1] RelativeLayout{id=-1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=null, tag=null, root-is-layout-requested=true,"
+            + " has-input-connection=false, x=0.0, y=0.0, child-count=2}\n"
+            + "- [2] TextView{id=1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=android.widget.RelativeLayout$LayoutParams@YYYYYY, tag=null,"
+            + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0, text=,"
+            + " input-type=0, ime-target=false, has-links=false}\n"
+            + "- [3] TextView{id=2, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=android.widget.RelativeLayout$LayoutParams@YYYYYY, tag=null,"
+            + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0, text=,"
+            + " input-type=0, ime-target=false, has-links=false}\n"
+            + "Problem views are marked with '****MATCHES****' below.\n\n"
+            + "View Hierarchy:\n"
+            + "+>RelativeLayout{id=-1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=null, tag=null, root-is-layout-requested=true,"
+            + " has-input-connection=false, x=0.0, y=0.0, child-count=2} ****MATCHES****\n"
+            + "|\n"
+            + "+->TextView{id=1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=android.widget.RelativeLayout$LayoutParams@YYYYYY, tag=null,"
+            + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0, text=,"
+            + " input-type=0, ime-target=false, has-links=false} ****MATCHES****\n"
+            + "|\n"
+            + "+->TextView{id=2, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=android.widget.RelativeLayout$LayoutParams@YYYYYY, tag=null,"
+            + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0, text=,"
+            + " input-type=0, ime-target=false, has-links=false} ****MATCHES****";
+
+    failureCount.incrementAndGet();
+    AmbiguousViewMatcherException thrown =
+        assertThrows(
+            AmbiguousViewMatcherException.class,
+            () ->
+                ambiguousViewMatcherExceptionHandler.handle(
+                    exceptionUnderTest, alwaysFalseMatcher));
+
+    assertThat(thrown).hasMessageThat().contains(expectedMsg);
+
+    verify(testStorage).openOutputFile(eq("view-hierarchy-1.txt"));
+  }
+
+  @Test
+  public void handle_ambiguousViewMatcherException_withTruncatedMessage() throws IOException {
+    ViewGroup layoutUnderTest = new RelativeLayout(getInstrumentation().getContext());
+    View child1 = new TextView(getInstrumentation().getContext());
+    child1.setId(1);
+    View child2 = new TextView(getInstrumentation().getContext());
+    child2.setId(2);
+    layoutUnderTest.addView(child1);
+    layoutUnderTest.addView(child2);
+
+    AmbiguousViewMatcherException exceptionUnderTest =
+        new AmbiguousViewMatcherException.Builder()
+            .withViewMatcher(alwaysFalseMatcher)
+            .withRootView(layoutUnderTest)
+            .withView1(layoutUnderTest)
+            .withView2(child1)
+            .withOtherAmbiguousViews(child2)
+            .build();
+
+    Map<String, String> inputArgs = singletonMap("view_hierarchy_char_limit", "1772");
+    when(testStorage.getInputArgs()).thenReturn(inputArgs);
+    doAnswer(invocation -> inputArgs.get(invocation.getArgument(0)))
+        .when(testStorage)
+        .getInputArg(anyString());
+
+    String expectedMsg =
+        "'A view matcher' matches 3 views in the hierarchy:\n"
+            + "- [1] RelativeLayout{id=-1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=null, tag=null, root-is-layout-requested=true,"
+            + " has-input-connection=false, x=0.0, y=0.0, child-count=2}\n"
+            + "- [2] TextView{id=1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=android.widget.RelativeLayout$LayoutParams@YYYYYY, tag=null,"
+            + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0, text=,"
+            + " input-type=0, ime-target=false, has-links=false}\n"
+            + "- [3] TextView{id=2, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=android.widget.RelativeLayout$LayoutParams@YYYYYY, tag=null,"
+            + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0, text=,"
+            + " input-type=0, ime-target=false, has-links=false}\n"
+            + "Problem views are marked with '****MATCHES****' below.\n\n"
+            + "View Hierarchy:\n"
+            + "+>RelativeLayout{id=-1, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+            + " has-focusable=false, has-window-focus=false, is-clickable=false, is-enabled=true,"
+            + " is-focused=false, is-focusable=false, is-layout-requested=true, is-selected=false,"
+            + " layout-params=null, tag=null, root-is-layout-requested=true,"
+            + " has-input-connection=false, x=0.0, y=0.0, child-count=2} ****MATCHES****"
+            + " [truncated]";
+
+    failureCount.incrementAndGet();
+    AmbiguousViewMatcherException thrown =
+        assertThrows(
+            AmbiguousViewMatcherException.class,
+            () ->
+                ambiguousViewMatcherExceptionHandler.handle(
+                    exceptionUnderTest, alwaysFalseMatcher));
+
+    assertThat(thrown).hasMessageThat().contains(expectedMsg);
+
+    assertThat(thrown)
+        .hasMessageThat()
+        .containsMatch(
+            "The complete view hierarchy is available in artifact file 'view-hierarchy-1.txt'.");
+
+    verify(testStorage).openOutputFile(eq("view-hierarchy-1.txt"));
+  }
+
+  @Test
+  public void handle_nonAmbiguousViewMatcherException() {
+    // No-op. No exception should be thrown.
+    ambiguousViewMatcherExceptionHandler.handle(
+        new Throwable("A random error"), alwaysFalseMatcher);
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/internal/data/BUILD b/espresso/core/javatests/androidx/test/espresso/internal/data/BUILD
new file mode 100644
index 000000000..5f5164763
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/internal/data/BUILD
@@ -0,0 +1,31 @@
+# Tests for espresso.internal.data
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "TestFlowVisualizerTest",
+    srcs = [
+        "TestFlowVisualizerTest.java",
+    ],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/internal/data",
+        "//espresso/core/java/androidx/test/espresso/internal/data/model",
+        "//ext/junit",
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/internal/data/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/internal/data/BUILD.bazel
deleted file mode 100644
index 9090de83c..000000000
--- a/espresso/core/javatests/androidx/test/espresso/internal/data/BUILD.bazel
+++ /dev/null
@@ -1,32 +0,0 @@
-# Tests for espresso.internal.data
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])
-
-android_app_instrumentation_tests(
-    name = "TestFlowVisualizerTest",
-    srcs = [
-        "TestFlowVisualizerTest.java",
-    ],
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/internal/data",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_view_matchers",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "//services/storage/java/androidx/test/services/storage",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_mockito_mockito_core",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/internal/data/TestFlowVisualizerTest.java b/espresso/core/javatests/androidx/test/espresso/internal/data/TestFlowVisualizerTest.java
index bf19ca052..9dce9f894 100644
--- a/espresso/core/javatests/androidx/test/espresso/internal/data/TestFlowVisualizerTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/internal/data/TestFlowVisualizerTest.java
@@ -26,7 +26,6 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.platform.io.PlatformTestStorage;
 import androidx.test.platform.io.PlatformTestStorageRegistry;
-import androidx.test.services.storage.TestStorage;
 import androidx.test.services.storage.internal.TestStorageUtil;
 import java.io.IOException;
 import java.io.InputStream;
@@ -70,7 +69,7 @@ public void testFlowVisualizerEnsureCorrectOutputForSingleDummyAction() throws I
     testFlowVisualizer.visualize();
     InputStream outputGalleryFile =
         TestStorageUtil.getInputStream(
-            TestStorage.getOutputFileUri("output_gallery.html"),
+            PlatformTestStorageRegistry.getInstance().getOutputFileUri("output_gallery.html"),
             InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver());
     int size = outputGalleryFile.available();
     byte[] directFileContents = new byte[size];
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD
new file mode 100644
index 000000000..ff544d8fb
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD
@@ -0,0 +1,176 @@
+# Description:
+#   Tests for espresso matchers
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:phone_devices.bzl",
+    "apis",
+    "devices",
+    "gmscore_channel",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "utils",
+    srcs = ["MatcherTestUtils.java"],
+    visibility = ["//visibility:private"],
+    deps = ["@maven//:org_hamcrest_hamcrest_core"],
+)
+
+axt_android_library_test(
+    name = "BoundedDiagnosingMatcherTest",
+    srcs = ["BoundedDiagnosingMatcherTest.java"],
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "CursorMatchersTest",
+    srcs = ["CursorMatchersTest.java"],
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "HasBackgroundMatcherTest",
+    srcs = ["HasBackgroundMatcherTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "LayoutMatchersTest",
+    srcs = ["LayoutMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "PreferenceMatchersTest",
+    srcs = ["PreferenceMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ViewMatchers1Test",
+    srcs = ["ViewMatchers1Test.java"],
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+# TODO(b/232962936): AOSP API 26 image does not include webview
+axt_android_library_test(
+    name = "ViewMatchers2Test",
+    size = "large",
+    srcs = ["ViewMatchers2Test.java"],
+    device_list = devices(apis(exclude_apis = [26])) + devices(
+        [26],
+        gms_channel = gmscore_channel.PREBUILT,
+    ),
+    shard_count = 4,
+    deps = [
+        ":utils",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/matcher/BUILD.bazel
deleted file mode 100644
index bac782a76..000000000
--- a/espresso/core/javatests/androidx/test/espresso/matcher/BUILD.bazel
+++ /dev/null
@@ -1,52 +0,0 @@
-# Description:
-#   Tests for espresso matchers
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "utils",
-    srcs = ["MatcherTestUtils.java"],
-    visibility = ["//visibility:private"],
-    deps = ["@maven//:org_hamcrest_hamcrest_all"],
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    size = "large",
-    srcs = glob(["*Test.java"]),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//:androidx_annotation",
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_view_matchers",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:hamcrest_matchers_v1_3_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/CursorMatchersTest.java b/espresso/core/javatests/androidx/test/espresso/matcher/CursorMatchersTest.java
index 8bc43636c..b3ec8b4c3 100644
--- a/espresso/core/javatests/androidx/test/espresso/matcher/CursorMatchersTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/matcher/CursorMatchersTest.java
@@ -36,12 +36,8 @@
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.database.MergeCursor;
-import android.os.Build;
-import android.util.Log;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Before;
@@ -536,79 +532,8 @@ public void tearDown() throws Exception {
   /** Returns an {@link MatrixCursor} populated with fake data. */
   private static Cursor makeCursor(String[] columnNames, Object[] values) {
     assertTrue(columnNames.length == values.length);
-    MatrixCursor cursorStub;
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
-      cursorStub = newMatrixCursorV10(columnNames);
-    } else {
-      cursorStub = newMatrixCursorV14(columnNames);
-    }
+    MatrixCursor cursorStub = new MatrixCursor(columnNames);
     cursorStub.addRow(values);
     return cursorStub;
   }
-
-  private static MatrixCursor newMatrixCursorV10(String[] columnNames) {
-    return new MatrixCursorCompat(columnNames);
-  }
-
-  private static MatrixCursor newMatrixCursorV14(String[] columnNames) {
-    return new MatrixCursor(columnNames);
-  }
-
-  /**
-   * This test uses {@link MatrixCursor} as data source. {@link MatrixCursor#getBlob(int)} support
-   * was added in ICS. This class enabled getBlob() for API levels < 14.
-   */
-  private static class MatrixCursorCompat extends MatrixCursor {
-
-    private static final String TAG = "MatrixCursorCompat";
-
-    public MatrixCursorCompat(String[] columnNames) {
-      super(columnNames);
-    }
-
-    @Override
-    public byte[] getBlob(int columnIndex) {
-      Object value = get(columnIndex);
-      return (byte[]) value;
-    }
-
-    /**
-     * {@link MatrixCursor} internally uses get(int) to read data from its internal data structure
-     * (Object[]). As this method is private we need to use reflection in order to invoke it.
-     */
-    private byte[] get(int columnIndex) {
-      final String instanceMethod = "get";
-      byte[] blob = new byte[0];
-      try {
-        Method getInstanceMethod =
-            this.getClass().getSuperclass().getDeclaredMethod(instanceMethod, Integer.TYPE);
-        getInstanceMethod.setAccessible(true);
-        blob = (byte[]) getInstanceMethod.invoke(this, columnIndex);
-      } catch (NoSuchMethodException nsme) {
-        Log.e(TAG, String.format("could not find method: %s", instanceMethod), nsme);
-      } catch (IllegalAccessException iae) {
-        Log.e(
-            TAG,
-            String.format(
-                "reflective setup failed using obj: %s method: %s",
-                getClass().getSimpleName(), instanceMethod),
-            iae);
-      } catch (IllegalArgumentException iae) {
-        Log.e(
-            TAG,
-            String.format(
-                "reflective setup failed using obj: %s method: %s",
-                getClass().getSimpleName(), instanceMethod),
-            iae);
-      } catch (InvocationTargetException ite) {
-        Log.e(
-            TAG,
-            String.format(
-                "reflective setup failed using obj: %s method: %s",
-                getClass().getSimpleName(), instanceMethod),
-            ite);
-      }
-      return blob;
-    }
-  }
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/HasBackgroundMatcherTest.java b/espresso/core/javatests/androidx/test/espresso/matcher/HasBackgroundMatcherTest.java
index 8a6ec1e1c..834f554dd 100644
--- a/espresso/core/javatests/androidx/test/espresso/matcher/HasBackgroundMatcherTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/matcher/HasBackgroundMatcherTest.java
@@ -19,14 +19,14 @@
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
+import android.os.Build.VERSION;
 import android.view.View;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import androidx.test.filters.SdkSuppress;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,10 +43,14 @@ public void setUp() throws Exception {
     context = getApplicationContext();
   }
 
+  // placeholder test so at least one test is found on API 15
+  @Test
+  public void emptyTest() {}
+
   @Test
-  // TODO(b/117557353): investigate why this fails on 28
-  @SdkSuppress(minSdkVersion = 16, maxSdkVersion = 27)
   public void verifyViewHasBackground() {
+    // TODO(b/117557353): investigate failures on API 28
+    assumeFalse(VERSION.SDK_INT == 28);
     View viewWithBackground = new View(context);
     int drawable1 = androidx.test.ui.app.R.drawable.drawable_1;
     int drawable2 = androidx.test.ui.app.R.drawable.drawable_2;
@@ -58,7 +62,6 @@ public void verifyViewHasBackground() {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 16)
   public void verifyBackgroundWhenBackgroundIsNotSet() {
     View view = new View(context);
     view.setBackground(null);
@@ -67,40 +70,6 @@ public void verifyBackgroundWhenBackgroundIsNotSet() {
     assertFalse(new HasBackgroundMatcher(drawable1).matches(view));
   }
 
-  @Test
-  public void compareSameBitmapImage() {
-    Bitmap bitmap = null;
-    try {
-      bitmap =
-          BitmapFactory.decodeResource(context.getResources(), android.R.drawable.alert_dark_frame);
-      assertTrue(HasBackgroundMatcher.compareBitmaps(bitmap, bitmap));
-    } finally {
-      recycle(bitmap);
-      bitmap = null;
-    }
-  }
-
-  @Test
-  public void compareDifferentBitmapImages() {
-    Bitmap bitmap1 = null;
-    Bitmap bitmap2 = null;
-
-    try {
-      bitmap1 =
-          BitmapFactory.decodeResource(context.getResources(), android.R.drawable.alert_dark_frame);
-      bitmap2 =
-          BitmapFactory.decodeResource(
-              context.getResources(), android.R.drawable.alert_light_frame);
-
-      assertFalse(HasBackgroundMatcher.compareBitmaps(bitmap1, bitmap2));
-    } finally {
-      recycle(bitmap1);
-      recycle(bitmap2);
-      bitmap1 = null;
-      bitmap2 = null;
-    }
-  }
-
   private void recycle(Bitmap bitmap) {
     if (bitmap != null) {
       bitmap.recycle();
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers1Test.java b/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers1Test.java
index e6f30a93b..cc258f443 100644
--- a/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers1Test.java
+++ b/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers1Test.java
@@ -57,7 +57,6 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.os.Build;
 import android.text.SpannedString;
 import android.text.method.TransformationMethod;
 import android.view.View;
@@ -93,8 +92,6 @@
 @RunWith(AndroidJUnit4.class)
 public class ViewMatchers1Test {
 
-  private static final int UNRECOGNIZED_INPUT_TYPE = 999999;
-
   private Context context;
 
   @Before
@@ -578,13 +575,7 @@ public void hasTextColorTest() {
     TextView textView = new TextView(context);
     textView.setText("text");
 
-    int color;
-    if (Build.VERSION.SDK_INT <= 22) {
-      color = context.getResources().getColor(R.color.green);
-    } else {
-      color = context.getColor(R.color.green);
-    }
-
+    int color = context.getColor(R.color.green);
     textView.setTextColor(color);
 
     assertTrue(hasTextColor(R.color.green).matches(textView));
@@ -829,7 +820,7 @@ public void isDisplayingAtLeast_mismatchDescription_lowVisibility() {
   }
 
   /** This interface is used to mock the {@link View#getGlobalVisibleRect(Rect, Point)} method. */
-  private interface GlobalVisibleRectProvider {
+  interface GlobalVisibleRectProvider {
     boolean get(Rect r, Point offset);
   }
 
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers2Test.java b/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers2Test.java
index 2c09ca3b4..9e978f28a 100644
--- a/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers2Test.java
+++ b/espresso/core/javatests/androidx/test/espresso/matcher/ViewMatchers2Test.java
@@ -52,12 +52,12 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.Build.VERSION;
-import androidx.annotation.NonNull;
 import android.text.InputType;
 import android.text.Spannable;
 import android.text.style.ForegroundColorSpan;
@@ -72,12 +72,12 @@
 import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.ui.app.R;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
 import java.util.List;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
@@ -377,7 +377,6 @@ public void withHintResourceId_charSequenceTest() {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 11)
   public void withAlphaTest() {
     View view = new TextView(context);
 
@@ -703,7 +702,7 @@ public void withSpinnerTextResourceId() {
     // we accounted for getSelectedItem being null.
     assertFalse(withSpinnerText(R.string.something).matches(spinner));
 
-    List<String> values = Lists.newArrayList();
+    List<String> values = new ArrayList<>();
     values.add(context.getString(R.string.something));
     values.add(context.getString(R.string.other_string));
     ArrayAdapter<String> adapter =
@@ -752,7 +751,7 @@ public void withSpinnerTextResourceId_noSelection_mismatchDescription() {
   @Test
   public void withSpinnerTextResourceId_withSelection_mismatchDescription() {
     Spinner spinner = new Spinner(context);
-    List<String> values = Lists.newArrayList();
+    List<String> values = new ArrayList<>();
     values.add(context.getString(R.string.something));
     values.add(context.getString(R.string.other_string));
     ArrayAdapter<String> adapter =
@@ -772,7 +771,7 @@ public void withSpinnerTextString() {
     // we accounted for getSelectedItem being null.
     assertFalse(withSpinnerText(is("Hello World")).matches(spinner));
 
-    List<String> values = Lists.newArrayList();
+    List<String> values = new ArrayList<>();
     values.add("Hello World");
     values.add("Goodbye!!");
     ArrayAdapter<String> adapter =
@@ -809,7 +808,7 @@ public void withSpinnerTextString_noSelection_mismatchDescription() {
   @Test
   public void withSpinnerTextString_withSelection_mismatchDescription() {
     Spinner spinner = new Spinner(context);
-    List<String> values = Lists.newArrayList();
+    List<String> values = new ArrayList<>();
     values.add("Hello World");
     values.add("Goodbye!!");
     ArrayAdapter<String> adapter =
@@ -878,16 +877,15 @@ public void hasErrorText_mismatchDescription() {
   }
 
   @Test
-  // TODO(b/117557353): investigate failures on API 28
-  @SdkSuppress(minSdkVersion = 16, maxSdkVersion = 27)
   public void hasBackgroundTest() {
+    // TODO(b/117557353): investigate failures on API 28
+    assumeFalse(VERSION.SDK_INT == 28);
     View viewWithBackground = new View(context);
     viewWithBackground.setBackground(context.getResources().getDrawable(R.drawable.drawable_1));
 
     assertTrue(hasBackground(R.drawable.drawable_1).matches(viewWithBackground));
   }
 
-
   @Test
   @UiThreadTest
   public void withInputType_ReturnsTrueIf_CorrectInput() {
@@ -1114,10 +1112,6 @@ public Resources getResources() {
 
   @Test
   public void withResourceName_mismatchDescription_generatedId() {
-    if (VERSION.SDK_INT < 17) {
-      // View.generateViewId() is only available on SDK 17+.
-      return;
-    }
     View view = new View(context);
     view.setId(View.generateViewId());
     assertThat(
diff --git a/espresso/core/javatests/androidx/test/espresso/proto/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/proto/BUILD.bazel
deleted file mode 100644
index 7868fe585..000000000
--- a/espresso/core/javatests/androidx/test/espresso/proto/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-# Protocol buffer definitions for any proto transformers. Only used in tests!
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"],
-)
-
-proto_library(
-    name = "test_protos",
-    srcs = ["test_protos.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "test_protos_android_pb3",
-    deps = [
-        ":test_protos",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/BUILD b/espresso/core/javatests/androidx/test/espresso/remote/BUILD
new file mode 100644
index 000000000..f3ae28a1d
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/remote/BUILD
@@ -0,0 +1,76 @@
+# Description:
+#   Tests for espresso remote classes
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "util",
+    srcs = [
+        "StubRootMatcher.java",
+        "TestTypeRemoteMessage.java",
+        "TestTypes.java",
+    ],
+    visibility = ["//espresso/remote/javatests/androidx/test/espresso:__subpackages__"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ConstructorInvocationTest",
+    srcs =
+        ["ConstructorInvocationTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "MethodInvocationTest",
+    srcs =
+        ["MethodInvocationTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/remote/BUILD.bazel
deleted file mode 100644
index 92c2d3191..000000000
--- a/espresso/core/javatests/androidx/test/espresso/remote/BUILD.bazel
+++ /dev/null
@@ -1,80 +0,0 @@
-# Helper artifacts for espresso remote tests
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-package(default_visibility = ["//espresso/core/java/androidx/test/espresso:espresso_pkg"])
-
-UTIL_SRCS = [
-    "RemoteDescriptorRegistryInitializer.java",
-    "StubRootMatcher.java",
-    "TestTypes.java",
-    "TestTypeRemoteMessage.java",
-]
-
-android_library(
-    name = "util",
-    srcs = UTIL_SRCS,
-    deps = [
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/remote",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["*.java"],
-        exclude = UTIL_SRCS,
-    ),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        ":util",
-        "//core",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/action:remote_view_actions",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/assertion:remote_view_assertions",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_view_matchers",
-        "//espresso/core/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
-        "//espresso/core/java/androidx/test/espresso/remote",
-        "//espresso/core/java/androidx/test/espresso/remote:bindable",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/TestTypes.java b/espresso/core/javatests/androidx/test/espresso/remote/TestTypes.java
index 95ef9ad6d..f4dd97bfe 100644
--- a/espresso/core/javatests/androidx/test/espresso/remote/TestTypes.java
+++ b/espresso/core/javatests/androidx/test/espresso/remote/TestTypes.java
@@ -22,13 +22,13 @@
 import androidx.test.espresso.web.model.Atom;
 import androidx.test.espresso.web.model.ElementReference;
 import androidx.test.espresso.web.model.Evaluation;
-import com.google.common.base.Objects;
-import com.google.common.collect.Lists;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Collection of test classes for testing proto serialization using {@link EspressoRemoteMessage}
@@ -48,7 +48,7 @@ public final class TestTypes {
   static final TestType A_TEST_TYPE3 = new TestType(TEST_TYPE_STRING3);
   static final TestType A_TEST_TYPE4 = new TestType(TEST_TYPE_STRING4);
   static final Iterable<TestType> ANY_TYPE_ITERABLE =
-      Lists.newArrayList(A_TEST_TYPE1, A_TEST_TYPE2, A_TEST_TYPE3, A_TEST_TYPE4);
+      Arrays.asList(A_TEST_TYPE1, A_TEST_TYPE2, A_TEST_TYPE3, A_TEST_TYPE4);
 
   private TestTypes() {
     // no instance
@@ -89,14 +89,14 @@ public boolean equals(Object o) {
       return aByte == that.aByte
           && anInt == that.anInt
           && aLong == that.aLong
-          && Objects.equal(aString, that.aString)
-          && Objects.equal(anyRegisteredType, that.anyRegisteredType)
-          && Objects.equal(anyTypeIterable, that.anyTypeIterable);
+          && Objects.equals(aString, that.aString)
+          && Objects.equals(anyRegisteredType, that.anyRegisteredType)
+          && Objects.equals(anyTypeIterable, that.anyTypeIterable);
     }
 
     @Override
     public int hashCode() {
-      return Objects.hashCode(aByte, anInt, aLong, aString, anyRegisteredType, anyTypeIterable);
+      return Objects.hash(aByte, anInt, aLong, aString, anyRegisteredType, anyTypeIterable);
     }
   }
 
diff --git a/espresso/core/javatests/androidx/test/espresso/screenshot/ViewInteractionCaptureJavaTest.java b/espresso/core/javatests/androidx/test/espresso/screenshot/ViewInteractionCaptureJavaTest.java
new file mode 100644
index 000000000..ab2d92a16
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/screenshot/ViewInteractionCaptureJavaTest.java
@@ -0,0 +1,33 @@
+package androidx.test.espresso.screenshot;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.graphics.Bitmap;
+import androidx.test.core.graphics.BitmapStorage;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.ui.app.MainActivity;
+import java.io.IOException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** A simple scuba test to ensure captureToImage works from hjava */
+@RunWith(AndroidJUnit4.class)
+public class ViewInteractionCaptureJavaTest {
+
+  @Rule
+  public ActivityScenarioRule<MainActivity> activityScenarioRule =
+      new ActivityScenarioRule<>(MainActivity.class);
+
+  @Test
+  public void viewInteractionCapture() throws IOException {
+    Bitmap bitmap = ViewInteractionCapture.captureToBitmap(onView(isRoot()));
+
+    assertThat(bitmap).isNotNull();
+
+    BitmapStorage.writeToTestStorage(bitmap, "viewInteractionCapture");
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/util/BUILD b/espresso/core/javatests/androidx/test/espresso/util/BUILD
new file mode 100644
index 000000000..3bf536e45
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/util/BUILD
@@ -0,0 +1,68 @@
+# Description:
+#   Tests for espresso util classes
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "HumanReadablesTest_android",
+    srcs = ["HumanReadablesTest.java"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "TreeIterablesTest",
+    srcs = ["TreeIterablesTest.java"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
+    ],
+)
+
+axt_android_library_test(
+    name = "TracingUtilTest",
+    srcs = ["TracingUtilTest.java"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_local_test(
+    name = "HumanReadablesTest",
+    srcs = ["HumanReadablesTest.java"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/util/BUILD.bazel b/espresso/core/javatests/androidx/test/espresso/util/BUILD.bazel
deleted file mode 100644
index cd13497a0..000000000
--- a/espresso/core/javatests/androidx/test/espresso/util/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-# Description:
-#   Tests for espresso util classes
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["*.java"]),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/core/javatests/androidx/test/espresso/util/HumanReadablesTest.java b/espresso/core/javatests/androidx/test/espresso/util/HumanReadablesTest.java
new file mode 100644
index 000000000..ea0804bdc
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/util/HumanReadablesTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.util;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.FrameLayout.LayoutParams;
+import android.widget.TextView;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit tests for {@link HumanReadables}. */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HumanReadablesTest {
+
+  @Test
+  public void describeView_layoutParamsWithObjectAddressRemoved() {
+    Context context = getInstrumentation().getContext();
+    FrameLayout parent = new FrameLayout(context);
+    TextView view = new TextView(context);
+    view.setId(42);
+    view.setText("text under test");
+    parent.addView(view);
+    view.setLayoutParams(
+        new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+    String actual = HumanReadables.describe(view);
+
+    // Expected: The typical FrameLayout$LayoutParams@12345678 is cleaned up to remove the address
+    // at the end of the instance string description.
+    assertThat(actual)
+        .isEqualTo(
+            "TextView{id=42, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+                + " has-focusable=false, has-window-focus=false, is-clickable=false,"
+                + " is-enabled=true, is-focused=false, is-focusable=false,"
+                + " is-layout-requested=true, is-selected=false,"
+                + " layout-params=android.widget.FrameLayout$LayoutParams@YYYYYY, tag=null,"
+                + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0,"
+                + " text=text under test, input-type=0, ime-target=false, has-links=false}");
+  }
+
+  @Test
+  public void describeView_layoutParamsToStringUnchanged() {
+    Context context = getInstrumentation().getContext();
+    FrameLayout parent = new FrameLayout(context);
+    TextView view = new TextView(context);
+    view.setId(42);
+    view.setText("text under test");
+    parent.addView(view);
+    view.setLayoutParams(
+        new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT) {
+          @Override
+          public String toString() {
+            return "LayoutParams@NotAnHexNumber1234";
+          }
+        });
+
+    String actual = HumanReadables.describe(view);
+
+    // Expected: The custom LayoutParams toString description is used as-is.
+    assertThat(actual)
+        .isEqualTo(
+            "TextView{id=42, visibility=VISIBLE, width=0, height=0, has-focus=false,"
+                + " has-focusable=false, has-window-focus=false, is-clickable=false,"
+                + " is-enabled=true, is-focused=false, is-focusable=false,"
+                + " is-layout-requested=true, is-selected=false,"
+                + " layout-params=LayoutParams@NotAnHexNumber1234, tag=null,"
+                + " root-is-layout-requested=true, has-input-connection=false, x=0.0, y=0.0,"
+                + " text=text under test, input-type=0, ime-target=false, has-links=false}");
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/util/TracingUtilTest.java b/espresso/core/javatests/androidx/test/espresso/util/TracingUtilTest.java
new file mode 100644
index 000000000..98e1c0824
--- /dev/null
+++ b/espresso/core/javatests/androidx/test/espresso/util/TracingUtilTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit tests for {@link TracingUtil}. */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TracingUtilTest {
+  @Test
+  public void getSpanName_nullArguments() {
+    // This utility method should be defensive and silently accept null arguments.
+    assertThat(TracingUtil.getSpanName(null, null)).isEmpty();
+    assertThat(TracingUtil.getSpanName(null, null, "")).isEmpty();
+    assertThat(TracingUtil.getSpanName("prefix", null)).isEqualTo("prefix");
+    assertThat(TracingUtil.getSpanName(null, "method")).isEqualTo("method");
+    assertThat(TracingUtil.getSpanName(null, null, "argument")).isEqualTo("(argument)");
+  }
+
+  @Test
+  public void getSpanName_separators() {
+    // The seperators should correctly connect the parts
+    assertThat(TracingUtil.getSpanName("prefix", "method")).isEqualTo("prefix.method");
+    assertThat(TracingUtil.getSpanName(null, "method", "argument")).isEqualTo("method(argument)");
+    assertThat(TracingUtil.getSpanName(null, null, "arg1", "arg2")).isEqualTo("(arg1, arg2)");
+  }
+
+  @Test
+  public void getSpanName_lengthCheck() {
+    // Long span name will be shorten.
+    assertThat(
+            TracingUtil.getSpanName(
+                null,
+                "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789_DELETE"))
+        .isEqualTo(
+            "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789");
+  }
+
+  @Test
+  public void getSpanName_excludeCheck() {
+    // Different Sanitization on different parts of the span name.
+    assertThat(TracingUtil.getSpanName("0aA._$()[]<>{} /:-\n", null)).isEqualTo("0aA._$()[] /:-");
+    assertThat(TracingUtil.getSpanName(null, "0aA._$()[]<>{} /:-\n")).isEqualTo("0aA._$()[] /:-");
+    assertThat(TracingUtil.getSpanName(null, null, "0aA._$()[]<>{} /:-\n"))
+        .isEqualTo("(0aA._$()[] /:-)");
+  }
+}
diff --git a/espresso/core/javatests/androidx/test/espresso/util/TreeIterablesTest.java b/espresso/core/javatests/androidx/test/espresso/util/TreeIterablesTest.java
index acd008308..c21c44c1b 100644
--- a/espresso/core/javatests/androidx/test/espresso/util/TreeIterablesTest.java
+++ b/espresso/core/javatests/androidx/test/espresso/util/TreeIterablesTest.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.util;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.hasEntry;
@@ -27,16 +27,15 @@
 import androidx.test.espresso.util.TreeIterables.TreeViewer;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.base.Function;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import kotlin.jvm.functions.Function1;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -51,11 +50,11 @@ public class TreeIterablesTest {
 
   private static class TestElement {
     private final String data;
-    private final ImmutableList<TestElement> children;
+    private final List<TestElement> children;
 
     public TestElement(String data, TestElement... children) {
       this.data = checkNotNull(data);
-      this.children = ImmutableList.copyOf(children);
+      this.children = Arrays.asList(children);
     }
   }
 
@@ -66,9 +65,9 @@ public Collection<TestElement> children(TestElement element) {
     }
   }
 
-  private static class TestElementStringConvertor implements Function<TestElement, String> {
+  private static class TestElementStringConvertor implements Function1<TestElement, String> {
     @Override
-    public String apply(TestElement e) {
+    public String invoke(TestElement e) {
       return e.data;
     }
   }
@@ -114,7 +113,7 @@ public void distanceRecorder_distanceKnownAfterChildrenCall() {
 
     @SuppressWarnings("unused")
     List<TestElement> createdForSideEffect =
-        Lists.newArrayList(distanceRecorder.children(complexTree));
+        new ArrayList<>(distanceRecorder.children(complexTree));
 
     assertThat(distanceRecorder.getDistance(complexTree), is(0));
     assertThat(distanceRecorder.getDistance(complexTree.children.iterator().next()), is(1));
@@ -126,8 +125,11 @@ public void complexTree_Distances() {
         new DistanceRecordingTreeViewer<TestElement>(complexTree, new TestElementTreeViewer());
     Iterable<TestElement> complexIterable =
         TreeIterables.depthFirstTraversal(complexTree, distanceRecorder);
-    Set<TestElement> complexSet = Sets.newHashSet(complexIterable);
-    Map<String, Integer> distancesByData = Maps.newHashMap();
+    Set<TestElement> complexSet = new LinkedHashSet<>();
+    for (TestElement e : complexIterable) {
+      complexSet.add(e);
+    }
+    Map<String, Integer> distancesByData = new LinkedHashMap<>();
     for (TestElement e : complexSet) {
       distancesByData.put(e.data, distanceRecorder.getDistance(e));
     }
@@ -154,31 +156,28 @@ public void complexTree_Distances() {
             hasEntry("q", 3)));
     assertThat(distancesByData.size(), is(17));
 
-    List<String> traversalOrder =
-        Lists.newArrayList(Iterables.transform(complexIterable, new TestElementStringConvertor()));
+    List<String> traversalOrder = map(complexIterable, new TestElementStringConvertor());
 
     // should be depth first if forwarding correctly.
     assertThat(
         traversalOrder,
         is(
-            (List<String>)
-                Lists.newArrayList(
-                    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
-                    "q")));
+            Arrays.asList(
+                "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
+                "q")));
   }
 
   @Test
   public void complexTraversal_depthFirst() {
     List<String> breadthFirst =
-        Lists.newArrayList(
-            Iterables.transform(
-                TreeIterables.depthFirstTraversal(complexTree, new TestElementTreeViewer()),
-                new TestElementStringConvertor()));
+        map(
+            TreeIterables.depthFirstTraversal(complexTree, new TestElementTreeViewer()),
+            new TestElementStringConvertor());
     assertThat(
         breadthFirst,
         is(
             (Iterable<String>)
-                Lists.newArrayList(
+                Arrays.asList(
                     "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p",
                     "q")));
   }
@@ -186,42 +185,38 @@ public void complexTraversal_depthFirst() {
   @Test
   public void complexTraversal_breadthFirst() {
     List<String> breadthFirst =
-        Lists.newArrayList(
-            Iterables.transform(
-                TreeIterables.breadthFirstTraversal(complexTree, new TestElementTreeViewer()),
-                new TestElementStringConvertor()));
+        map(
+            TreeIterables.breadthFirstTraversal(complexTree, new TestElementTreeViewer()),
+            new TestElementStringConvertor());
     assertThat(
         breadthFirst,
         is(
-            (List<String>)
-                Lists.newArrayList(
-                    "a", // root
-                    "b", "l", "m", "n", // L1
-                    "c", "g", "h", "o", // L2
-                    "d", "e", "i", "p", "q", // L3
-                    "f", "j", // L4
-                    "k"))); // L5
+            Arrays.asList(
+                "a", // root
+                "b", "l", "m", "n", // L1
+                "c", "g", "h", "o", // L2
+                "d", "e", "i", "p", "q", // L3
+                "f", "j", // L4
+                "k"))); // L5
   }
 
   @Test
   public void trivialTraversal_breadthFirst() {
     // essentially the same as depth first.
     List<String> breadthFirst =
-        Lists.newArrayList(
-            Iterables.transform(
-                TreeIterables.breadthFirstTraversal(trivialTree, new TestElementTreeViewer()),
-                new TestElementStringConvertor()));
-    assertThat(breadthFirst, is((List<String>) Lists.newArrayList("a", "b", "c", "d")));
+        map(
+            TreeIterables.breadthFirstTraversal(trivialTree, new TestElementTreeViewer()),
+            new TestElementStringConvertor());
+    assertThat(breadthFirst, is(Arrays.asList("a", "b", "c", "d")));
   }
 
   @Test
   public void trivialTraversal_depthFirst() {
     List<String> depthFirst =
-        Lists.newArrayList(
-            Iterables.transform(
-                TreeIterables.depthFirstTraversal(trivialTree, new TestElementTreeViewer()),
-                new TestElementStringConvertor()));
-    assertThat(depthFirst, is((List<String>) Lists.newArrayList("a", "b", "c", "d")));
+        map(
+            TreeIterables.depthFirstTraversal(trivialTree, new TestElementTreeViewer()),
+            new TestElementStringConvertor());
+    assertThat(depthFirst, is(Arrays.asList("a", "b", "c", "d")));
   }
 
   @Test
@@ -231,8 +226,11 @@ public void trivial_distance() {
 
     Iterable<TestElement> trivialIterable =
         TreeIterables.depthFirstTraversal(trivialTree, distanceRecorder);
-    Set<TestElement> trivialSet = Sets.newHashSet(trivialIterable);
-    Map<String, Integer> distancesByData = Maps.newHashMap();
+    Set<TestElement> trivialSet = new LinkedHashSet<>();
+    for (TestElement e : trivialIterable) {
+      trivialSet.add(e);
+    }
+    Map<String, Integer> distancesByData = new LinkedHashMap<>();
     for (TestElement e : trivialSet) {
       distancesByData.put(e.data, distanceRecorder.getDistance(e));
     }
@@ -242,4 +240,12 @@ public void trivial_distance() {
         allOf(hasEntry("a", 0), hasEntry("b", 1), hasEntry("c", 2), hasEntry("d", 3)));
     assertThat(distancesByData.size(), is(4));
   }
+
+  private static <T, U> List<U> map(Iterable<T> iterable, Function1<T, U> mapper) {
+    List<U> values = new ArrayList<>();
+    for (T t : iterable) {
+      values.add(mapper.invoke(t));
+    }
+    return values;
+  }
 }
diff --git a/espresso/device/BUILD b/espresso/device/BUILD
new file mode 100644
index 000000000..f248cffcf
--- /dev/null
+++ b/espresso/device/BUILD
@@ -0,0 +1,14 @@
+# Alias for androidx.test.espresso.device API library
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "device",
+    actual = "//espresso/device/java/androidx/test/espresso/device",
+    visibility = ["//visibility:public"],
+)
diff --git a/espresso/device/CHANGELOG.md b/espresso/device/CHANGELOG.md
new file mode 100644
index 000000000..15eb6a686
--- /dev/null
+++ b/espresso/device/CHANGELOG.md
@@ -0,0 +1,19 @@
+### Espresso Device {version} {:#espresso-device-{version}}
+
+{{date}}
+
+`androidx.test.espresso:espresso-device:{version}` is released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml b/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml
new file mode 100644
index 000000000..2f8935a30
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.espresso.device" >
+
+    <!-- espresso-device uses GRPC to emulator, which requires internet permissions -->
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
+
+</manifest>
\ No newline at end of file
diff --git a/espresso/device/java/androidx/test/espresso/device/BUILD b/espresso/device/java/androidx/test/espresso/device/BUILD
new file mode 100644
index 000000000..66979f882
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/BUILD
@@ -0,0 +1,98 @@
+# Description:
+#   EspressoDevice - the new Synchronized Device State Change API for Android.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+exports_files(["AndroidManifest.xml"])
+
+# Add only device packages here.
+package_group(
+    name = "device_pkg",
+    packages = ["//espresso/device/..."],
+)
+
+kt_android_library(
+    name = "device",
+    exports = [
+        ":espresso_device",
+        "//espresso/device/java/androidx/test/espresso/device/action",
+        "//espresso/device/java/androidx/test/espresso/device/filter",
+        "//espresso/device/java/androidx/test/espresso/device/rules",
+        "//espresso/device/java/androidx/test/espresso/device/sizeclass",
+    ],
+)
+
+kt_android_library(
+    name = "espresso_device",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/action",
+        "//espresso/device/java/androidx/test/espresso/device/dagger",
+        "//espresso/device/java/androidx/test/espresso/device/sizeclass",
+        "//opensource/dagger",
+        "//runner/monitor",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
+
+android_library(
+    name = "device_aar_lib",
+    custom_package = "androidx.test.espresso.device",
+    manifest = "AndroidManifest.xml",
+    visibility = ["//:__subpackages__"],
+    exports = [
+        ":espresso_device",
+        "//espresso/device/java/androidx/test/espresso/device/action",
+        "//espresso/device/java/androidx/test/espresso/device/filter",
+        "//espresso/device/java/androidx/test/espresso/device/internal/deps/emulator",
+        "//espresso/device/java/androidx/test/espresso/device/rules",
+        "//espresso/device/java/androidx/test/espresso/device/sizeclass",
+    ],
+)
+
+axt_android_aar(
+    name = "device_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.device",
+    ],
+    included_dep = ":device_aar_lib",
+    jarjar_rule =
+        "release_jarjar_rules.txt",
+    visibility = [
+        "//:__pkg__",
+    ],
+)
+
+maven_artifact(
+    name = "device_maven_artifact",
+    last_updated = "20220825000000",
+    target = ":device_aar",
+    visibility = ["//visibility:public"],
+)
+
+dackka_test(
+    name = "device_doc",
+    runtime_dep = ":device_aar_lib",
+    src_jar = ":device_aar-src.jar",
+)
+
+api_checks(
+    name = "device_api_check",
+    runtime_dep = ":device_aar_lib",
+    src_jar = ":device_aar-src.jar",
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/DeviceInteraction.kt b/espresso/device/java/androidx/test/espresso/device/DeviceInteraction.kt
new file mode 100644
index 000000000..10f866326
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/DeviceInteraction.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device
+
+import androidx.test.espresso.device.action.DeviceAction
+import androidx.test.espresso.device.action.ScreenOrientation
+import androidx.test.espresso.device.action.setBookMode as getSetBookModeDeviceAction
+import androidx.test.espresso.device.action.setClosedMode as getSetClosedModeDeviceAction
+import androidx.test.espresso.device.action.setDisplaySize as getSetDisplaySizeDeviceAction
+import androidx.test.espresso.device.action.setFlatMode as getSetFlatModeDeviceAction
+import androidx.test.espresso.device.action.setScreenOrientation as getSetScreenOrientationDeviceAction
+import androidx.test.espresso.device.action.setTabletopMode as getSetTabletopModeDeviceAction
+import androidx.test.espresso.device.sizeclass.HeightSizeClass
+import androidx.test.espresso.device.sizeclass.WidthSizeClass
+import androidx.test.internal.util.Checks.checkNotMainThread
+import androidx.test.platform.device.DeviceController
+import javax.inject.Inject
+
+/** API surface for performing device-centric operations. */
+class DeviceInteraction @Inject constructor(private val deviceController: DeviceController) {
+
+  /**
+   * Performs the given action on the test device. This method should not be called on the main
+   * thread. The calling thread is blocked until the requested device action is completed.
+   *
+   * @param action the DeviceAction to execute.
+   * @return this interaction for further perform/verification calls.
+   * @throws IllegalStateException when being invoked on the main thread.
+   */
+  fun perform(action: DeviceAction): DeviceInteraction {
+    checkNotMainThread()
+    action.perform(deviceController)
+    return this
+  }
+
+  companion object {
+    /**
+     * Set device screen to be folded with the hinge in the horizontal position. For details on
+     * foldable postures, see
+     * https://developer.android.com/guide/topics/large-screens/learn-about-foldables#foldable_postures
+     *
+     * This action is for foldable devices only. Currently only supported for tests run on Android
+     * Emulators.
+     *
+     * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real
+     *   device.
+     * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when
+     *   called on a non-foldable Emulator.
+     */
+    fun DeviceInteraction.setTabletopMode(): DeviceInteraction {
+      perform(getSetTabletopModeDeviceAction())
+      return this
+    }
+
+    /**
+     * Set device screen to be folded with the hinge in the vertical position. For details on
+     * foldable postures, see
+     * https://developer.android.com/guide/topics/large-screens/learn-about-foldables#foldable_postures
+     *
+     * This action is for foldable devices only. Currently only supported for tests run on Android
+     * Emulators.
+     *
+     * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real
+     *   device.
+     * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when
+     *   called on a non-foldable Emulator.
+     */
+    fun DeviceInteraction.setBookMode(): DeviceInteraction {
+      perform(getSetBookModeDeviceAction())
+      return this
+    }
+
+    /**
+     * Set device screen to be completely flat, like a tablet. For details on foldable postures, see
+     * https://developer.android.com/guide/topics/large-screens/learn-about-foldables#foldable_postures
+     *
+     * This action is for foldable devices only. Currently only supported for tests run on Android
+     * Emulators.
+     *
+     * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real
+     *   device.
+     * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when
+     *   called on a non-foldable Emulator.
+     */
+    fun DeviceInteraction.setFlatMode(): DeviceInteraction {
+      perform(getSetFlatModeDeviceAction())
+      return this
+    }
+
+    /**
+     * Set device screen to be closed.
+     *
+     * This action is for foldable devices only. Currently only supported for tests run on Android
+     * Emulators.
+     *
+     * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real
+     *   device.
+     * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when
+     *   called on a non-foldable Emulator.
+     */
+    fun DeviceInteraction.setClosedMode(): DeviceInteraction {
+      perform(getSetClosedModeDeviceAction())
+      return this
+    }
+
+    /**
+     * Set device's screen orientation.
+     *
+     * @param orientation the orientation to set the device to (portait or landscape)
+     */
+    fun DeviceInteraction.setScreenOrientation(orientation: ScreenOrientation): DeviceInteraction {
+      perform(getSetScreenOrientationDeviceAction(orientation))
+      return this
+    }
+
+    /**
+     * Set device's display size.
+     *
+     * @param widthSizeClass the width to set the device display to
+     * @param heightSizeClass the height to set the device display to
+     */
+    fun DeviceInteraction.setDisplaySize(
+      widthSizeClass: WidthSizeClass,
+      heightSizeClass: HeightSizeClass
+    ): DeviceInteraction {
+      perform(getSetDisplaySizeDeviceAction(widthSizeClass, heightSizeClass))
+      return this
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/EspressoDevice.kt b/espresso/device/java/androidx/test/espresso/device/EspressoDevice.kt
new file mode 100644
index 000000000..0da864abe
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/EspressoDevice.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device
+
+import androidx.test.espresso.device.dagger.DeviceHolder
+import androidx.test.espresso.device.dagger.DeviceLayerComponent
+import androidx.test.internal.util.Checks.checkNotMainThread
+
+/** Entry point for device centric operations */
+class EspressoDevice private constructor() {
+  companion object {
+    private val BASE: DeviceLayerComponent = DeviceHolder.deviceLayer()
+
+    /**
+     * Starts a {@link DeviceInteraction} fluent API call. This method is used to invoke operations
+     * that are device-centric in scope. This method should not be called on the main thread.
+     *
+     * @throws IllegalStateException when being invoked on the main thread.
+     */
+    @JvmStatic
+    fun onDevice(): DeviceInteraction {
+      checkNotMainThread()
+      return DeviceInteraction(BASE.deviceController())
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/BUILD b/espresso/device/java/androidx/test/espresso/device/action/BUILD
new file mode 100644
index 000000000..f9bab48b2
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/BUILD
@@ -0,0 +1,28 @@
+# Description:
+#  Device Actions for espresso.
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "action",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/common",
+        "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//espresso/device/java/androidx/test/espresso/device/sizeclass",
+        "//runner/monitor",
+        "@maven//:androidx_window_window",
+        "@maven//:androidx_window_window_java",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/action/BaseSingleFoldDeviceAction.kt b/espresso/device/java/androidx/test/espresso/device/action/BaseSingleFoldDeviceAction.kt
new file mode 100644
index 000000000..37c20275a
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/BaseSingleFoldDeviceAction.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.util.Log
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
+import androidx.test.espresso.device.common.getResumedActivityOrNull
+import androidx.test.espresso.device.common.isRobolectricTest
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.device.DeviceController
+import androidx.window.layout.FoldingFeature
+import androidx.window.layout.WindowInfoTracker
+import androidx.window.layout.WindowLayoutInfo
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlinx.coroutines.MainScope
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.launch
+
+/** Action to set the test device to the provided device mode. */
+internal open class BaseSingleFoldDeviceAction(
+  private val deviceMode: DeviceMode,
+  private val foldingFeatureState: FoldingFeature.State?
+) : DeviceAction {
+  protected var foldingFeatureOrientation: FoldingFeature.Orientation? = null
+
+  companion object {
+    private val TAG = BaseSingleFoldDeviceAction::class.java.simpleName
+  }
+
+  @OptIn(androidx.window.core.ExperimentalWindowApi::class)
+  override fun perform(deviceController: DeviceController) {
+    if (isRobolectricTest()) {
+      deviceController.setDeviceMode(deviceMode.getMode())
+      return
+    }
+    val activity =
+      getResumedActivityOrNull()
+        ?: throw DeviceControllerOperationException(
+          "Unable to set device mode because there are no activities in the resumed stage."
+        )
+    val latch: CountDownLatch = CountDownLatch(1)
+    val windowInfoTracker = WindowInfoTracker.getOrCreate(activity)
+
+    MainScope().launch {
+      windowInfoTracker.windowLayoutInfo(activity).distinctUntilChanged().collect {
+        windowLayoutInfo: WindowLayoutInfo ->
+        val foldingFeatures = windowLayoutInfo.displayFeatures.filterIsInstance<FoldingFeature>()
+        if (deviceMode == DeviceMode.CLOSED && foldingFeatures.isEmpty()) {
+          // When a device is in closed mode, WindowLayoutInfo returns an empty list of folding
+          // features. If the device actually has no folding features and cannot be set to closed
+          // mode (ie a non-foldable emulator), deviceController.setDeviceMode(DeviceMode.CLOSED)
+          // will throw a DeviceControllerOperationException.
+          Log.d(TAG, "Device is in the closed state.")
+          latch.countDown()
+        } else if (foldingFeatures.size != 1) {
+          // TODO(b/218872245) It is currently possible that some devices will emit an empty list
+          // before emitting a list of FoldingFeatures. Throw a DeviceControllerOperationException
+          // once this issue is fixed.
+          Log.w(
+            TAG,
+            "This device mode is only supported on devices with a single folding feature. " +
+              "${foldingFeatures.size} were found."
+          )
+        } else {
+          val foldingFeature = foldingFeatures.single()
+          if (foldingFeatureState == foldingFeature.state) {
+            Log.d(
+              TAG,
+              "FoldingFeature is in $foldingFeatureState state. WindowLayoutInfo: $windowLayoutInfo."
+            )
+            foldingFeatureOrientation = foldingFeature.orientation
+            latch.countDown()
+          }
+        }
+      }
+    }
+
+    deviceController.setDeviceMode(deviceMode.getMode())
+    latch.await(5, TimeUnit.SECONDS)
+
+    if (latch.getCount() != 0L) {
+      // If WindowLayoutInfo is not updated to the requested state within five seconds, check device
+      // state and throw DeviceControllerOperationException if the device is not in the requested
+      // state.
+      val finalDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
+      val mapOfDeviceStateNamesToIdentifiers = getMapOfDeviceStateNamesToIdentifiers()
+      val expectedDeviceState =
+        when (foldingFeatureState) {
+          FoldingFeature.State.FLAT -> "OPENED"
+          FoldingFeature.State.HALF_OPENED -> "HALF_OPENED"
+          else -> "CLOSED"
+        }
+      val currentDeviceState =
+        mapOfDeviceStateNamesToIdentifiers
+          .filterValues { finalDeviceStateIdentifier.trim().toString() == it }
+          .keys
+          .first()
+      if (expectedDeviceState != currentDeviceState) {
+        throw DeviceControllerOperationException(
+          "Device could not be set to ${deviceMode} mode. Expected device state is ${expectedDeviceState}, actual state is ${currentDeviceState}."
+        )
+      }
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/BookModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/BookModeAction.kt
new file mode 100644
index 000000000..e83da4c20
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/BookModeAction.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.content.res.Configuration
+import android.util.Log
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.isTestDeviceAnEmulator
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.device.DeviceController
+import androidx.window.layout.FoldingFeature
+
+/** Action to set the test device to be folded with the hinge in the vertical position. */
+internal class BookModeAction() :
+  BaseSingleFoldDeviceAction(DeviceMode.BOOK, FoldingFeature.State.HALF_OPENED) {
+  companion object {
+    private val TAG = BookModeAction::class.java.simpleName
+  }
+
+  override fun perform(deviceController: DeviceController) {
+    // TODO(b/203801760): Check current device mode and return if already in book mode.
+    super.perform(deviceController)
+
+    if (super.foldingFeatureOrientation == null) {
+      throw DeviceControllerOperationException(
+        "Failed to retrieve the orientation of the folding feature."
+      )
+    } else if (super.foldingFeatureOrientation != FoldingFeature.Orientation.VERTICAL) {
+      Log.d(TAG, "FoldingFeature orientation needs to be rotated.")
+      // TODO(b/296910911) On certain physical devices, changing screen orientation requires the
+      // device to be in FLAT mode. Open the fold, update orientation, and then restore the
+      // half-folded state.
+      if (!isTestDeviceAnEmulator() && getDeviceApiLevel() < 34) {
+        Log.d(TAG, "Temporarily setting device to flat mode so that device can be rotated.")
+        BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT)
+          .perform(deviceController)
+      }
+
+      val orientationToRotateTo =
+        if (
+          InstrumentationRegistry.getInstrumentation()
+            .getTargetContext()
+            .getResources()
+            .getConfiguration()
+            .orientation == Configuration.ORIENTATION_PORTRAIT
+        ) {
+          ScreenOrientation.LANDSCAPE
+        } else {
+          ScreenOrientation.PORTRAIT
+        }
+      ScreenOrientationAction(orientationToRotateTo).perform(deviceController)
+
+      if (!isTestDeviceAnEmulator()) {
+        super.perform(deviceController)
+      }
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/ClosedModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/ClosedModeAction.kt
new file mode 100644
index 000000000..6d24de660
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/ClosedModeAction.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.util.Log
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.device.DeviceController
+
+/** Action to set the test device to be closed. */
+internal class ClosedModeAction() : BaseSingleFoldDeviceAction(DeviceMode.CLOSED, null) {
+  override fun perform(deviceController: DeviceController) {
+    val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
+    if (currentDeviceStateIdentifier == getMapOfDeviceStateNamesToIdentifiers().get("CLOSED")) {
+      if (Log.isLoggable(TAG, Log.DEBUG)) {
+        Log.d(TAG, "Device is already in closed mode.")
+      }
+      return
+    }
+
+    super.perform(deviceController)
+  }
+
+  companion object {
+    private val TAG = ClosedModeAction::class.java.simpleName
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/DeviceAction.kt b/espresso/device/java/androidx/test/espresso/device/action/DeviceAction.kt
new file mode 100644
index 000000000..17a0d9881
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/DeviceAction.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import androidx.test.platform.device.DeviceController
+
+/** Responsible for performing an interaction on the given device. */
+interface DeviceAction {
+  /**
+   * Performs this action on the given device.
+   *
+   * @param deviceController the controller to use to interact with the device.
+   */
+  fun perform(deviceController: DeviceController)
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/DeviceActions.kt b/espresso/device/java/androidx/test/espresso/device/action/DeviceActions.kt
new file mode 100644
index 000000000..ba5b4fa82
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/DeviceActions.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("DeviceActions")
+
+package androidx.test.espresso.device.action
+
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import androidx.test.espresso.device.sizeclass.HeightSizeClass
+import androidx.test.espresso.device.sizeclass.WidthSizeClass
+
+/** Entry point for device action operations. */
+
+/**
+ * Set device screen to be folded with the hinge in the horizontal position. For details on foldable
+ * postures, see
+ * https://developer.android.com/guide/topics/large-screens/learn-about-foldables#foldable_postures
+ *
+ * This action is for foldable devices only. Currently only supported for tests run on Android
+ * Emulators.
+ *
+ * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real device.
+ * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when called on a non-foldable Emulator.
+ */
+fun setTabletopMode(): DeviceAction {
+  return TabletopModeAction()
+}
+
+/**
+ * Set device screen to be folded with the hinge in the vertical position. For details on foldable
+ * postures, see
+ * https://developer.android.com/guide/topics/large-screens/learn-about-foldables#foldable_postures
+ *
+ * This action is for foldable devices only. Currently only supported for tests run on Android
+ * Emulators.
+ *
+ * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real device.
+ * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when called on a non-foldable Emulator.
+ */
+fun setBookMode(): DeviceAction {
+  return BookModeAction()
+}
+
+/**
+ * Set device screen to be completely flat, like a tablet. For details on foldable postures, see
+ * https://developer.android.com/guide/topics/large-screens/learn-about-foldables#foldable_postures
+ *
+ * This action is for foldable devices only. Currently only supported for tests run on Android
+ * Emulators.
+ *
+ * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real device.
+ * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when called on a non-foldable Emulator.
+ */
+fun setFlatMode(): DeviceAction {
+  return FlatModeAction()
+}
+
+/**
+ * Set device screen to be closed.
+ *
+ * This action is for foldable devices only. Currently only supported for tests run on Android
+ * Emulators.
+ *
+ * @throws androidx.test.platform.device.UnsupportedDeviceOperationException if used on a real device.
+ * @throws androidx.test.espresso.device.controller.DeviceControllerOperationException when called on a non-foldable Emulator.
+ */
+fun setClosedMode(): DeviceAction {
+  return ClosedModeAction()
+}
+
+/**
+ * Set device's screen orientation.
+ *
+ * @param orientation the orientation to set the device to (portait or landscape)
+ */
+fun setScreenOrientation(orientation: ScreenOrientation): DeviceAction {
+  return ScreenOrientationAction(orientation)
+}
+
+/**
+ * Set device's window size.
+ *
+ * @param widthSizeClass the window width to set the device to
+ * @param heightSizeClass the window height to set the device to
+ */
+fun setDisplaySize(widthSizeClass: WidthSizeClass, heightSizeClass: HeightSizeClass): DeviceAction {
+  return DisplaySizeAction(widthDisplaySize = widthSizeClass, heightDisplaySize = heightSizeClass)
+}
+
+/** Enum for screen orientations a device can be set to. */
+enum class ScreenOrientation(private val orientation: Int) {
+  PORTRAIT(0),
+  LANDSCAPE(1);
+
+  /**
+   * Returns the orientation.
+   *
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY) fun getOrientation(): Int = orientation
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/DisplaySizeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/DisplaySizeAction.kt
new file mode 100644
index 000000000..64dddb6a7
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/DisplaySizeAction.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.app.Activity
+import android.content.res.Configuration
+import android.util.Log
+import android.view.View
+import android.view.ViewGroup
+import androidx.test.espresso.device.common.calculateCurrentDisplayWidthAndHeightPx
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.getResumedActivityOrNull
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.espresso.device.sizeclass.HeightSizeClass
+import androidx.test.espresso.device.sizeclass.WidthSizeClass
+import androidx.test.platform.device.DeviceController
+import androidx.test.platform.device.UnsupportedDeviceOperationException
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import kotlin.math.roundToInt
+
+/** Action to set the test device to the provided display size. */
+internal class DisplaySizeAction(
+  val widthDisplaySize: WidthSizeClass,
+  val heightDisplaySize: HeightSizeClass,
+) : DeviceAction {
+  override fun perform(deviceController: DeviceController) {
+    if (getDeviceApiLevel() < 24) {
+      throw UnsupportedDeviceOperationException(
+        "Setting display size is not supported on devices with APIs below 24."
+      )
+    }
+
+    val currentActivity = getResumedActivityOrNull()
+    if (currentActivity != null) {
+      val (startingWidthDp, startingHeightDp) =
+        calculateCurrentDisplayWidthAndHeightDp(currentActivity)
+      if (
+        WidthSizeClass.compute(startingWidthDp) == widthDisplaySize &&
+          HeightSizeClass.compute(startingHeightDp) == heightDisplaySize
+      ) {
+        Log.d(TAG, "Device display is already the requested size, no changes needed.")
+        return
+      }
+
+      val latch: CountDownLatch = CountDownLatch(1)
+
+      val currentActivityView: View =
+        object : View(currentActivity) {
+          override fun onConfigurationChanged(newConfig: Configuration?) {
+            super.onConfigurationChanged(newConfig)
+            val (newWidthDp, newHeightDp) = calculateCurrentDisplayWidthAndHeightDp(currentActivity)
+            if (
+              WidthSizeClass.compute(newWidthDp) == widthDisplaySize &&
+                HeightSizeClass.compute(newHeightDp) == heightDisplaySize
+            ) {
+              latch.countDown()
+            }
+          }
+        }
+      val container: ViewGroup =
+        currentActivity.getWindow().findViewById(android.R.id.content) as ViewGroup
+      currentActivity.runOnUiThread { container.addView(currentActivityView) }
+
+      val widthDpToSet = WidthSizeClass.getWidthDpInSizeClass(widthDisplaySize)
+      val heightDpToSet = HeightSizeClass.getHeightDpInSizeClass(heightDisplaySize)
+
+      executeShellCommand("wm size ${widthDpToSet}dpx${heightDpToSet}dp")
+
+      latch.await(5, TimeUnit.SECONDS)
+      currentActivity.runOnUiThread { container.removeView(currentActivityView) }
+
+      val (finalWidthDp, finalHeightDp) = calculateCurrentDisplayWidthAndHeightDp(currentActivity)
+      if (
+        WidthSizeClass.compute(finalWidthDp) != widthDisplaySize ||
+          HeightSizeClass.compute(finalHeightDp) != heightDisplaySize
+      ) {
+        // Display could not be set to the requested size, reset to starting size
+        executeShellCommand("wm size ${startingWidthDp}dpx${startingHeightDp}dp")
+        throw UnsupportedDeviceOperationException(
+          "Device could not be set to the requested display size."
+        )
+      }
+    } else {
+      throw DeviceControllerOperationException(
+        "Device could not be set to the requested display size because there are no activities in" +
+          " the resumed stage."
+      )
+    }
+  }
+
+  private fun calculateCurrentDisplayWidthAndHeightDp(activity: Activity): Pair<Int, Int> {
+    val displayPx = calculateCurrentDisplayWidthAndHeightPx()
+    val widthDp = (displayPx.first / activity.getResources().displayMetrics.density).roundToInt()
+    val heightDp = (displayPx.second / activity.getResources().displayMetrics.density).roundToInt()
+    return Pair(widthDp, heightDp)
+  }
+
+  companion object {
+    private val TAG = DisplaySizeAction::class.java.simpleName
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/FlatModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/FlatModeAction.kt
new file mode 100644
index 000000000..03d902233
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/FlatModeAction.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.util.Log
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.device.DeviceController
+import androidx.window.layout.FoldingFeature
+
+/** Action to set the test device to be completely flat, like a tablet. */
+internal class FlatModeAction() :
+  BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT) {
+  override fun perform(deviceController: DeviceController) {
+    val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
+    if (currentDeviceStateIdentifier == getMapOfDeviceStateNamesToIdentifiers().get("OPENED")) {
+      if (Log.isLoggable(TAG, Log.DEBUG)) {
+        Log.d(TAG, "Device is already in flat mode.")
+      }
+      return
+    }
+
+    super.perform(deviceController)
+  }
+
+  companion object {
+    private val TAG = FlatModeAction::class.java.simpleName
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/ScreenOrientationAction.kt b/espresso/device/java/androidx/test/espresso/device/action/ScreenOrientationAction.kt
new file mode 100644
index 000000000..147e4b9c0
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/ScreenOrientationAction.kt
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.app.Activity
+import android.content.ComponentCallbacks
+import android.content.Context
+import android.content.pm.ActivityInfo.CONFIG_ORIENTATION
+import android.content.res.Configuration
+import android.util.Log
+import androidx.test.espresso.device.common.getAccelerometerRotationSetting
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.getResumedActivityOrNull
+import androidx.test.espresso.device.common.isConfigurationChangeHandled
+import androidx.test.espresso.device.common.isRobolectricTest
+import androidx.test.espresso.device.common.setAccelerometerRotationSetting
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.device.DeviceController
+import androidx.test.runner.lifecycle.ActivityLifecycleCallback
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
+import androidx.test.runner.lifecycle.Stage
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/** Action to set the test device to the provided screen orientation. */
+internal class ScreenOrientationAction(val screenOrientation: ScreenOrientation) : DeviceAction {
+
+  /**
+   * Performs a screen rotation to the provided orientation.
+   *
+   * <p>If the device is already in the requested orientation, it's a no-op. Otherwise, the device
+   * will be set to the provided orientation.
+   *
+   * <p>Note, this method takes care of synchronization with the device and the app/activity under
+   * test after rotating the screen. Specifically, <ul>
+   * <li>if no activity is found in a RESUMED state, this method waits for the application's
+   *   orientation to change to the requested orientation. </li>
+   * <li>if the activity handles device orientation change,this method waits for the application's
+   *   orientation to change to the requested orientation, and relies on Espresso's {@code onView()}
+   *   method to ensure it synchronizes properly with the updated activity. </li>
+   * <li>if the activity doesn't handle device orientation change, it waits until the activity is
+   *   PAUSED and relies on Espresso's {@code onView()} method to ensure it synchronizes properly
+   *   with the recreated activity. </li>
+   *
+   * </ul>
+   *
+   * @param deviceController the controller to use to interact with the device.
+   */
+  override fun perform(deviceController: DeviceController) {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    if (screenOrientation == getCurrentScreenOrientation(context)) {
+      if (Log.isLoggable(TAG, Log.DEBUG)) {
+        Log.d(TAG, "Device screen is already in the requested orientation, no need to rotate.")
+      }
+      return
+    }
+
+    if (isRobolectricTest()) {
+      deviceController.setScreenOrientation(screenOrientation.getOrientation())
+      return
+    }
+
+    val currentActivity = getResumedActivityOrNull()
+    if (currentActivity == null) {
+      Log.d(TAG, "No activity was found in the RESUMED stage.")
+      throw DeviceControllerOperationException(
+        "Device could not be set to the requested screen orientation because no activity was found."
+      )
+    }
+
+    var startingAccelRotationSetting = getAccelerometerRotationSetting()
+    val currentActivityName: String? = currentActivity.localClassName
+    val configChangesHandled = currentActivity.isConfigurationChangeHandled(CONFIG_ORIENTATION)
+    val latch: CountDownLatch = CountDownLatch(1)
+    val requestedOrientation =
+      if (screenOrientation == ScreenOrientation.LANDSCAPE) Configuration.ORIENTATION_LANDSCAPE
+      else Configuration.ORIENTATION_PORTRAIT
+
+    val componentCallback =
+      object : ComponentCallbacks {
+        override fun onConfigurationChanged(newConfig: Configuration) {
+          if (newConfig.orientation == requestedOrientation) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+              Log.d(TAG, "Application's orientation was set to the requested orientation.")
+            }
+            latch.countDown()
+          }
+        }
+
+        @Deprecated("Deprecated in API 34") override fun onLowMemory() {}
+      }
+
+    val activityLifecycleCallback =
+      object : ActivityLifecycleCallback {
+        override fun onActivityLifecycleChanged(activity: Activity, stage: Stage) {
+          if (
+            activity.localClassName == currentActivityName &&
+              stage == Stage.RESUMED &&
+              activity.resources.configuration.orientation == requestedOrientation
+          ) {
+            if (Log.isLoggable(TAG, Log.DEBUG)) {
+              Log.d(TAG, "Test activity was resumed in the requested orientation.")
+            }
+            latch.countDown()
+          }
+        }
+      }
+
+    if (configChangesHandled) {
+      Log.d(TAG, "The current activity handles configuration changes.")
+      context.registerComponentCallbacks(componentCallback)
+    } else {
+      Log.d(
+        TAG,
+        "The current activity does not handle configuration changes and will be recreated when " +
+          "its orientation changes.",
+      )
+      ActivityLifecycleMonitorRegistry.getInstance().addLifecycleCallback(activityLifecycleCallback)
+    }
+
+    deviceController.setScreenOrientation(screenOrientation.getOrientation())
+    latch.await(5, TimeUnit.SECONDS)
+
+    if (configChangesHandled) {
+      context.unregisterComponentCallbacks(componentCallback)
+    } else {
+      ActivityLifecycleMonitorRegistry.getInstance()
+        .removeLifecycleCallback(activityLifecycleCallback)
+    }
+
+    // Restore accelerometer rotation setting if it was changed
+    if (
+      getDeviceApiLevel() >= 21 && startingAccelRotationSetting != getAccelerometerRotationSetting()
+    ) {
+      setAccelerometerRotationSetting(startingAccelRotationSetting)
+    }
+
+    if (getCurrentScreenOrientation(context) != screenOrientation) {
+      throw DeviceControllerOperationException(
+        "Device could not be set to the requested screen orientation."
+      )
+    }
+  }
+
+  private fun getCurrentScreenOrientation(context: Context): ScreenOrientation {
+    var currentOrientation = context.resources.configuration.orientation
+    return if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE)
+      ScreenOrientation.LANDSCAPE
+    else ScreenOrientation.PORTRAIT
+  }
+
+  companion object {
+    private val TAG = ScreenOrientationAction::class.java.simpleName
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/action/TabletopModeAction.kt b/espresso/device/java/androidx/test/espresso/device/action/TabletopModeAction.kt
new file mode 100644
index 000000000..47a7f3005
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/action/TabletopModeAction.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.action
+
+import android.content.res.Configuration
+import android.util.Log
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.isTestDeviceAnEmulator
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.device.DeviceController
+import androidx.window.layout.FoldingFeature
+
+/** Action to set the test device to be folded with the hinge in a horizontal position. */
+internal class TabletopModeAction() :
+  BaseSingleFoldDeviceAction(DeviceMode.TABLETOP, FoldingFeature.State.HALF_OPENED) {
+  companion object {
+    private val TAG = TabletopModeAction::class.java.simpleName
+  }
+
+  override fun perform(deviceController: DeviceController) {
+    // TODO(b/203801760): Check current device mode and return if already in tabletop mode.
+    super.perform(deviceController)
+
+    if (super.foldingFeatureOrientation == null) {
+      throw DeviceControllerOperationException(
+        "Unable to set device to tabletop mode because no folding features were found."
+      )
+    } else if (super.foldingFeatureOrientation != FoldingFeature.Orientation.HORIZONTAL) {
+      Log.d(TAG, "FoldingFeature orientation needs to be rotated.")
+      // TODO(b/296910911) On certain physical devices, changing screen orientation requires the
+      // device to be in FLAT mode. Open the fold, update orientation, and then restore the
+      // half-folded state.
+      if (!isTestDeviceAnEmulator() && getDeviceApiLevel() < 34) {
+        Log.d(TAG, "Temporarily setting device to flat mode so that device can be rotated.")
+        BaseSingleFoldDeviceAction(DeviceMode.FLAT, FoldingFeature.State.FLAT)
+          .perform(deviceController)
+      }
+
+      val orientationToRotateTo =
+        if (
+          InstrumentationRegistry.getInstrumentation()
+            .getTargetContext()
+            .getResources()
+            .getConfiguration()
+            .orientation == Configuration.ORIENTATION_PORTRAIT
+        ) {
+          ScreenOrientation.LANDSCAPE
+        } else {
+          ScreenOrientation.PORTRAIT
+        }
+      ScreenOrientationAction(orientationToRotateTo).perform(deviceController)
+
+      if (!isTestDeviceAnEmulator()) {
+        super.perform(deviceController)
+      }
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/api/1.0.0_internal.txt b/espresso/device/java/androidx/test/espresso/device/api/1.0.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/api/1.0.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/device/java/androidx/test/espresso/device/api/1.0.0_public.txt b/espresso/device/java/androidx/test/espresso/device/api/1.0.0_public.txt
new file mode 100644
index 000000000..ab9bb7b91
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/api/1.0.0_public.txt
@@ -0,0 +1,161 @@
+// Signature format: 3.0
+package androidx.test.espresso.device {
+
+  public final class DeviceInteraction {
+    ctor @javax.inject.Inject public DeviceInteraction(androidx.test.platform.device.DeviceController deviceController);
+    method public androidx.test.espresso.device.DeviceInteraction perform(androidx.test.espresso.device.action.DeviceAction action);
+    field public static final androidx.test.espresso.device.DeviceInteraction.Companion Companion;
+  }
+
+  public static final class DeviceInteraction.Companion {
+    method public androidx.test.espresso.device.DeviceInteraction setBookMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setClosedMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setDisplaySize(androidx.test.espresso.device.DeviceInteraction, androidx.test.espresso.device.sizeclass.WidthSizeClass widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass heightSizeClass);
+    method public androidx.test.espresso.device.DeviceInteraction setFlatMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setScreenOrientation(androidx.test.espresso.device.DeviceInteraction, androidx.test.espresso.device.action.ScreenOrientation orientation);
+    method public androidx.test.espresso.device.DeviceInteraction setTabletopMode(androidx.test.espresso.device.DeviceInteraction);
+  }
+
+  public final class EspressoDevice {
+    method public static androidx.test.espresso.device.DeviceInteraction onDevice();
+    field public static final androidx.test.espresso.device.EspressoDevice.Companion Companion;
+  }
+
+  public static final class EspressoDevice.Companion {
+    method public androidx.test.espresso.device.DeviceInteraction onDevice();
+  }
+
+}
+
+package androidx.test.espresso.device.action {
+
+  public interface DeviceAction {
+    method public void perform(androidx.test.platform.device.DeviceController deviceController);
+  }
+
+  public final class DeviceActions {
+    method public static androidx.test.espresso.device.action.DeviceAction setBookMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setClosedMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setDisplaySize(androidx.test.espresso.device.sizeclass.WidthSizeClass widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass heightSizeClass);
+    method public static androidx.test.espresso.device.action.DeviceAction setFlatMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setScreenOrientation(androidx.test.espresso.device.action.ScreenOrientation orientation);
+    method public static androidx.test.espresso.device.action.DeviceAction setTabletopMode();
+  }
+
+  public enum ScreenOrientation {
+    method public static androidx.test.espresso.device.action.ScreenOrientation valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.test.espresso.device.action.ScreenOrientation[] values();
+    enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation LANDSCAPE;
+    enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation PORTRAIT;
+  }
+
+}
+
+package androidx.test.espresso.device.controller {
+
+  public enum DeviceMode {
+    method public static androidx.test.espresso.device.controller.DeviceMode valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.test.espresso.device.controller.DeviceMode[] values();
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode BOOK;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode CLOSED;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode FLAT;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode TABLETOP;
+  }
+
+}
+
+package androidx.test.espresso.device.filter {
+
+  @java.lang.annotation.Repeatable(RequiresDeviceModes::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface RequiresDeviceMode {
+    method public abstract androidx.test.espresso.device.controller.DeviceMode mode();
+    property public abstract androidx.test.espresso.device.controller.DeviceMode mode;
+  }
+
+  @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface RequiresDisplay {
+    method public abstract androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass();
+    method public abstract androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass();
+    property public abstract androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass;
+    property public abstract androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass;
+  }
+
+}
+
+package androidx.test.espresso.device.rules {
+
+  public final class DisplaySizeRule implements org.junit.rules.TestRule {
+    ctor public DisplaySizeRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+    field public static final androidx.test.espresso.device.rules.DisplaySizeRule.Companion Companion;
+  }
+
+  public static final class DisplaySizeRule.Companion {
+  }
+
+  public final class ScreenOrientationRule implements org.junit.rules.TestRule {
+    ctor public ScreenOrientationRule(androidx.test.espresso.device.action.ScreenOrientation? defaultOrientation);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+  }
+
+  public final class SkipUnsupportedDeviceActionsRule implements org.junit.rules.TestRule {
+    ctor public SkipUnsupportedDeviceActionsRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+  }
+
+}
+
+package androidx.test.espresso.device.sizeclass {
+
+  public final class HeightSizeClass {
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass compute(int dpHeight);
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    method public static int getHeightDpInSizeClass(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass COMPACT;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion Companion;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass EXPANDED;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass MEDIUM;
+  }
+
+  public static final class HeightSizeClass.Companion {
+    method public androidx.test.espresso.device.sizeclass.HeightSizeClass compute(int dpHeight);
+    method public androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    method public int getHeightDpInSizeClass(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+  }
+
+  public enum HeightSizeClass.Companion.HeightSizeClassEnum {
+    method public final String! getDescription();
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum[] values();
+    property public final String! description;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum COMPACT;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum EXPANDED;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum MEDIUM;
+  }
+
+  public final class WidthSizeClass {
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass compute(int dpWidth);
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    method public static int getWidthDpInSizeClass(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass COMPACT;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion Companion;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass EXPANDED;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass MEDIUM;
+  }
+
+  public static final class WidthSizeClass.Companion {
+    method public androidx.test.espresso.device.sizeclass.WidthSizeClass compute(int dpWidth);
+    method public androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    method public int getWidthDpInSizeClass(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+  }
+
+  public enum WidthSizeClass.Companion.WidthSizeClassEnum {
+    method public final String! getDescription();
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum valueOf(String value) throws java.lang.IllegalArgumentException, java.lang.NullPointerException;
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum[] values();
+    property public final String! description;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum COMPACT;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum EXPANDED;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum MEDIUM;
+  }
+
+}
+
diff --git a/espresso/device/java/androidx/test/espresso/device/api/1.1.0_internal.txt b/espresso/device/java/androidx/test/espresso/device/api/1.1.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/api/1.1.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/device/java/androidx/test/espresso/device/api/1.1.0_public.txt b/espresso/device/java/androidx/test/espresso/device/api/1.1.0_public.txt
new file mode 100644
index 000000000..1023ad5bf
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/api/1.1.0_public.txt
@@ -0,0 +1,154 @@
+// Signature format: 3.0
+package androidx.test.espresso.device {
+
+  public final class DeviceInteraction {
+    ctor @javax.inject.Inject public DeviceInteraction(androidx.test.platform.device.DeviceController deviceController);
+    method public androidx.test.espresso.device.DeviceInteraction perform(androidx.test.espresso.device.action.DeviceAction action);
+    field public static final androidx.test.espresso.device.DeviceInteraction.Companion Companion;
+  }
+
+  public static final class DeviceInteraction.Companion {
+    method public androidx.test.espresso.device.DeviceInteraction setBookMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setClosedMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setDisplaySize(androidx.test.espresso.device.DeviceInteraction, androidx.test.espresso.device.sizeclass.WidthSizeClass widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass heightSizeClass);
+    method public androidx.test.espresso.device.DeviceInteraction setFlatMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setScreenOrientation(androidx.test.espresso.device.DeviceInteraction, androidx.test.espresso.device.action.ScreenOrientation orientation);
+    method public androidx.test.espresso.device.DeviceInteraction setTabletopMode(androidx.test.espresso.device.DeviceInteraction);
+  }
+
+  public final class EspressoDevice {
+    method public static androidx.test.espresso.device.DeviceInteraction onDevice();
+    field public static final androidx.test.espresso.device.EspressoDevice.Companion Companion;
+  }
+
+  public static final class EspressoDevice.Companion {
+    method public androidx.test.espresso.device.DeviceInteraction onDevice();
+  }
+
+}
+
+package androidx.test.espresso.device.action {
+
+  public interface DeviceAction {
+    method public void perform(androidx.test.platform.device.DeviceController deviceController);
+  }
+
+  public final class DeviceActions {
+    method public static androidx.test.espresso.device.action.DeviceAction setBookMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setClosedMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setDisplaySize(androidx.test.espresso.device.sizeclass.WidthSizeClass widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass heightSizeClass);
+    method public static androidx.test.espresso.device.action.DeviceAction setFlatMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setScreenOrientation(androidx.test.espresso.device.action.ScreenOrientation orientation);
+    method public static androidx.test.espresso.device.action.DeviceAction setTabletopMode();
+  }
+
+  public enum ScreenOrientation {
+    enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation LANDSCAPE;
+    enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation PORTRAIT;
+  }
+
+}
+
+package androidx.test.espresso.device.controller {
+
+  public enum DeviceMode {
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode BOOK;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode CLOSED;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode FLAT;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode TABLETOP;
+  }
+
+}
+
+package androidx.test.espresso.device.filter {
+
+  @androidx.test.filters.CustomFilter(filterClass=RequiresDeviceModeFilter::class) @java.lang.annotation.Repeatable(RequiresDeviceModes::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface RequiresDeviceMode {
+    method public abstract androidx.test.espresso.device.controller.DeviceMode mode();
+    property public abstract androidx.test.espresso.device.controller.DeviceMode mode;
+  }
+
+  @androidx.test.filters.CustomFilter(filterClass=RequiresDisplayFilter::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface RequiresDisplay {
+    method public abstract androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass();
+    method public abstract androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass();
+    property public abstract androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass;
+    property public abstract androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass;
+  }
+
+}
+
+package androidx.test.espresso.device.rules {
+
+  public final class DisplaySizeRule implements org.junit.rules.TestRule {
+    ctor public DisplaySizeRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+    field public static final androidx.test.espresso.device.rules.DisplaySizeRule.Companion Companion;
+  }
+
+  public static final class DisplaySizeRule.Companion {
+  }
+
+  public final class ScreenOrientationRule implements org.junit.rules.TestRule {
+    ctor public ScreenOrientationRule();
+    ctor public ScreenOrientationRule(androidx.test.espresso.device.action.ScreenOrientation? defaultOrientation);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+  }
+
+  public final class SkipUnsupportedDeviceActionsRule implements org.junit.rules.TestRule {
+    ctor public SkipUnsupportedDeviceActionsRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+  }
+
+}
+
+package androidx.test.espresso.device.sizeclass {
+
+  public final class HeightSizeClass {
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass compute(int dpHeight);
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    method public static int getHeightDpInSizeClass(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass COMPACT;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion Companion;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass EXPANDED;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass MEDIUM;
+  }
+
+  public static final class HeightSizeClass.Companion {
+    method public androidx.test.espresso.device.sizeclass.HeightSizeClass compute(int dpHeight);
+    method public androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    method public int getHeightDpInSizeClass(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+  }
+
+  public enum HeightSizeClass.Companion.HeightSizeClassEnum {
+    method public String getDescription();
+    property public final String description;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum COMPACT;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum EXPANDED;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum MEDIUM;
+  }
+
+  public final class WidthSizeClass {
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass compute(int dpWidth);
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    method public static int getWidthDpInSizeClass(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass COMPACT;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion Companion;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass EXPANDED;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass MEDIUM;
+  }
+
+  public static final class WidthSizeClass.Companion {
+    method public androidx.test.espresso.device.sizeclass.WidthSizeClass compute(int dpWidth);
+    method public androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    method public int getWidthDpInSizeClass(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+  }
+
+  public enum WidthSizeClass.Companion.WidthSizeClassEnum {
+    method public String getDescription();
+    property public final String description;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum COMPACT;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum EXPANDED;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum MEDIUM;
+  }
+
+}
+
diff --git a/espresso/device/java/androidx/test/espresso/device/api/current_internal.txt b/espresso/device/java/androidx/test/espresso/device/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/device/java/androidx/test/espresso/device/api/current_public.txt b/espresso/device/java/androidx/test/espresso/device/api/current_public.txt
new file mode 100644
index 000000000..1587cf734
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/api/current_public.txt
@@ -0,0 +1,162 @@
+// Signature format: 5.0
+package androidx.test.espresso.device {
+
+  public final class DeviceInteraction {
+    ctor @javax.inject.Inject public DeviceInteraction(androidx.test.platform.device.DeviceController deviceController);
+    method public androidx.test.espresso.device.DeviceInteraction perform(androidx.test.espresso.device.action.DeviceAction action);
+    field public static final androidx.test.espresso.device.DeviceInteraction.Companion Companion;
+  }
+
+  public static final class DeviceInteraction.Companion {
+    method public androidx.test.espresso.device.DeviceInteraction setBookMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setClosedMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setDisplaySize(androidx.test.espresso.device.DeviceInteraction, androidx.test.espresso.device.sizeclass.WidthSizeClass widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass heightSizeClass);
+    method public androidx.test.espresso.device.DeviceInteraction setFlatMode(androidx.test.espresso.device.DeviceInteraction);
+    method public androidx.test.espresso.device.DeviceInteraction setScreenOrientation(androidx.test.espresso.device.DeviceInteraction, androidx.test.espresso.device.action.ScreenOrientation orientation);
+    method public androidx.test.espresso.device.DeviceInteraction setTabletopMode(androidx.test.espresso.device.DeviceInteraction);
+  }
+
+  public final class EspressoDevice {
+    method public static androidx.test.espresso.device.DeviceInteraction onDevice();
+    field public static final androidx.test.espresso.device.EspressoDevice.Companion Companion;
+  }
+
+  public static final class EspressoDevice.Companion {
+    method public androidx.test.espresso.device.DeviceInteraction onDevice();
+  }
+
+}
+
+package androidx.test.espresso.device.action {
+
+  public interface DeviceAction {
+    method public void perform(androidx.test.platform.device.DeviceController deviceController);
+  }
+
+  public final class DeviceActions {
+    method public static androidx.test.espresso.device.action.DeviceAction setBookMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setClosedMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setDisplaySize(androidx.test.espresso.device.sizeclass.WidthSizeClass widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass heightSizeClass);
+    method public static androidx.test.espresso.device.action.DeviceAction setFlatMode();
+    method public static androidx.test.espresso.device.action.DeviceAction setScreenOrientation(androidx.test.espresso.device.action.ScreenOrientation orientation);
+    method public static androidx.test.espresso.device.action.DeviceAction setTabletopMode();
+  }
+
+  public enum ScreenOrientation {
+    enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation LANDSCAPE;
+    enum_constant public static final androidx.test.espresso.device.action.ScreenOrientation PORTRAIT;
+  }
+
+}
+
+package androidx.test.espresso.device.controller {
+
+  public enum DeviceMode {
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode BOOK;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode CLOSED;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode FLAT;
+    enum_constant public static final androidx.test.espresso.device.controller.DeviceMode TABLETOP;
+  }
+
+}
+
+package androidx.test.espresso.device.filter {
+
+  @androidx.test.filters.CustomFilter(filterClass=RequiresDeviceModeFilter::class) @java.lang.annotation.Repeatable(RequiresDeviceModes::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface RequiresDeviceMode {
+    ctor @KotlinOnly public RequiresDeviceMode(androidx.test.espresso.device.controller.DeviceMode mode);
+    method @InaccessibleFromKotlin public abstract androidx.test.espresso.device.controller.DeviceMode mode();
+    property public abstract androidx.test.espresso.device.controller.DeviceMode mode;
+  }
+
+  @androidx.test.filters.CustomFilter(filterClass=RequiresDisplayFilter::class) @kotlin.annotation.Retention(kotlin.annotation.AnnotationRetention.RUNTIME) @kotlin.annotation.Target(allowedTargets={kotlin.annotation.AnnotationTarget.CLASS, kotlin.annotation.AnnotationTarget.FUNCTION}) public @interface RequiresDisplay {
+    ctor @KotlinOnly public RequiresDisplay(androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass, androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass);
+    method @InaccessibleFromKotlin public abstract androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass();
+    method @InaccessibleFromKotlin public abstract androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass();
+    property public abstract androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum heightSizeClass;
+    property public abstract androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum widthSizeClass;
+  }
+
+}
+
+package androidx.test.espresso.device.rules {
+
+  public final class DisplaySizeRule implements org.junit.rules.TestRule {
+    ctor public DisplaySizeRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+    field public static final androidx.test.espresso.device.rules.DisplaySizeRule.Companion Companion;
+  }
+
+  public static final class DisplaySizeRule.Companion {
+  }
+
+  public final class ScreenOrientationRule implements org.junit.rules.TestRule {
+    ctor public ScreenOrientationRule();
+    ctor public ScreenOrientationRule(androidx.test.espresso.device.action.ScreenOrientation? defaultOrientation);
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+  }
+
+  public final class SkipUnsupportedDeviceActionsRule implements org.junit.rules.TestRule {
+    ctor public SkipUnsupportedDeviceActionsRule();
+    method public org.junit.runners.model.Statement apply(org.junit.runners.model.Statement statement, org.junit.runner.Description description);
+  }
+
+}
+
+package androidx.test.espresso.device.sizeclass {
+
+  public final class HeightSizeClass {
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass compute(int dpHeight);
+    method public static androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    method public static int getHeightDpInSizeClass(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass COMPACT;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion Companion;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass EXPANDED;
+    field public static final androidx.test.espresso.device.sizeclass.HeightSizeClass MEDIUM;
+  }
+
+  public static final class HeightSizeClass.Companion {
+    method public androidx.test.espresso.device.sizeclass.HeightSizeClass compute(int dpHeight);
+    method public androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    method public int getHeightDpInSizeClass(androidx.test.espresso.device.sizeclass.HeightSizeClass sizeClass);
+    property public androidx.test.espresso.device.sizeclass.HeightSizeClass COMPACT;
+    property public androidx.test.espresso.device.sizeclass.HeightSizeClass EXPANDED;
+    property public androidx.test.espresso.device.sizeclass.HeightSizeClass MEDIUM;
+  }
+
+  public enum HeightSizeClass.Companion.HeightSizeClassEnum {
+    method @InaccessibleFromKotlin public String getDescription();
+    property public String description;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum COMPACT;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum EXPANDED;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum MEDIUM;
+  }
+
+  public final class WidthSizeClass {
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass compute(int dpWidth);
+    method public static androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    method public static int getWidthDpInSizeClass(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass COMPACT;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion Companion;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass EXPANDED;
+    field public static final androidx.test.espresso.device.sizeclass.WidthSizeClass MEDIUM;
+  }
+
+  public static final class WidthSizeClass.Companion {
+    method public androidx.test.espresso.device.sizeclass.WidthSizeClass compute(int dpWidth);
+    method public androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum getEnum(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    method public int getWidthDpInSizeClass(androidx.test.espresso.device.sizeclass.WidthSizeClass sizeClass);
+    property public androidx.test.espresso.device.sizeclass.WidthSizeClass COMPACT;
+    property public androidx.test.espresso.device.sizeclass.WidthSizeClass EXPANDED;
+    property public androidx.test.espresso.device.sizeclass.WidthSizeClass MEDIUM;
+  }
+
+  public enum WidthSizeClass.Companion.WidthSizeClassEnum {
+    method @InaccessibleFromKotlin public String getDescription();
+    property public String description;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum COMPACT;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum EXPANDED;
+    enum_constant public static final androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum MEDIUM;
+  }
+
+}
+
diff --git a/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt
new file mode 100644
index 000000000..0b7a9e8bf
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/AccelerometerRotationUtil.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("AccelerometerRotationUtil")
+
+package androidx.test.espresso.device.common
+
+import android.os.Build
+import android.os.Handler
+import android.os.HandlerThread
+import android.provider.Settings
+import androidx.annotation.RequiresApi
+import androidx.annotation.RestrictTo
+import androidx.test.platform.app.InstrumentationRegistry
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun getAccelerometerRotationSetting(): AccelerometerRotation =
+  if (
+    Settings.System.getInt(
+      InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver(),
+      Settings.System.ACCELEROMETER_ROTATION,
+      0
+    ) == 1
+  ) {
+    AccelerometerRotation.ENABLED
+  } else {
+    AccelerometerRotation.DISABLED
+  }
+
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun setAccelerometerRotationSetting(accelerometerRotation: AccelerometerRotation) {
+  val context = InstrumentationRegistry.getInstrumentation().getTargetContext()
+  val settingsLatch: CountDownLatch = CountDownLatch(1)
+  val thread: HandlerThread = HandlerThread("Observer_Thread")
+  thread.start()
+  val runnableHandler: Handler = Handler(thread.getLooper())
+  val settingsObserver: SettingsObserver =
+    SettingsObserver(
+      runnableHandler,
+      context,
+      settingsLatch,
+      Settings.System.ACCELEROMETER_ROTATION
+    )
+  settingsObserver.observe()
+  executeShellCommand("settings put system accelerometer_rotation ${accelerometerRotation.value}")
+  settingsLatch.await(5, TimeUnit.SECONDS)
+  settingsObserver.stopObserver()
+  thread.quitSafely()
+}
+
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+enum class AccelerometerRotation(val value: Int) {
+  DISABLED(0),
+  ENABLED(1)
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/common/ActivityUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/ActivityUtil.kt
new file mode 100644
index 000000000..efdb34a96
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/ActivityUtil.kt
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("ActivityUtil")
+
+package androidx.test.espresso.device.common
+
+import android.app.Activity
+import android.util.Log
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.runner.lifecycle.ActivityLifecycleCallback
+import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry
+import androidx.test.runner.lifecycle.Stage
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/** Collection of utility methods for interacting with activities. */
+private const val TAG = "ActivityUtil"
+
+/**
+ * Detects if configuration changes are handled by the activity.
+ *
+ * @param configBit, bit in ActivityInfo#configChanges that indicates whether the activity can
+ *   handle this type of configuration change.
+ * @return whether the activity handles the given configuration change.
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+fun Activity.isConfigurationChangeHandled(configBit: Int): Boolean {
+  val activityInfo = this.packageManager.getActivityInfo(this.componentName, 0)
+  return (activityInfo.configChanges and configBit) != 0
+}
+
+/**
+ * Returns the first activity found in the RESUMED stage, or null if none are found after waiting up
+ * to two seconds for one.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun getResumedActivityOrNull(): Activity? {
+  var activity: Activity? = null
+  InstrumentationRegistry.getInstrumentation().runOnMainSync {
+    run {
+      val activities: Collection<Activity> =
+        ActivityLifecycleMonitorRegistry.getInstance().getActivitiesInStage(Stage.RESUMED)
+      if (activities.size > 1) {
+        val activityNames = activities.map { it.localClassName }
+        Log.d(
+          TAG,
+          "More than one activity was found in the RESUMED stage. Activities found: $activityNames",
+        )
+        activity = activities.first()
+      } else if (activities.isEmpty()) {
+        Log.d(TAG, "No activity found in the RESUMED stage. Waiting up to 2 seconds for one.")
+        val latch = CountDownLatch(1)
+        val callback =
+          object : ActivityLifecycleCallback {
+            override fun onActivityLifecycleChanged(newActivity: Activity, stage: Stage) {
+              if (stage == Stage.RESUMED) {
+                Log.d(TAG, "Found ${newActivity.localClassName} in the RESUMED stage.")
+                latch.countDown()
+                activity = newActivity
+              }
+            }
+          }
+        ActivityLifecycleMonitorRegistry.getInstance().addLifecycleCallback(callback)
+        latch.await(2, TimeUnit.SECONDS)
+        ActivityLifecycleMonitorRegistry.getInstance().removeLifecycleCallback(callback)
+      } else {
+        activity = activities.elementAtOrNull(0)
+      }
+    }
+  }
+  InstrumentationRegistry.getInstrumentation().waitForIdleSync()
+  return activity
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/common/BUILD b/espresso/device/java/androidx/test/espresso/device/common/BUILD
new file mode 100644
index 000000000..1527bd4df
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/BUILD
@@ -0,0 +1,26 @@
+# Description:
+#  Espresso Device shared utils
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "common",
+    srcs = glob([
+        "*.kt",
+        "*.java",
+    ]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt
new file mode 100644
index 000000000..02330e329
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/DeviceUtil.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("DeviceUtil")
+
+package androidx.test.espresso.device.common
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.annotation.RestrictTo
+import java.util.regex.Pattern
+
+/** Collection of utility methods for getting information about the test device. */
+
+/**
+ * Detects if the test is running on an emulator or a real device using some heuristics based on the
+ * device properties.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun isTestDeviceAnEmulator(): Boolean {
+  val qemu: String? = System.getProperty("ro.kernel.qemu", "?")
+  return qemu.equals("1") ||
+    Build.HARDWARE.contains("goldfish") ||
+    Build.HARDWARE.contains("ranchu")
+}
+
+/**
+ * Detects if the test is running on Robolectric using some heuristics based on the device
+ * properties.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun isRobolectricTest(): Boolean {
+  return Build.FINGERPRINT.equals("robolectric")
+}
+
+/**
+ * Returns the API level of the current test device.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun getDeviceApiLevel(): Int {
+  return Build.VERSION.SDK_INT
+}
+
+/**
+ * Maps device state names to identifiers by processing the output of "device_state print-states"
+ *
+ * The output of "cmd device_state print-states" contains names and identifiers of supported device
+ * states, as shown below.
+ * [ DeviceState{identifier=1, name='CLOSED'}, DeviceState{identifier=2, name='HALF_OPENED'}, DeviceState{identifier=3, name='OPENED'}, ]
+ * This method returns a map where the keys are the device state names and the values are the device
+ * state identifiers.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun getMapOfDeviceStateNamesToIdentifiers(): MutableMap<String, String> {
+  if (getDeviceApiLevel() < 24) {
+    // Executing shell commands requires API 24+. There are no foldable devices with API 23 or
+    // below, so return an empty map.
+    return mutableMapOf()
+  }
+  val deviceStateNameToIdentifier: MutableMap<String, String> = mutableMapOf()
+  // Regex pattern that matches supported states, e.g. DeviceState{identifier=1, name='CLOSED',
+  // app_accessible=true}
+  val DEVICE_STATE_PATTERN_EXTRA_PARAMS: Pattern =
+    Pattern.compile("DeviceState\\{identifier=(?<identifier>\\d+), name='(?<name>\\w+?)'.+?\\}")
+  // Regex pattern that matches supported states, e.g. DeviceState{identifier=1, name='CLOSED'}
+  val DEVICE_STATE_PATTERN_NO_EXTRA_PARAMS: Pattern =
+    Pattern.compile("DeviceState\\{identifier=(?<identifier>\\d+), name='(?<name>\\w+?)'\\}")
+  val supportedDeviceStates = listOf("CLOSED", "HALF_OPENED", "OPENED")
+
+  val printedStates = executeShellCommand("cmd device_state print-states")
+  val lines = printedStates.split("\n")
+  for (line in lines) {
+    val matcherExtraParams = DEVICE_STATE_PATTERN_EXTRA_PARAMS.matcher(line)
+    val matcherNoExtraParams = DEVICE_STATE_PATTERN_NO_EXTRA_PARAMS.matcher(line)
+    var deviceStateName: String? = null
+    var deviceStateIdentifier: String? = null
+    if (matcherExtraParams.find()) {
+      deviceStateName = matcherExtraParams.group("name")
+      deviceStateIdentifier = matcherExtraParams.group("identifier")
+    } else if (matcherNoExtraParams.find()) {
+      deviceStateName = matcherNoExtraParams.group("name")
+      deviceStateIdentifier = matcherNoExtraParams.group("identifier")
+    }
+    if (
+      deviceStateName != null &&
+        deviceStateIdentifier != null &&
+        deviceStateName in supportedDeviceStates
+    ) {
+      deviceStateNameToIdentifier.put(deviceStateName, deviceStateIdentifier)
+    }
+  }
+  return deviceStateNameToIdentifier
+}
+
+/**
+ * Returns a Pair containing the current width and height of the test device in pixels
+ *
+ * @hide
+ */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+fun calculateCurrentDisplayWidthAndHeightPx(): Pair<Int, Int> {
+  // "wm size" will output a string with the format
+  // "Physical size: WxH
+  //  Override size: WxH"
+  val output = executeShellCommand("wm size")
+
+  var subStringToFind = "Override size: "
+  if (output.contains(subStringToFind)) {
+    val displaySizes =
+      output.substring(output.indexOf(subStringToFind) + subStringToFind.length).trim().split("x")
+    val widthPx = displaySizes.get(0).toInt()
+    val heightPx = displaySizes.get(1).toInt()
+    return Pair(widthPx, heightPx)
+  } else {
+    // If the display size has not been overriden, the "wm size" output will only contain physical
+    // size
+    subStringToFind = "Physical size: "
+    val displaySizes =
+      output.substring(output.indexOf(subStringToFind) + subStringToFind.length).trim().split("x")
+    val widthPx = displaySizes.get(0).toInt()
+    val heightPx = displaySizes.get(1).split("\n").get(0).toInt()
+    return Pair(widthPx, heightPx)
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/common/SettingsObserver.kt b/espresso/device/java/androidx/test/espresso/device/common/SettingsObserver.kt
new file mode 100644
index 000000000..8bb6bdb13
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/SettingsObserver.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.common
+
+import android.content.ContentResolver
+import android.content.Context
+import android.database.ContentObserver
+import android.os.Handler
+import android.provider.Settings.System
+import java.util.concurrent.CountDownLatch
+
+class SettingsObserver(
+  handler: Handler,
+  val context: Context,
+  val latch: CountDownLatch,
+  val settingToObserve: String
+) : ContentObserver(handler) {
+  fun observe() {
+    val resolver: ContentResolver = context.getContentResolver()
+    resolver.registerContentObserver(System.getUriFor(settingToObserve), false, this)
+  }
+
+  fun stopObserver() {
+    val resolver: ContentResolver = context.getContentResolver()
+    resolver.unregisterContentObserver(this)
+  }
+
+  override fun onChange(selfChange: Boolean) {
+    latch.countDown()
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt b/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt
new file mode 100644
index 000000000..7bc89cca0
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/UiAutomationUtil.kt
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+@file:JvmName("UiAutomationUtil")
+
+package androidx.test.espresso.device.common
+
+import android.os.Build
+import android.os.ParcelFileDescriptor.AutoCloseInputStream
+import androidx.annotation.RequiresApi
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import androidx.test.platform.app.InstrumentationRegistry
+import java.nio.charset.Charset
+
+/** Collection of utility methods using UiAutomation APIs */
+
+/**
+ * Executes shell command and returns any stdout output
+ *
+ * @param command the shell command to execute
+ * @return stdout output
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+fun executeShellCommand(command: String): String {
+  val parcelFileDescriptor =
+    InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(command)
+  val output: String
+  AutoCloseInputStream(parcelFileDescriptor).use { inputStream ->
+    output = inputStream.readBytes().toString(Charset.defaultCharset())
+  }
+  return output
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/common/package-info.java b/espresso/device/java/androidx/test/espresso/device/common/package-info.java
new file mode 100644
index 000000000..22f409547
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/common/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.device.common;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/BUILD
new file mode 100644
index 000000000..c85e1fa9e
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/BUILD
@@ -0,0 +1,39 @@
+# Description:
+#  Device controller
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "controller",
+    srcs = [
+        "DeviceControllerOperationException.kt",
+        "DeviceMode.kt",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//opensource/androidx:annotation",
+    ],
+)
+
+kt_android_library(
+    name = "controller_impl",
+    srcs = [
+        "PhysicalDeviceController.kt",
+    ],
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/common",
+        "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/DeviceControllerOperationException.kt b/espresso/device/java/androidx/test/espresso/device/controller/DeviceControllerOperationException.kt
new file mode 100644
index 000000000..459f860a2
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/DeviceControllerOperationException.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.controller
+
+import androidx.annotation.RestrictTo
+import androidx.test.espresso.EspressoException
+
+/**
+ * An exception which indicates that an error occured during a device controller operation.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+class DeviceControllerOperationException : RuntimeException, EspressoException {
+  constructor(description: String) : super(description)
+
+  constructor(description: String, cause: Throwable) : super(description, cause)
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/DeviceMode.kt b/espresso/device/java/androidx/test/espresso/device/controller/DeviceMode.kt
new file mode 100644
index 000000000..0e1069d84
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/DeviceMode.kt
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.controller
+
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+
+/**
+ * Enum for modes a foldable device can be set to.
+ *
+ * For more information on foldable device postures, see
+ * https://developer.android.com/guide/topics/large-screens/learn-about-foldables
+ */
+enum class DeviceMode(private val mode: Int) {
+  // the device screen is completely flat, like a tablet
+  FLAT(0),
+  // the device is folded with the hinge in a horizontal position
+  TABLETOP(1),
+  // the device is folded with the hinge in a vertical position
+  BOOK(2),
+  // the device screen is closed
+  CLOSED(3);
+
+  /**
+   * Returns the mode.
+   *
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY) fun getMode(): Int = mode
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt b/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt
new file mode 100644
index 000000000..d4363d35e
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/PhysicalDeviceController.kt
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.controller
+
+import android.os.Handler
+import android.os.HandlerThread
+import android.provider.Settings.System
+import android.util.Log
+import android.view.Surface
+import androidx.annotation.RestrictTo
+import androidx.test.espresso.device.common.AccelerometerRotation
+import androidx.test.espresso.device.common.SettingsObserver
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.common.getAccelerometerRotationSetting
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.getMapOfDeviceStateNamesToIdentifiers
+import androidx.test.espresso.device.common.setAccelerometerRotationSetting
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.device.DeviceController
+import androidx.test.platform.device.UnsupportedDeviceOperationException
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+/**
+ * Implementation of {@link DeviceController} for tests run on a physical device.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+class PhysicalDeviceController() : DeviceController {
+  override fun setDeviceMode(deviceMode: Int) {
+    val deviceIdentifiersMap = getMapOfDeviceStateNamesToIdentifiers()
+    if (deviceMode == DeviceMode.FLAT.getMode()) {
+      if (deviceIdentifiersMap.containsKey("OPENED")) {
+        setDeviceState(deviceIdentifiersMap.get("OPENED")!!)
+      } else {
+        throw UnsupportedDeviceOperationException("Flat mode is not supported on this device.")
+      }
+    } else if (
+      deviceMode == DeviceMode.TABLETOP.getMode() || deviceMode == DeviceMode.BOOK.getMode()
+    ) {
+      if (deviceIdentifiersMap.containsKey("HALF_OPENED")) {
+        setDeviceState(deviceIdentifiersMap.get("HALF_OPENED")!!)
+      } else {
+        val deviceModeString =
+          if (deviceMode == DeviceMode.TABLETOP.getMode()) "Tabletop" else "Book"
+        throw UnsupportedDeviceOperationException(
+          "${deviceModeString} mode is not supported on this device."
+        )
+      }
+    } else if (deviceMode == DeviceMode.CLOSED.getMode()) {
+      if (deviceIdentifiersMap.containsKey("CLOSED")) {
+        setDeviceState(deviceIdentifiersMap.get("CLOSED")!!)
+      } else {
+        throw UnsupportedDeviceOperationException("Closed mode is not supported on this device.")
+      }
+    } else {
+      throw UnsupportedDeviceOperationException("The requested device mode is not supported.")
+    }
+  }
+
+  override fun setScreenOrientation(screenOrientation: Int) {
+    // Executing shell commands requires API 21+
+    if (getDeviceApiLevel() < 21) {
+      throw UnsupportedDeviceOperationException(
+        "Setting screen orientation is not suported on physical devices with APIs below 21."
+      )
+    }
+
+    // TODO(b/296910911) Support setting screen orientation on API 33- folded devices
+    val supportedDeviceStates = getMapOfDeviceStateNamesToIdentifiers()
+    if (supportedDeviceStates.isNotEmpty() && getDeviceApiLevel() < 34) {
+      val currentDeviceStateIdentifier = executeShellCommand("cmd device_state print-state").trim()
+      if (currentDeviceStateIdentifier != getMapOfDeviceStateNamesToIdentifiers().get("OPENED")) {
+        throw UnsupportedDeviceOperationException(
+          "Setting screen orientation is not suported on physical foldable devices API 33- that are not in flat mode."
+        )
+      }
+    }
+
+    // System user_rotation values must be one of the Surface rotation constants and these values
+    // can indicate different orientations on different devices, since we check if the device is
+    // already in correct orientation in ScreenOrientationAction, set user_rotation to its opposite
+    // here to rotate the device to the opposite orientation
+    val startingUserRotation =
+      executeShellCommand("settings get system user_rotation").trim().toInt()
+    val userRotationToSet =
+      if (
+        startingUserRotation == Surface.ROTATION_0 || startingUserRotation == Surface.ROTATION_270
+      ) {
+        Surface.ROTATION_90
+      } else {
+        Surface.ROTATION_0
+      }
+
+    // Setting screen orientation with the USER_ROTATION setting requires ACCELEROMETER_ROTATION to
+    // be disabled
+    if (getAccelerometerRotationSetting() != AccelerometerRotation.DISABLED) {
+      Log.d(TAG, "Disabling auto-rotate.")
+      setAccelerometerRotationSetting(AccelerometerRotation.DISABLED)
+    }
+
+    val settingsLatch: CountDownLatch = CountDownLatch(1)
+    val thread: HandlerThread = HandlerThread("Observer_Thread")
+    thread.start()
+    val runnableHandler: Handler = Handler(thread.getLooper())
+    val context = InstrumentationRegistry.getInstrumentation().getTargetContext()
+    val settingsObserver: SettingsObserver =
+      SettingsObserver(runnableHandler, context, settingsLatch, System.USER_ROTATION)
+    settingsObserver.observe()
+    executeShellCommand("settings put system user_rotation ${userRotationToSet}")
+    settingsLatch.await(5, TimeUnit.SECONDS)
+    settingsObserver.stopObserver()
+    thread.quitSafely()
+
+    if (
+      executeShellCommand("settings get system user_rotation").trim().toInt() != userRotationToSet
+    ) {
+      throw DeviceControllerOperationException(
+        "Device could not be set to the requested screen orientation."
+      )
+    }
+  }
+
+  private fun setDeviceState(deviceIdentifier: String) {
+    executeShellCommand("cmd device_state state ${deviceIdentifier}")
+  }
+
+  companion object {
+    private val TAG = PhysicalDeviceController::class.java.simpleName
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD b/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD
new file mode 100644
index 000000000..18fb6369c
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/BUILD
@@ -0,0 +1,31 @@
+# Description:
+#  Emulator controller
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "emulator",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/action",
+        "//espresso/device/java/androidx/test/espresso/device/common",
+        "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//opensource/androidx:annotation",
+        "//opensource/emulator/proto:emulator_controller_java_grpc",
+        "//opensource/emulator/proto:emulator_controller_java_proto_lite",
+        "//runner/monitor",
+        "@@grpc-java~//core",
+        "@@grpc-java~//okhttp:okhttp",
+        "@@grpc-java~//stub",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt
new file mode 100644
index 000000000..9a735d742
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorController.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.controller.emulator
+
+import android.Manifest.permission
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.os.Process
+import android.util.Log
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import androidx.test.espresso.device.action.ScreenOrientation
+import androidx.test.espresso.device.common.AccelerometerRotation
+import androidx.test.espresso.device.common.getAccelerometerRotationSetting
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.setAccelerometerRotationSetting
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import androidx.test.platform.device.DeviceController
+import androidx.test.platform.device.UnsupportedDeviceOperationException
+import com.android.emulator.control.EmulatorControllerGrpc
+import com.android.emulator.control.ParameterValue
+import com.android.emulator.control.PhysicalModelValue
+import com.android.emulator.control.Posture
+import com.android.emulator.control.Posture.PostureValue
+import io.grpc.StatusRuntimeException
+
+/**
+ * Implementation of {@link DeviceController} for tests run on an Emulator.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+class EmulatorController
+constructor(
+  private val emulatorControllerStub: EmulatorControllerGrpc.EmulatorControllerBlockingStub
+) : DeviceController {
+  companion object {
+    private val TAG = EmulatorController::class.java.simpleName
+    private const val DEGREES_TO_ROTATE_LANDSCAPE_TO_PORTRAIT = -90F
+    private const val DEGREES_TO_ROTATE_PORTRAIT_TO_LANDSCAPE = 90F
+    private const val additionalSetUpInstructions =
+      " See https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api for setup instructions."
+  }
+
+  override fun setDeviceMode(deviceMode: Int) {
+    if (
+      !(deviceMode == DeviceMode.FLAT.getMode() ||
+        deviceMode == DeviceMode.TABLETOP.getMode() ||
+        deviceMode == DeviceMode.BOOK.getMode() ||
+        deviceMode == DeviceMode.CLOSED.getMode())
+    ) {
+      throw UnsupportedDeviceOperationException(
+        "The provided device mode is not supported on this device."
+      )
+    }
+
+    val postureValue: PostureValue =
+      if (deviceMode == DeviceMode.FLAT.getMode()) {
+        PostureValue.POSTURE_OPENED
+      } else if (deviceMode == DeviceMode.CLOSED.getMode()) {
+        PostureValue.POSTURE_CLOSED
+      } else {
+        PostureValue.POSTURE_HALF_OPENED
+      }
+    val posture: Posture = Posture.newBuilder().setValue(postureValue).build()
+    checkInternetPermission()
+    try {
+      emulatorControllerStub.setPosture(posture)
+    } catch (e: StatusRuntimeException) {
+      throw DeviceControllerOperationException(
+        "Failed to set device mode. Please make sure the connected Emulator is foldable, the Android Emulator version" +
+          " is updated to 33.1.11+, and the controller gRPC service is enabled on the emulator" +
+          additionalSetUpInstructions,
+        e,
+      )
+    }
+  }
+
+  override fun setScreenOrientation(orientation: Int) {
+    // Enable auto-rotate if it is disabled
+    if (getAccelerometerRotationSetting() != AccelerometerRotation.ENABLED) {
+      // Executing shell commands requires API 21+.
+      if (getDeviceApiLevel() >= 21) {
+        Log.d(TAG, "Enabling auto-rotate.")
+        setAccelerometerRotationSetting(AccelerometerRotation.ENABLED)
+      } else {
+        throw UnsupportedDeviceOperationException(
+          "Screen orientation cannot be set on this device because auto-rotate is disabled. Please manually enable auto-rotate and try again."
+        )
+      }
+    }
+
+    checkInternetPermission()
+
+    try {
+      val physicalModelValue: PhysicalModelValue =
+        emulatorControllerStub.getPhysicalModel(
+          PhysicalModelValue.newBuilder()
+            .setTarget(PhysicalModelValue.PhysicalType.ROTATION)
+            .build()
+        )
+      val rotation: ParameterValue = physicalModelValue.getValue()
+      val startingRotationDegrees = rotation.getDataList()[2].toFloat()
+      var degreesToRotate =
+        if (orientation == ScreenOrientation.PORTRAIT.getOrientation()) {
+          DEGREES_TO_ROTATE_LANDSCAPE_TO_PORTRAIT + startingRotationDegrees
+        } else {
+          DEGREES_TO_ROTATE_PORTRAIT_TO_LANDSCAPE - startingRotationDegrees
+        }
+      val parameters =
+        ParameterValue.newBuilder().addData(0F).addData(0F).addData(degreesToRotate).build()
+      emulatorControllerStub.setPhysicalModel(
+        PhysicalModelValue.newBuilder()
+          .setTarget(PhysicalModelValue.PhysicalType.ROTATION)
+          .setValue(parameters)
+          .build()
+      )
+    } catch (e: StatusRuntimeException) {
+      throw DeviceControllerOperationException(
+        "Failed to set screen orientation. Please make sure the Android Emulator version" +
+          " is updated to 33.1.11+ and the controller gRPC service is enabled on the emulator." +
+          additionalSetUpInstructions,
+        e,
+      )
+    }
+  }
+
+  /**
+   * Making a connection to the Emulator GRPC requires the INTERNET permission. This method checks
+   * if the current process has the permission, and if not, throws a meaninful error message.
+   */
+  private fun checkInternetPermission() {
+    if (
+      getInstrumentation()
+        .getTargetContext()
+        .checkPermission(permission.INTERNET, Process.myPid(), Process.myUid()) !=
+        PERMISSION_GRANTED
+    ) {
+      throw DeviceControllerOperationException(
+        "The current process does not have the INTERNET permission. Ensure the app-under-test has '<uses-permission " +
+          "android:name=\"android.permission.INTERNET\"/>' in its AndroidManifest.xml." +
+          additionalSetUpInstructions
+      )
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorGrpcConn.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorGrpcConn.kt
new file mode 100644
index 000000000..df1769982
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorGrpcConn.kt
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.controller.emulator
+
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import com.android.emulator.control.EmulatorControllerGrpc
+import io.grpc.CallCredentials
+import io.grpc.Channel
+import io.grpc.ManagedChannel
+import io.grpc.stub.AbstractBlockingStub
+import io.grpc.stub.AbstractFutureStub
+
+/**
+ * Provides a connection to the Android Emulator in which this test is currently running.
+ *
+ * This provides all the proper channels and credentials to create RPC stubs that interact with the
+ * emulator.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+interface EmulatorGrpcConn {
+  /**
+   * Gets a virtual connection to the Android Emulator in which this test is running.
+   *
+   * A gRPC channel should be reused when possible as this allows calls to be multiplexed through an
+   * existing HTTP/2 connection.
+   */
+  fun channel(): ManagedChannel
+
+  /**
+   * Carries credential data that will be propagated to the emulator via request metadata for each
+   * RPC. The credentials are provided by the gradle test runner and can be used as follows:
+   * <pre><code> EmulatorConnection connection val stub =
+   * EmulatorControllerGrpc.EmulatorControllerBlockingStub.newStub(connection.channel()) response =
+   * stub.withCallCredentials(connection.credentials()).bar(request) </code></pre>
+   */
+  fun credentials(): CallCredentials
+
+  /**
+   * Gets a fully configured default emulator controller stub that is connected to the emulator in
+   * which this test is running.
+   */
+  fun emulatorController(): EmulatorControllerGrpc.EmulatorControllerBlockingStub
+
+  /**
+   * Gets a fully configured gRPC connection to a service hosted by the emulator. The credentials
+   * and channel configuration will be provided by the gradle test runner. You commonly want to use
+   * it like:
+   * ```
+   * EmulatorConnection connection val stub =
+   * connection.emulatorBlockingStub(EmulatorControllerGrpc::newBlockingStub) response =
+   * stub.bar(request)
+   * ```
+   *
+   * @param builder A function that provides the actual stub given a channel. This is usually a call
+   *   to `newBlockingStub` for the desired generate service
+   */
+  fun <T : AbstractBlockingStub<T>?> emulatorBlockingStub(builder: (Channel) -> T): T
+
+  /**
+   * Gets a fully configured asynchronous gRPC connection to a service hosted by the emulator. The
+   * credentials and channel configuration will be provided by the gradle test runner. You commonly
+   * want to use it like:
+   * ```
+   * EmulatorConnection connection val stub = connection.emulatorFutureStub(EmulatorControllerGrpc::newFutureStub)
+   * response = stub.bar(request)
+   * ```
+   *
+   * @param builder A function that provides the actual stub given a channel. This is usually a call
+   *   to `newFutureStub` for the desired generate service
+   */
+  fun <T : AbstractFutureStub<T>?> emulatorFutureStub(builder: (Channel) -> T): T
+
+  companion object {
+    val EMULATOR_ADDRESS = "10.0.2.2"
+    val ARGS_EMULATOR_ADDRESS = "grpc.host"
+    val ARGS_GRPC_PORT = "grpc.port"
+    val ARGS_GRPC_TOKEN = "grpc.token"
+    val ARGS_GRPC_KEY = "grpc.key"
+    val ARGS_GRPC_CER = "grpc.cer"
+    val ARGS_GRPC_CA = "grpc.ca"
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorGrpcConnImpl.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorGrpcConnImpl.kt
new file mode 100644
index 000000000..cd31f3a82
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/EmulatorGrpcConnImpl.kt
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.controller.emulator
+
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import com.android.emulator.control.EmulatorControllerGrpc
+import io.grpc.CallCredentials
+import io.grpc.Channel
+import io.grpc.ChannelCredentials
+import io.grpc.InsecureChannelCredentials
+import io.grpc.ManagedChannel
+import io.grpc.TlsChannelCredentials
+import io.grpc.okhttp.OkHttpChannelBuilder
+import io.grpc.stub.AbstractBlockingStub
+import io.grpc.stub.AbstractFutureStub
+import java.io.File
+
+/**
+ * A GrpcConnectionProvider can provide a configured gRPC stub to a remote service.
+ *
+ * This class is able to produce fully configured channels, and call credential objects that can be
+ * used for authenticating to the gRPC endpoint. Usually the provider is used to obtain a
+ * conncection to the emulator in which this test is running.
+ *
+ * If a certificate chain is present, a tls channel will be used.
+ *
+ * @param address The address where this emulator can be reached. Use 10.0.2.2 for the loopback
+ *   device where the emulator is running.
+ * @param port The port of the gRPC endpoint.
+ * @param token JWT token used for authentication. If the token is present and not empty it will be
+ *   used to set the x-grpc-authorization header.
+ * @param clientCertChainFilePath A PEM-encoded certificate chain.
+ * @param clientPrivateKeyFilePath An unencrypted PKCS#8 key (file headers have "BEGIN CERTIFICATE"
+ *   and "BEGIN PRIVATE KEY").
+ * @param trustCertCollectionFilePath When present Use the provided root certificates to verify the
+ *   server's identity instead of the system's default. Generally they should be PEM-encoded with
+ *   all the certificates concatenated together (file header has "BEGIN CERTIFICATE", and would
+ *   occur once per certificate).
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+class EmulatorGrpcConnImpl
+constructor(
+  private val address: String,
+  private val port: Int,
+  private val token: String,
+  private val clientCertChainFilePath: String,
+  private val clientPrivateKeyFilePath: String,
+  private val trustCertCollectionFilePath: String,
+) : EmulatorGrpcConn {
+
+  val channelCredentials = channelCredentials()
+  val callCredentials =
+    if (token.isNullOrEmpty()) NoCallCredentials()
+    else HeaderCallCredentials(AUTH_HEADER, BEARER + token)
+
+  companion object {
+    private val AUTH_HEADER = "authorization"
+    private val BEARER = "Bearer "
+  }
+
+  override fun channel(): ManagedChannel {
+    return OkHttpChannelBuilder.forAddress(address, port, channelCredentials).build()
+  }
+
+  override fun credentials(): CallCredentials {
+    return callCredentials
+  }
+
+  override fun emulatorController(): EmulatorControllerGrpc.EmulatorControllerBlockingStub {
+    return emulatorBlockingStub(EmulatorControllerGrpc::newBlockingStub)!!
+  }
+
+  override fun <T : AbstractBlockingStub<T>?> emulatorBlockingStub(builder: (Channel) -> T): T {
+    return builder(channel())!!.withCallCredentials(credentials())
+  }
+
+  override fun <T : AbstractFutureStub<T>?> emulatorFutureStub(builder: (Channel) -> T): T {
+    return builder(channel())!!.withCallCredentials(credentials())
+  }
+
+  private fun channelCredentials(): ChannelCredentials {
+    if (
+      exists(clientCertChainFilePath) &&
+        exists(trustCertCollectionFilePath) &&
+        exists(clientPrivateKeyFilePath)
+    ) {
+      // TLS
+      val builder = TlsChannelCredentials.newBuilder()
+      builder.keyManager(File(clientCertChainFilePath), File(clientPrivateKeyFilePath))
+      builder.trustManager(File(trustCertCollectionFilePath))
+      return builder.build()
+    }
+
+    return InsecureChannelCredentials.create()
+  }
+
+  /** Returns true if the path is non empty and exists */
+  private fun exists(path: String?): Boolean {
+    if (path.isNullOrEmpty()) return false
+    return File(path).exists()
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/HeaderCallCredentials.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/HeaderCallCredentials.kt
new file mode 100644
index 000000000..916e14ffb
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/HeaderCallCredentials.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.controller.emulator
+
+import io.grpc.CallCredentials
+import io.grpc.Metadata
+import java.util.concurrent.Executor
+
+/** Call credentials that will inject the given header into the outgoing gRPC call. */
+internal class HeaderCallCredentials
+constructor(
+  private val header: String,
+  private val value: String,
+) : CallCredentials() {
+
+  override fun applyRequestMetadata(
+    requestInfo: CallCredentials.RequestInfo,
+    appExecutor: Executor,
+    applier: CallCredentials.MetadataApplier
+  ) {
+    appExecutor.execute {
+      var headers: Metadata = Metadata()
+      headers.put(Metadata.Key.of(header, Metadata.ASCII_STRING_MARSHALLER), value)
+      applier.apply(headers)
+    }
+  }
+
+  override fun thisUsesUnstableApi() {}
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/controller/emulator/NoCallCredentials.kt b/espresso/device/java/androidx/test/espresso/device/controller/emulator/NoCallCredentials.kt
new file mode 100644
index 000000000..56ded4356
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/controller/emulator/NoCallCredentials.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.controller.emulator
+
+import io.grpc.CallCredentials
+import io.grpc.Metadata
+import java.util.concurrent.Executor
+
+/** Call credentials that do nothing. */
+internal class NoCallCredentials : CallCredentials() {
+
+  override fun applyRequestMetadata(
+    requestInfo: CallCredentials.RequestInfo,
+    appExecutor: Executor,
+    applier: CallCredentials.MetadataApplier
+  ) {
+    appExecutor.execute {
+      var headers: Metadata = Metadata()
+      applier.apply(headers)
+    }
+  }
+
+  override fun thisUsesUnstableApi() {}
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/BUILD b/espresso/device/java/androidx/test/espresso/device/dagger/BUILD
new file mode 100644
index 000000000..0b1f73823
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/dagger/BUILD
@@ -0,0 +1,26 @@
+# Description:
+#  Dagger components for device.
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/device/java/androidx/test/espresso/device:__subpackages__"],
+)
+
+kt_android_library(
+    name = "dagger",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/common",
+        "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//espresso/device/java/androidx/test/espresso/device/controller:controller_impl",
+        "//espresso/device/java/androidx/test/espresso/device/controller/emulator",
+        "//opensource/androidx:annotation",
+        "//opensource/dagger",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
new file mode 100644
index 000000000..c0823c713
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceControllerModule.kt
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.dagger
+
+import android.provider.Settings
+import androidx.annotation.RestrictTo
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.espresso.device.common.isTestDeviceAnEmulator
+import androidx.test.espresso.device.controller.DeviceControllerOperationException
+import androidx.test.espresso.device.controller.PhysicalDeviceController
+import androidx.test.espresso.device.controller.emulator.EmulatorController
+import androidx.test.espresso.device.controller.emulator.EmulatorGrpcConn
+import androidx.test.espresso.device.controller.emulator.EmulatorGrpcConnImpl
+import androidx.test.internal.platform.ServiceLoaderWrapper
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.device.DeviceController
+import dagger.Module
+import dagger.Provides
+import java.lang.reflect.Method
+import javax.inject.Singleton
+
+/**
+ * Dagger module for DeviceController.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+@Module
+internal class DeviceControllerModule {
+
+  @Provides
+  @Singleton
+  fun provideDeviceController(): DeviceController {
+    val platformDeviceController: androidx.test.platform.device.DeviceController? =
+      ServiceLoaderWrapper.loadSingleServiceOrNull(
+        androidx.test.platform.device.DeviceController::class.java
+      )
+    if (platformDeviceController == null) {
+      if (isTestDeviceAnEmulator()) {
+        val connection = getEmulatorConnection()
+        return EmulatorController(connection.emulatorController())
+      } else {
+        return PhysicalDeviceController()
+      }
+    } else {
+      return EspressoDeviceControllerAdpater(platformDeviceController)
+    }
+  }
+
+  private fun getEmulatorConnection(): EmulatorGrpcConn {
+    val args = InstrumentationRegistry.getArguments()
+    var defaultEmulatorAddress = EmulatorGrpcConn.EMULATOR_ADDRESS
+    var grpcPortString = args.getString(EmulatorGrpcConn.ARGS_GRPC_PORT)
+    var grpcPort: Int
+    if (grpcPortString != null && grpcPortString.toInt() > 0) {
+      grpcPort = grpcPortString.toInt()
+    } else {
+      grpcPort = getEmulatorGRPCPortFromSystem()
+      defaultEmulatorAddress = "localhost"
+    }
+    var emulatorAddressArg = args.getString(EmulatorGrpcConn.ARGS_EMULATOR_ADDRESS)
+    var emulatorAddress =
+      if (emulatorAddressArg != null) emulatorAddressArg else defaultEmulatorAddress
+
+    return EmulatorGrpcConnImpl(
+      emulatorAddress,
+      grpcPort,
+      args.getString(EmulatorGrpcConn.ARGS_GRPC_TOKEN, ""),
+      args.getString(EmulatorGrpcConn.ARGS_GRPC_CER, ""),
+      args.getString(EmulatorGrpcConn.ARGS_GRPC_KEY, ""),
+      args.getString(EmulatorGrpcConn.ARGS_GRPC_CA, "")
+    )
+  }
+
+  /**
+   * Gets the default emulator gRPC port set directly in system properties, for emulators whose port
+   * is configured dynamically at launch. If set, this port always implies a default emulator
+   * address of 'localhost'
+   */
+  private fun getEmulatorGRPCPortFromSystem(): Int {
+    val gRpcPort =
+      if (getDeviceApiLevel() >= 17) {
+        Settings.Global.getString(
+          InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver(),
+          "mdevx.grpc_guest_port"
+        )
+      } else {
+        val clazz = Class.forName("android.os.SystemProperties")
+        val getter: Method = clazz.getMethod("get", String::class.java)
+        getter.invoke(clazz, "mdevx.grpc_guest_port") as String
+      }
+    if (gRpcPort == null || gRpcPort.isBlank()) {
+      throw DeviceControllerOperationException(
+        "Unable to connect to Emulator gRPC port. Please make sure the Android Emulator version" +
+          " is updated to 33.1.11+ and the controller gRPC service is enabled on the emulator." +
+          " See https://developer.android.com/studio/test/espresso-api#set_up_your_project_for_the_espresso_device_api for setup instructions."
+      )
+    }
+    return gRpcPort.toInt()
+  }
+
+  private class EspressoDeviceControllerAdpater(
+    val deviceController: androidx.test.platform.device.DeviceController
+  ) : DeviceController {
+    override fun setDeviceMode(deviceMode: Int) {
+      deviceController.setDeviceMode(deviceMode)
+    }
+
+    override fun setScreenOrientation(screenOrientation: Int) {
+      deviceController.setScreenOrientation(screenOrientation)
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceHolder.kt b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceHolder.kt
new file mode 100644
index 000000000..42e95eb39
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceHolder.kt
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.dagger
+
+import androidx.annotation.RestrictTo
+import java.util.concurrent.atomic.AtomicReference
+
+/**
+ * Holds Espresso's device graph.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+class DeviceHolder {
+  companion object {
+    private val instance = AtomicReference<DeviceHolder>(null)
+
+    @JvmStatic
+    fun deviceLayer(): DeviceLayerComponent {
+      var instanceRef: DeviceHolder? = instance.get()
+      if (null == instanceRef) {
+        instanceRef = DeviceHolder(DaggerDeviceLayerComponent.create())
+        if (instance.compareAndSet(null, instanceRef)) {
+          return instanceRef.component
+        } else {
+          return instance.get().component
+        }
+      } else {
+        return instanceRef.component
+      }
+    }
+  }
+
+  private val component: DeviceLayerComponent
+
+  private constructor(component: DeviceLayerComponent) {
+    this.component = component
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/dagger/DeviceLayerComponent.kt b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceLayerComponent.kt
new file mode 100644
index 000000000..467d6e2f6
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/dagger/DeviceLayerComponent.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.dagger
+
+import androidx.annotation.RestrictTo
+import androidx.test.platform.device.DeviceController
+import dagger.Component
+import javax.inject.Singleton
+
+/**
+ * Dagger component for device classes.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+@Singleton
+@Component(modules = [DeviceControllerModule::class])
+interface DeviceLayerComponent {
+  fun deviceController(): DeviceController
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/BUILD b/espresso/device/java/androidx/test/espresso/device/filter/BUILD
new file mode 100644
index 000000000..7d67b0e31
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/filter/BUILD
@@ -0,0 +1,43 @@
+# Description:
+#   Filters that can be used to skip tests based on device properties.
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "filter",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/common",
+        "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//espresso/device/java/androidx/test/espresso/device/sizeclass",
+        "//runner/android_junit_runner",
+        "//runner/monitor",
+        "@maven//:androidx_window_window_core",
+        "@maven//:junit_junit",
+    ],
+)
+
+kt_android_library(
+    name = "requires_display_filter",
+    srcs = [
+        "RequiresDisplay.kt",
+        "RequiresDisplayFilter.kt",
+    ],
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device/sizeclass",
+        "//runner/android_junit_runner",
+        "//runner/monitor",
+        "@maven//:androidx_window_window_core",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceMode.kt b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceMode.kt
new file mode 100644
index 000000000..41482795f
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceMode.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.filter
+
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.filters.CustomFilter
+import java.lang.annotation.Repeatable
+
+/**
+ * Indicates that a specific test should not be run on a device that does not support the provided
+ * device mode.
+ *
+ * <p> This annotation is repeatable. It will be executed only if the test is running on a foldable
+ * device that can be set to the all of the provided device modes.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@Repeatable(RequiresDeviceModes::class)
+@CustomFilter(filterClass = RequiresDeviceModeFilter::class)
+annotation class RequiresDeviceMode(val mode: DeviceMode)
+
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@CustomFilter(filterClass = RequiresDeviceModeFilter::class)
+internal annotation class RequiresDeviceModes(val value: Array<RequiresDeviceMode>)
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceModeFilter.kt b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceModeFilter.kt
new file mode 100644
index 000000000..a22a3553a
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDeviceModeFilter.kt
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.filter
+
+import android.os.Build
+import android.util.Log
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.controller.DeviceMode
+import androidx.test.filters.AbstractFilter
+import org.junit.runner.Description
+
+/**
+ * Class that filters out tests annotated with {@link RequiresDeviceMode} when running on a device
+ * that doesn't support the provided device mode.
+ */
+internal class RequiresDeviceModeFilter() : AbstractFilter() {
+  override fun evaluateTest(description: Description): Boolean {
+    val annotations = getMethodAnnotations(description)
+    annotations.addAll(getClassAnnotations(description))
+    if (!annotations.isEmpty()) {
+      val supportedDeviceModes = getSupportedDeviceModes()
+      val deviceModesAnnotations = mutableListOf<RequiresDeviceMode>()
+      for (annotation in annotations) {
+        if (annotation is RequiresDeviceModes) {
+          for (v: RequiresDeviceMode in annotation.value) {
+            deviceModesAnnotations.add(v)
+          }
+        } else if (annotation is RequiresDeviceMode) {
+          deviceModesAnnotations.add(annotation)
+        }
+      }
+      for (annotation in deviceModesAnnotations) {
+        if (!supportedDeviceModes.contains(annotation.mode)) {
+          Log.d(TAG, "Required device mode is not supported, skip the test")
+          return false
+        }
+      }
+    }
+    Log.d(
+      TAG,
+      "No requires device mode annotation or all required modes are supported, run the test"
+    )
+    return true
+  }
+
+  private fun getSupportedDeviceModes(): List<DeviceMode> {
+    if (Build.VERSION.SDK_INT < 29) {
+      // Foldable postures are not available on device running on API 29 and below.
+      return emptyList()
+    }
+
+    val supportedModes = mutableListOf<DeviceMode>()
+    if (Build.VERSION.SDK_INT == 30 || Build.VERSION.SDK_INT == 31) {
+      // The "device_state print-states" shell command does not work on APIs 30-31. For these
+      // devices, check if any folding feaures are present and assume that devices that have
+      // folding features can be half-open and open.
+      val displayFeatures = executeShellCommand("cmd settings get global display_features")
+      if (displayFeatures.contains("fold") || displayFeatures.contains("hinge")) {
+        supportedModes.add(DeviceMode.TABLETOP)
+        supportedModes.add(DeviceMode.BOOK)
+        supportedModes.add(DeviceMode.FLAT)
+        supportedModes.add(DeviceMode.CLOSED)
+      }
+    } else { // API 32+
+      // Example output on a foldable device:
+      // "Supported states: [
+      //  DeviceState{identifier=1, name='CLOSED'},
+      //  DeviceState{identifier=2, name='HALF_OPENED'},
+      //  DeviceState{identifier=3, name='OPENED'},
+      // ]"
+      val modes = executeShellCommand("cmd device_state print-states")
+      if (modes.contains("HALF_OPENED")) {
+        supportedModes.add(DeviceMode.TABLETOP)
+        supportedModes.add(DeviceMode.BOOK)
+      }
+      if (modes.contains("OPENED")) {
+        supportedModes.add(DeviceMode.FLAT)
+      }
+      if (modes.contains("CLOSED")) {
+        supportedModes.add(DeviceMode.CLOSED)
+      }
+    }
+    return supportedModes
+  }
+
+  override fun describe(): String {
+    return "skip tests annotated with RequiresDeviceMode if necessary"
+  }
+
+  companion object {
+    private val TAG = RequiresDeviceModeFilter::class.java.getSimpleName()
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/RequiresDisplay.kt b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDisplay.kt
new file mode 100644
index 000000000..30522470b
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDisplay.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.filter
+
+import androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum
+import androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum
+import androidx.test.filters.CustomFilter
+
+/**
+ * Indicates that a specific test should not be run on a device that does not have the provided
+ * display attributes.
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.CLASS, AnnotationTarget.FUNCTION)
+@CustomFilter(filterClass = RequiresDisplayFilter::class)
+annotation class RequiresDisplay(
+  val widthSizeClass: WidthSizeClassEnum,
+  val heightSizeClass: HeightSizeClassEnum
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/filter/RequiresDisplayFilter.kt b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDisplayFilter.kt
new file mode 100644
index 000000000..a4fe343e8
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/filter/RequiresDisplayFilter.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.filter
+
+import android.app.Instrumentation
+import androidx.test.espresso.device.sizeclass.HeightSizeClass.Companion.HeightSizeClassEnum
+import androidx.test.espresso.device.sizeclass.WidthSizeClass.Companion.WidthSizeClassEnum
+import androidx.test.filters.AbstractFilter
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.window.core.layout.WindowHeightSizeClass
+import androidx.window.core.layout.WindowSizeClass
+import androidx.window.core.layout.WindowWidthSizeClass
+import org.junit.runner.Description
+
+/**
+ * Class that filters out tests annotated with {@link RequiresDisplay} when running on a device that
+ * doesn't have the required display attributes.
+ */
+internal class RequiresDisplayFilter(
+  private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+) : AbstractFilter() {
+  override fun evaluateTest(description: Description): Boolean {
+    var annotations = getMethodAnnotations(description)
+    if (annotations.isEmpty()) {
+      annotations = getClassAnnotations(description)
+    }
+
+    if (!annotations.isEmpty() && annotations[0] is RequiresDisplay) {
+      val requiresDisplay: RequiresDisplay = annotations[0] as RequiresDisplay
+      val windowSize = WindowSizeClass.compute(getWidthDp(), getHeightDp())
+      return requiresDisplay.widthSizeClass == getWidthEnum(windowSize.windowWidthSizeClass) &&
+        requiresDisplay.heightSizeClass == getHeightEnum(windowSize.windowHeightSizeClass)
+    } else {
+      return true // no RequiresDisplay annotation, run the test
+    }
+  }
+
+  override fun describe(): String {
+    return "skip tests annotated with RequiresDisplay if necessary"
+  }
+
+  /** Returns the current screen width in dp */
+  private fun getWidthDp(): Float {
+    val displayMetrics = instrumentation.getTargetContext().getResources().displayMetrics
+    return (displayMetrics.widthPixels / displayMetrics.density)
+  }
+
+  /** Returns the current screen height in dp */
+  private fun getHeightDp(): Float {
+    val displayMetrics = instrumentation.getTargetContext().getResources().displayMetrics
+    return (displayMetrics.heightPixels / displayMetrics.density)
+  }
+
+  private fun getWidthEnum(widthSizeClass: WindowWidthSizeClass): WidthSizeClassEnum {
+    return when (widthSizeClass) {
+      WindowWidthSizeClass.COMPACT -> WidthSizeClassEnum.COMPACT
+      WindowWidthSizeClass.MEDIUM -> WidthSizeClassEnum.MEDIUM
+      else -> WidthSizeClassEnum.EXPANDED
+    }
+  }
+
+  private fun getHeightEnum(heightSizeClass: WindowHeightSizeClass): HeightSizeClassEnum {
+    return when (heightSizeClass) {
+      WindowHeightSizeClass.COMPACT -> HeightSizeClassEnum.COMPACT
+      WindowHeightSizeClass.MEDIUM -> HeightSizeClassEnum.MEDIUM
+      else -> HeightSizeClassEnum.EXPANDED
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/BUILD b/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/BUILD
new file mode 100644
index 000000000..633bdb9f0
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/BUILD
@@ -0,0 +1,20 @@
+# Description:
+#  Internal package for jarjar-ed shaded classes
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+android_library(
+    name = "emulator",
+    srcs = glob(["*.java"]),
+    deps = ["//opensource/androidx:annotation"],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/package-info.java b/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/package-info.java
new file mode 100644
index 000000000..8b75fb3f1
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/internal/deps/emulator/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.device.internal.deps.emulator;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/device/java/androidx/test/espresso/device/release_jarjar_rules.txt b/espresso/device/java/androidx/test/espresso/device/release_jarjar_rules.txt
new file mode 100644
index 000000000..b6230130c
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/release_jarjar_rules.txt
@@ -0,0 +1,4 @@
+rule dagger.** androidx.test.espresso.device.internal.deps.dagger.@1
+rule com.google.protobuf.** androidx.test.espresso.device.internal.deps.protobuf.@1
+rule com.android.emulator.control.** androidx.test.espresso.device.internal.deps.emulator.@1
+rule io.grpc.protobuf.** androidx.test.espresso.device.internal.deps.grpc.protobuf.@1
\ No newline at end of file
diff --git a/espresso/device/java/androidx/test/espresso/device/rules/BUILD b/espresso/device/java/androidx/test/espresso/device/rules/BUILD
new file mode 100644
index 000000000..4bbbf2166
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/rules/BUILD
@@ -0,0 +1,27 @@
+# Description:
+#   Rules that can be used to interact with the device.
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "rules",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//espresso/device/java/androidx/test/espresso/device:espresso_device",
+        "//espresso/device/java/androidx/test/espresso/device/action",
+        "//espresso/device/java/androidx/test/espresso/device/common",
+        "//espresso/device/java/androidx/test/espresso/device/controller",
+        "//runner/monitor",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/rules/DisplaySizeRule.kt b/espresso/device/java/androidx/test/espresso/device/rules/DisplaySizeRule.kt
new file mode 100644
index 000000000..2574182f8
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/rules/DisplaySizeRule.kt
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.rules
+
+import androidx.test.espresso.device.common.executeShellCommand
+import androidx.test.espresso.device.common.getDeviceApiLevel
+import androidx.test.platform.device.UnsupportedDeviceOperationException
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/** Test rule for restoring device to its starting display size when a test case finishes */
+class DisplaySizeRule : TestRule {
+  override fun apply(statement: Statement, description: Description): Statement {
+    return object : Statement() {
+      override fun evaluate() {
+        if (getDeviceApiLevel() < 24) {
+          throw UnsupportedDeviceOperationException(
+            "DisplaySizeRule is not supported on devices with APIs below 24."
+          )
+        }
+
+        try {
+          statement.evaluate()
+        } finally {
+          // Always reset the display size to it's original size
+          executeShellCommand("wm size reset")
+        }
+      }
+    }
+  }
+
+  companion object {
+    private val TAG = DisplaySizeRule::class.java.simpleName
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/rules/ScreenOrientationRule.kt b/espresso/device/java/androidx/test/espresso/device/rules/ScreenOrientationRule.kt
new file mode 100644
index 000000000..76fe3dfcf
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/rules/ScreenOrientationRule.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.rules
+
+import android.content.res.Configuration
+import androidx.test.espresso.device.EspressoDevice.Companion.onDevice
+import androidx.test.espresso.device.action.ScreenOrientation
+import androidx.test.espresso.device.action.setScreenOrientation
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/**
+ * Restores the screen orientation when a test case finishes.
+ *
+ * @param defaultOrientation: the screen orientation will be set to the specified value, or the one
+ *   that the test starts with if none is given.
+ */
+class ScreenOrientationRule(private val defaultOrientation: ScreenOrientation?) : TestRule {
+  constructor() : this(null)
+
+  override fun apply(statement: Statement, description: Description): Statement {
+    return object : Statement() {
+      override fun evaluate() {
+        val orientationToRestore = defaultOrientation ?: getCurrentOrientation()
+        statement.evaluate()
+        onDevice().perform(setScreenOrientation(orientationToRestore))
+      }
+    }
+  }
+
+  private fun getCurrentOrientation(): ScreenOrientation {
+    val currentOrientation =
+      InstrumentationRegistry.getInstrumentation()
+        .getTargetContext()
+        .getResources()
+        .getConfiguration()
+        .orientation
+    return if (currentOrientation == Configuration.ORIENTATION_LANDSCAPE)
+      ScreenOrientation.LANDSCAPE
+    else ScreenOrientation.PORTRAIT
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/rules/SkipUnsupportedDeviceActionsRule.kt b/espresso/device/java/androidx/test/espresso/device/rules/SkipUnsupportedDeviceActionsRule.kt
new file mode 100644
index 000000000..a3ada21ab
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/rules/SkipUnsupportedDeviceActionsRule.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.espresso.device.rules
+
+import androidx.test.platform.device.UnsupportedDeviceOperationException
+import org.junit.Assume.assumeNoException
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/**
+ * Rule for skipping tests when a device action is called on an unsupported device.
+ *
+ * DeviceActions throw UnsupportedDeviceOperationExceptions when actions cannot be performed on the
+ * test device. This rule catches those exceptions and skips the tests where they are thrown.
+ * Without this rule, tests will fail when a device action is performed on an unsupported device.
+ *
+ * Example usage:
+ * ```
+ * class SampleTest {
+ *   @get:Rule
+ *   val rule = SkipUnsupportedDeviceActionsRule()
+ *
+ *   @Test
+ *   fun testDeviceActions() {
+ *     onDevice().setFlatMode()
+ *   }
+ * }
+ * ```
+ */
+class SkipUnsupportedDeviceActionsRule() : TestRule {
+  override fun apply(statement: Statement, description: Description): Statement {
+    return object : Statement() {
+      override fun evaluate() {
+        try {
+          statement.evaluate()
+        } catch (e: UnsupportedDeviceOperationException) {
+          assumeNoException(e.message, e)
+        }
+      }
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/sizeclass/BUILD b/espresso/device/java/androidx/test/espresso/device/sizeclass/BUILD
new file mode 100644
index 000000000..49211ab64
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/sizeclass/BUILD
@@ -0,0 +1,23 @@
+# Description:
+#   Size classes
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+kt_android_library(
+    name = "sizeclass",
+    srcs = glob(["*.kt"]),
+    deps = [
+        "//runner/monitor",
+        "@maven//:androidx_window_window_core",
+    ],
+)
diff --git a/espresso/device/java/androidx/test/espresso/device/sizeclass/HeightSizeClass.kt b/espresso/device/java/androidx/test/espresso/device/sizeclass/HeightSizeClass.kt
new file mode 100644
index 000000000..647e13062
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/sizeclass/HeightSizeClass.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.sizeclass
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.window.core.layout.WindowHeightSizeClass
+import androidx.window.core.layout.WindowSizeClass
+
+/**
+ * A class to create buckets for the height of a window.
+ *
+ * For details on window size classes, see
+ * https://developer.android.com/guide/topics/large-screens/support-different-screen-sizes.
+ */
+public class HeightSizeClass
+private constructor(private val windowHeightSizeClass: WindowHeightSizeClass) {
+  public companion object {
+    /** A bucket to represent a compact height. One use-case is a phone that is in landscape. */
+    @JvmField public val COMPACT: HeightSizeClass = HeightSizeClass(WindowHeightSizeClass.COMPACT)
+    /** A bucket to represent a medium height. One use-case is a phone in portrait or a tablet. */
+    @JvmField public val MEDIUM: HeightSizeClass = HeightSizeClass(WindowHeightSizeClass.MEDIUM)
+    /**
+     * A bucket to represent an expanded height window. One use-case is a tablet or a desktop app.
+     */
+    @JvmField public val EXPANDED: HeightSizeClass = HeightSizeClass(WindowHeightSizeClass.EXPANDED)
+
+    /**
+     * Returns a recommended [HeightSizeClass] for the height of a window given the height in DP.
+     *
+     * @param dpHeight the height of the window in DP
+     * @return A recommended size class for the height
+     * @throws IllegalArgumentException if the height is negative
+     */
+    @JvmStatic
+    public fun compute(dpHeight: Int): HeightSizeClass {
+      if (dpHeight < 0) {
+        throw IllegalArgumentException("Negative size: $dpHeight")
+      }
+      val instrumentation = InstrumentationRegistry.getInstrumentation()
+      val displayMetrics = instrumentation.getTargetContext().getResources().displayMetrics
+      val dpWidth = displayMetrics.widthPixels / displayMetrics.density
+      val heightSizeClass =
+        WindowSizeClass.compute(dpWidth, dpHeight.toFloat()).windowHeightSizeClass
+      return when (heightSizeClass) {
+        WindowHeightSizeClass.COMPACT -> COMPACT
+        WindowHeightSizeClass.MEDIUM -> MEDIUM
+        else -> EXPANDED
+      }
+    }
+
+    /**
+     * Returns a recommended height of a window in DP given the [HeightSizeClass].
+     *
+     * @param sizeClass the size class
+     * @return A recommended height in DP in this size class
+     */
+    @JvmStatic
+    public fun getHeightDpInSizeClass(sizeClass: HeightSizeClass): Int {
+      return when (sizeClass) {
+        HeightSizeClass.COMPACT -> 400
+        HeightSizeClass.MEDIUM -> 700
+        else -> 1000 // HeightSizeClass.EXPANDED
+      }
+    }
+
+    /**
+     * Returns a [HeightSizeClassEnum] given the [HeightSizeClass].
+     *
+     * @param sizeClass the size class
+     * @return the relevant HeightSizeClassEnum
+     */
+    @JvmStatic
+    public fun getEnum(sizeClass: HeightSizeClass): HeightSizeClassEnum {
+      return when (sizeClass) {
+        HeightSizeClass.COMPACT -> HeightSizeClassEnum.COMPACT
+        HeightSizeClass.MEDIUM -> HeightSizeClassEnum.MEDIUM
+        else -> HeightSizeClassEnum.EXPANDED
+      }
+    }
+
+    public enum class HeightSizeClassEnum(val description: String) {
+      COMPACT("COMPACT"),
+      MEDIUM("MEDIUM"),
+      EXPANDED("EXPANDED"),
+    }
+  }
+}
diff --git a/espresso/device/java/androidx/test/espresso/device/sizeclass/WidthSizeClass.kt b/espresso/device/java/androidx/test/espresso/device/sizeclass/WidthSizeClass.kt
new file mode 100644
index 000000000..992e68af4
--- /dev/null
+++ b/espresso/device/java/androidx/test/espresso/device/sizeclass/WidthSizeClass.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.device.sizeclass
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.window.core.layout.WindowSizeClass
+import androidx.window.core.layout.WindowWidthSizeClass
+
+/**
+ * A class to create buckets for the width of a window.
+ *
+ * For details on window size classes, see
+ * https://developer.android.com/guide/topics/large-screens/support-different-screen-sizes.
+ */
+public class WidthSizeClass
+private constructor(private val windowWidthSizeClass: WindowWidthSizeClass) {
+
+  public companion object {
+    /** A bucket to represent a compact width window. One use-case is a phone in portrait. */
+    @JvmField public val COMPACT: WidthSizeClass = WidthSizeClass(WindowWidthSizeClass.COMPACT)
+    /**
+     * A bucket to represent a medium width window. Some use-cases are a phone in landscape or a
+     * tablet.
+     */
+    @JvmField public val MEDIUM: WidthSizeClass = WidthSizeClass(WindowWidthSizeClass.MEDIUM)
+    /** A bucket to represent an expanded width window. One use-case is a desktop app. */
+    @JvmField public val EXPANDED: WidthSizeClass = WidthSizeClass(WindowWidthSizeClass.EXPANDED)
+
+    /**
+     * Returns a recommended [WidthSizeClass] for the width of a window given the width in DP.
+     *
+     * @param dpWidth the width of the window in DP
+     * @return A recommended size class for the width
+     * @throws IllegalArgumentException if the width is negative
+     */
+    @JvmStatic
+    public fun compute(dpWidth: Int): WidthSizeClass {
+      if (dpWidth < 0) {
+        throw IllegalArgumentException("Negative size: $dpWidth")
+      }
+      val instrumentation = InstrumentationRegistry.getInstrumentation()
+      val displayMetrics = instrumentation.getTargetContext().getResources().displayMetrics
+      val dpHeight = displayMetrics.heightPixels / displayMetrics.density
+      val widthSizeClass = WindowSizeClass.compute(dpWidth.toFloat(), dpHeight).windowWidthSizeClass
+      return when (widthSizeClass) {
+        WindowWidthSizeClass.COMPACT -> COMPACT
+        WindowWidthSizeClass.MEDIUM -> MEDIUM
+        else -> EXPANDED
+      }
+    }
+
+    /**
+     * Returns a recommended width of a window in DP given the [WidthSizeClass].
+     *
+     * @param sizeClass the size class
+     * @return A recommended width in DP in this size class
+     */
+    @JvmStatic
+    public fun getWidthDpInSizeClass(sizeClass: WidthSizeClass): Int {
+      return when (sizeClass) {
+        WidthSizeClass.COMPACT -> 400
+        WidthSizeClass.MEDIUM -> 700
+        else -> 1000 // WidthSizeClass.EXPANDED
+      }
+    }
+
+    /**
+     * Returns a [WidthSizeClassEnum] given the [WidthSizeClass].
+     *
+     * @param sizeClass the size class
+     * @return the relevant WidthSizeClassEnum
+     */
+    @JvmStatic
+    public fun getEnum(sizeClass: WidthSizeClass): WidthSizeClassEnum {
+      return when (sizeClass) {
+        WidthSizeClass.COMPACT -> WidthSizeClassEnum.COMPACT
+        WidthSizeClass.MEDIUM -> WidthSizeClassEnum.MEDIUM
+        else -> WidthSizeClassEnum.EXPANDED
+      }
+    }
+
+    public enum class WidthSizeClassEnum(val description: String) {
+      COMPACT("COMPACT"),
+      MEDIUM("MEDIUM"),
+      EXPANDED("EXPANDED"),
+    }
+  }
+}
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
index 43b954917..7c00a74c6 100644
--- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
@@ -19,7 +19,7 @@
     package="androidx.test.espresso.idling.concurrent" >
 
   <uses-sdk
-      android:minSdkVersion="14"
-      android:targetSdkVersion="28" />
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD
new file mode 100644
index 000000000..ee67762b7
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD
@@ -0,0 +1,77 @@
+# Description:
+#   Light weight module that contains IdlinResources around concurrent Java APIs
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "scheduled_thread_pool_idling_resource",
+    srcs = [
+        "IdlingScheduledThreadPoolExecutor.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+    ],
+)
+
+android_library(
+    name = "thread_pool_idling_resource",
+    srcs = [
+        "IdlingThreadPoolExecutor.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+    ],
+)
+
+android_library(
+    name = "idling_concurrent",
+    srcs = [
+        "IdlingScheduledThreadPoolExecutor.java",
+        "IdlingThreadPoolExecutor.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+    ],
+)
+
+# rule for outputting externally released binary.
+axt_android_aar(
+    name = "idling_concurrent_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.idling.concurrent",
+    ],
+    included_dep = ":idling_concurrent",
+)
+
+maven_artifact(
+    name = "idling_concurrent_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":idling_concurrent_aar",
+)
+
+dackka_test(
+    name = "idling_concurrent_doc",
+    runtime_dep = ":idling_concurrent",
+    src_jar = ":idling_concurrent_aar-src.jar",
+)
+
+api_checks(
+    name = "idling_concurrent_api",
+    runtime_dep = ":idling_concurrent",
+    src_jar = ":idling_concurrent_aar-src.jar",
+)
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD.bazel b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD.bazel
deleted file mode 100644
index 5a6811fe3..000000000
--- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/BUILD.bazel
+++ /dev/null
@@ -1,84 +0,0 @@
-# Description:
-#   Light weight module that contains IdlinResources around concurrent Java APIs
-
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-package(
-    default_visibility = ["//:__subpackages__"],
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "scheduled_thread_pool_idling_resource",
-    srcs = [
-        "IdlingScheduledThreadPoolExecutor.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-    ],
-)
-
-android_library(
-    name = "thread_pool_idling_resource",
-    srcs = [
-        "IdlingThreadPoolExecutor.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-    ],
-)
-
-android_library(
-    name = "idling_concurrent",
-    srcs = [
-        "IdlingScheduledThreadPoolExecutor.java",
-        "IdlingThreadPoolExecutor.java",
-    ],
-    deps = [
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-    ],
-)
-
-# rule for outputting externally released binary. Produces
-# idling_concurrent_release_no_deps.jar and idling_concurrent_release.aar
-axt_release_lib(
-    name = "idling_concurrent_release",
-    keep_spec = "androidx/test/espresso/idling/concurrent",
-    remove_spec = "androidx/test/espresso/idling/concurrent/R[$$\\.]",
-    deps = [
-        ":idling_concurrent",
-    ],
-)
-
-filegroup(
-    name = "idling_concurrent_src",
-    srcs = [
-        ":libidling_concurrent-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "idling_concurrent_src_jars",
-    srcs = [
-        ":idling_concurrent_src",
-    ],
-)
-
-maven_artifact(
-    name = "idling_concurrent_maven_artifact",
-    src = ":idling_concurrent_release.aar",
-    artifact_deps = [
-        "androidx.test.espresso:espresso-idling-resource:%s" % ESPRESSO_VERSION,
-    ],
-    artifact_id = "idling-concurrent",
-    group_id = "androidx.test.espresso.idling",
-    last_updated = "20170622000000",
-    src_jar = ":idling_concurrent_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingScheduledThreadPoolExecutor.java b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingScheduledThreadPoolExecutor.java
index 59bb1e1a5..71318b41c 100644
--- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingScheduledThreadPoolExecutor.java
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingScheduledThreadPoolExecutor.java
@@ -31,8 +31,6 @@
  *
  * <p>Overrides parent methods to monitor threads starting, and finishing execution. Uses {@link
  * CountingIdlingResource} to track number of active tasks.
- *
- * <p><b>This API is currently in beta.</b>
  */
 public class IdlingScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor
     implements IdlingResource {
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingThreadPoolExecutor.java b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingThreadPoolExecutor.java
index 1f40860f2..432e843b1 100644
--- a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingThreadPoolExecutor.java
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/IdlingThreadPoolExecutor.java
@@ -29,8 +29,6 @@
  *
  * <p>Overrides parent methods to monitor threads starting, and finishing execution. Uses {@link
  * CountingIdlingResource} to track number of active tasks.
- *
- * <p><b>This API is currently in beta.</b>
  */
 public class IdlingThreadPoolExecutor extends ThreadPoolExecutor implements IdlingResource {
 
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.4.0_public.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.4.0_public.txt
new file mode 100644
index 000000000..b3c49576d
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.4.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.concurrent {
+
+  public class IdlingScheduledThreadPoolExecutor extends java.util.concurrent.ScheduledThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!);
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!, boolean);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public class IdlingThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingThreadPoolExecutor(String!, int, int, long, java.util.concurrent.TimeUnit!, java.util.concurrent.BlockingQueue<java.lang.Runnable!>!, java.util.concurrent.ThreadFactory!);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.5.0_internal.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.5.0_public.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.5.0_public.txt
new file mode 100644
index 000000000..b3c49576d
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.5.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.concurrent {
+
+  public class IdlingScheduledThreadPoolExecutor extends java.util.concurrent.ScheduledThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!);
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!, boolean);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public class IdlingThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingThreadPoolExecutor(String!, int, int, long, java.util.concurrent.TimeUnit!, java.util.concurrent.BlockingQueue<java.lang.Runnable!>!, java.util.concurrent.ThreadFactory!);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.6.0_internal.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.6.0_public.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.6.0_public.txt
new file mode 100644
index 000000000..b3c49576d
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.6.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.concurrent {
+
+  public class IdlingScheduledThreadPoolExecutor extends java.util.concurrent.ScheduledThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!);
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!, boolean);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public class IdlingThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingThreadPoolExecutor(String!, int, int, long, java.util.concurrent.TimeUnit!, java.util.concurrent.BlockingQueue<java.lang.Runnable!>!, java.util.concurrent.ThreadFactory!);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.7.0_internal.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.7.0_public.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.7.0_public.txt
new file mode 100644
index 000000000..b3c49576d
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/3.7.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.concurrent {
+
+  public class IdlingScheduledThreadPoolExecutor extends java.util.concurrent.ScheduledThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!);
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!, boolean);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public class IdlingThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingThreadPoolExecutor(String!, int, int, long, java.util.concurrent.TimeUnit!, java.util.concurrent.BlockingQueue<java.lang.Runnable!>!, java.util.concurrent.ThreadFactory!);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/current_internal.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/current_public.txt b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/current_public.txt
new file mode 100644
index 000000000..a050d1062
--- /dev/null
+++ b/espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent/api/current_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 5.0
+package androidx.test.espresso.idling.concurrent {
+
+  public class IdlingScheduledThreadPoolExecutor extends java.util.concurrent.ScheduledThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!);
+    ctor public IdlingScheduledThreadPoolExecutor(String!, int, java.util.concurrent.ThreadFactory!, boolean);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public class IdlingThreadPoolExecutor extends java.util.concurrent.ThreadPoolExecutor implements androidx.test.espresso.IdlingResource {
+    ctor public IdlingThreadPoolExecutor(String!, int, int, long, java.util.concurrent.TimeUnit!, java.util.concurrent.BlockingQueue<java.lang.Runnable!>!, java.util.concurrent.ThreadFactory!);
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
index f83bd87c5..96acd81b3 100644
--- a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
+++ b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.idling.concurrent"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="30"/>
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30"/>
 
     <application />
 
diff --git a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD
new file mode 100644
index 000000000..4b0a7dc81
--- /dev/null
+++ b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD
@@ -0,0 +1,41 @@
+# Description:
+#   Tests for espresso concurrent idling resrouces
+
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "IdlingScheduledThreadPoolExecutorTest",
+    size = "small",
+    srcs = [
+        "IdlingScheduledThreadPoolExecutorTest.java",
+    ],
+    deps = [
+        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:scheduled_thread_pool_idling_resource",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "IdlingThreadPoolExecutorTest",
+    size = "small",
+    srcs = [
+        "IdlingThreadPoolExecutorTest.java",
+    ],
+    deps = [
+        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD.bazel b/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD.bazel
deleted file mode 100644
index 0da8945d6..000000000
--- a/espresso/idling_resource/concurrent/javatests/androidx/test/espresso/idling/concurrent/BUILD.bazel
+++ /dev/null
@@ -1,54 +0,0 @@
-# Description:
-#   Tests for espresso concurrent idling resrouces
-
-licenses(["notice"])  # Apache License 2.0
-
-## Robolectric tests
-
-android_local_test(
-    name = "IdlingScheduledThreadPoolExecutorTest",
-    size = "small",
-    srcs = ["IdlingScheduledThreadPoolExecutorTest.java"],
-    manifest_values = {"minSdkVersion": "14"},
-    tags = [
-        "gcb_ignore",
-        "robolectric",
-    ],
-    deps = [
-        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:scheduled_thread_pool_idling_resource",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//ext/junit",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:net_bytebuddy_byte_buddy",
-        "@maven//:net_bytebuddy_byte_buddy_agent",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-        "@maven//:org_robolectric_robolectric",
-        "@robolectric//bazel:android-all",
-    ],
-)
-
-android_local_test(
-    name = "IdlingThreadPoolExecutorTest",
-    size = "small",
-    srcs = ["IdlingThreadPoolExecutorTest.java"],
-    manifest_values = {"minSdkVersion": "14"},
-    tags = [
-        "gcb_ignore",
-        "robolectric",
-    ],
-    deps = [
-        "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//ext/junit",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:net_bytebuddy_byte_buddy",
-        "@maven//:net_bytebuddy_byte_buddy_agent",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-        "@maven//:org_robolectric_robolectric",
-        "@robolectric//bazel:android-all",
-    ],
-)
diff --git a/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml b/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml
index 5f9b859c6..effade7c9 100644
--- a/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml
+++ b/espresso/idling_resource/java/androidx/test/espresso/AndroidManifest.xml
@@ -19,7 +19,7 @@
     package="androidx.test.espresso.idling.resource" >
 
   <uses-sdk
-      android:minSdkVersion="14"
-      android:targetSdkVersion="28" />
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/espresso/idling_resource/java/androidx/test/espresso/BUILD b/espresso/idling_resource/java/androidx/test/espresso/BUILD
new file mode 100644
index 000000000..1076ccbcf
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/BUILD
@@ -0,0 +1,89 @@
+# Description:
+#   Light weight module represents a resources of an application under test which can cause
+#   asynchronous background work to happen during test execution.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])
+
+IDLING_INTERFACE = [
+    "IdlingResource.java",
+    "IdlingRegistry.java",
+    "idling/CountingIdlingResource.java",
+]
+
+java_library(
+    name = "idling_resource_internal",
+    srcs = IDLING_INTERFACE,
+    visibility = [
+        "//:__subpackages__",
+        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
+    ],
+    deps = ["//opensource:androidsdk_compiletime"],
+)
+
+alias(
+    name = "idling_resource",
+    actual = "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+)
+
+alias(
+    name = "counting_idling_resource",
+    actual = "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+)
+
+alias(
+    name = "scheduled_thread_pool_idling_resource",
+    actual = "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:scheduled_thread_pool_idling_resource",
+)
+
+alias(
+    name = "thread_pool_idling_resource",
+    actual = "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
+)
+
+android_library(
+    name = "idling_resource_aar_lib",
+    custom_package = "androidx.test.espresso.idling.resource",
+    manifest = "AndroidManifest.xml",
+    exports = [":idling_resource_internal"],
+)
+
+# rule for outputting externally released binary.
+axt_android_aar(
+    name = "idling_resource_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.Idling",
+        "androidx.test.espresso.idling",
+    ],
+    included_dep = ":idling_resource_aar_lib",
+)
+
+maven_artifact(
+    name = "espresso_idling_resource_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":idling_resource_aar",
+)
+
+dackka_test(
+    name = "espresso_idling_resource_doc",
+    runtime_dep = ":idling_resource_aar_lib",
+    src_jar = ":idling_resource_aar-src.jar",
+)
+
+api_checks(
+    name = "espresso_idling_resource_api",
+    runtime_dep = ":idling_resource_aar_lib",
+    src_jar = ":idling_resource_aar-src.jar",
+)
diff --git a/espresso/idling_resource/java/androidx/test/espresso/BUILD.bazel b/espresso/idling_resource/java/androidx/test/espresso/BUILD.bazel
deleted file mode 100644
index 6913e6573..000000000
--- a/espresso/idling_resource/java/androidx/test/espresso/BUILD.bazel
+++ /dev/null
@@ -1,90 +0,0 @@
-# Description:
-#   Light weight module represents a resources of an application under test which can cause
-#   asynchronous background work to happen during test execution.
-
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-IDLING_INTERFACE = [
-    "IdlingResource.java",
-    "IdlingRegistry.java",
-    "CountingIdlingResource.java",
-]
-
-android_library(
-    name = "idling_resource_internal",
-    srcs = IDLING_INTERFACE,
-    visibility = [
-        "//visibility:public",
-    ],
-)
-
-android_library(
-    name = "idling_resource",
-    srcs = IDLING_INTERFACE,
-    visibility = ["//visibility:public"],
-)
-
-android_library(
-    name = "counting_idling_resource",
-    srcs = ["CountingIdlingResource.java"],
-    visibility = ["//visibility:public"],
-    deps = [
-        ":idling_resource",
-    ],
-)
-
-alias(
-    name = "scheduled_thread_pool_idling_resource",
-    actual = "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:scheduled_thread_pool_idling_resource",
-)
-
-alias(
-    name = "thread_pool_idling_resource",
-    actual = "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:thread_pool_idling_resource",
-)
-
-# rule for outputting externally released binary. Produces
-# espresso_idling_resource_release_no_deps.jar and espresso_idling_resource_release.aar
-axt_release_lib(
-    name = "espresso_idling_resource_release",
-    custom_package = "androidx.test.espresso.idling.resource",
-    keep_spec = "androidx/test/espresso",
-    remove_spec = "androidx/test/espresso/idling/resource/R[$$\\.]",
-    deps = [
-        ":idling_resource",
-    ],
-)
-
-filegroup(
-    name = "idling_resource_src",
-    srcs = [
-        #     ":libcounting_idling_resource-src.jar",
-        ":libidling_resource_internal-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "idling_resource_src_jars",
-    srcs = [
-        ":idling_resource_src",
-    ],
-)
-
-maven_artifact(
-    name = "espresso_idling_resource_maven_artifact",
-    src = ":espresso_idling_resource_release.aar",
-    artifact_id = "espresso-idling-resource",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":idling_resource_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/idling_resource/java/androidx/test/espresso/IdlingRegistry.java b/espresso/idling_resource/java/androidx/test/espresso/IdlingRegistry.java
index 133c542ab..67802f4da 100644
--- a/espresso/idling_resource/java/androidx/test/espresso/IdlingRegistry.java
+++ b/espresso/idling_resource/java/androidx/test/espresso/IdlingRegistry.java
@@ -19,6 +19,7 @@
 import static java.util.Collections.synchronizedSet;
 
 import android.os.Looper;
+import android.util.Log;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
@@ -38,6 +39,7 @@
  */
 public final class IdlingRegistry {
 
+  private static final String TAG = IdlingRegistry.class.getSimpleName();
   private static final IdlingRegistry instance = new IdlingRegistry();
   private final Set<IdlingResource> resources = synchronizedSet(new HashSet<IdlingResource>());
   private final Set<Looper> loopers = synchronizedSet(new HashSet<Looper>());
@@ -63,6 +65,7 @@ public boolean register(IdlingResource... idlingResources) {
     if (null == idlingResources) {
       throw new NullPointerException("idlingResources cannot be null!");
     }
+    Log.d(TAG, "Registering idling resources: " + Arrays.toString(idlingResources));
     return resources.addAll(Arrays.asList(idlingResources));
   }
 
@@ -75,6 +78,7 @@ public boolean unregister(IdlingResource... idlingResources) {
     if (null == idlingResources) {
       throw new NullPointerException("idlingResources cannot be null!");
     }
+    Log.d(TAG, "Unregistering idling resources: " + Arrays.toString(idlingResources));
     return resources.removeAll(Arrays.asList(idlingResources));
   }
 
@@ -112,11 +116,15 @@ public boolean unregisterLooperAsIdlingResource(Looper looper) {
 
   /** Returns a set of all currently registered {@link IdlingResource}s. */
   public Collection<IdlingResource> getResources() {
-    return new HashSet<>(resources);
+    synchronized (resources) {
+      return new HashSet<>(resources);
+    }
   }
 
-  /** @return a set of all currently registered {@link Looper}s. */
+  /** Returns a set of all currently registered {@link Looper}s. */
   public Collection<Looper> getLoopers() {
-    return new HashSet<>(loopers);
+    synchronized (loopers) {
+      return new HashSet<>(loopers);
+    }
   }
 }
diff --git a/espresso/idling_resource/java/androidx/test/espresso/IdlingResource.java b/espresso/idling_resource/java/androidx/test/espresso/IdlingResource.java
index 3a2e370bc..6618a37f5 100644
--- a/espresso/idling_resource/java/androidx/test/espresso/IdlingResource.java
+++ b/espresso/idling_resource/java/androidx/test/espresso/IdlingResource.java
@@ -27,8 +27,8 @@
  *
  * <p><b>Important Note:</b> it is assumed that the resource stays idle most of the time.
  *
- * <p><b>Note:</b> before writing your implementation consider using {@link
- * androidx.test.espresso.idling.CountingIdlingResource} instead.
+ * <p><b>Note:</b> before writing your implementation consider using
+ * {@link androidx.test.espresso.idling.CountingIdlingResource} instead.
  */
 public interface IdlingResource {
 
@@ -60,7 +60,14 @@ public interface IdlingResource {
 
   /** Registered by an {@link IdlingResource} to notify Espresso of a transition to idle. */
   public interface ResourceCallback {
-    /** Called when the resource goes from busy to idle. */
+    /**
+     * Called when the resource goes from busy to idle.
+     *
+     * <p>If the idle state is updated on a thread other than the main thread, this method should be
+     * called <b>before</b> the state is updated to return true. Failing to do so can cause a race
+     * condition where Espresso throws a consistency error due to observing {@link #isIdleNow()}
+     * returning true before the callback is invoked.
+     */
     public void onTransitionToIdle();
   }
 }
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.4.0_public.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.4.0_public.txt
new file mode 100644
index 000000000..9a21728c9
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.4.0_public.txt
@@ -0,0 +1,40 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class IdlingRegistry {
+    method public static androidx.test.espresso.IdlingRegistry! getInstance();
+    method public java.util.Collection<android.os.Looper!>! getLoopers();
+    method public java.util.Collection<androidx.test.espresso.IdlingResource!>! getResources();
+    method public boolean register(androidx.test.espresso.IdlingResource!...);
+    method public void registerLooperAsIdlingResource(android.os.Looper!);
+    method public boolean unregister(androidx.test.espresso.IdlingResource!...);
+    method public boolean unregisterLooperAsIdlingResource(android.os.Looper!);
+  }
+
+  public interface IdlingResource {
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface IdlingResource.ResourceCallback {
+    method public void onTransitionToIdle();
+  }
+
+}
+
+package androidx.test.espresso.idling {
+
+  public final class CountingIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public CountingIdlingResource(String!);
+    ctor public CountingIdlingResource(String!, boolean);
+    method public void decrement();
+    method public void dumpStateToLogs();
+    method public String! getName();
+    method public void increment();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.5.0_internal.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.5.0_public.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.5.0_public.txt
new file mode 100644
index 000000000..9a21728c9
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.5.0_public.txt
@@ -0,0 +1,40 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class IdlingRegistry {
+    method public static androidx.test.espresso.IdlingRegistry! getInstance();
+    method public java.util.Collection<android.os.Looper!>! getLoopers();
+    method public java.util.Collection<androidx.test.espresso.IdlingResource!>! getResources();
+    method public boolean register(androidx.test.espresso.IdlingResource!...);
+    method public void registerLooperAsIdlingResource(android.os.Looper!);
+    method public boolean unregister(androidx.test.espresso.IdlingResource!...);
+    method public boolean unregisterLooperAsIdlingResource(android.os.Looper!);
+  }
+
+  public interface IdlingResource {
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface IdlingResource.ResourceCallback {
+    method public void onTransitionToIdle();
+  }
+
+}
+
+package androidx.test.espresso.idling {
+
+  public final class CountingIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public CountingIdlingResource(String!);
+    ctor public CountingIdlingResource(String!, boolean);
+    method public void decrement();
+    method public void dumpStateToLogs();
+    method public String! getName();
+    method public void increment();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.6.0_internal.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.6.0_public.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.6.0_public.txt
new file mode 100644
index 000000000..10898636d
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.6.0_public.txt
@@ -0,0 +1,40 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class IdlingRegistry {
+    method public static androidx.test.espresso.IdlingRegistry! getInstance();
+    method public java.util.Collection<android.os.Looper!>! getLoopers();
+    method public java.util.Collection<androidx.test.espresso.IdlingResource!>! getResources();
+    method public boolean register(androidx.test.espresso.IdlingResource!...!);
+    method public void registerLooperAsIdlingResource(android.os.Looper!);
+    method public boolean unregister(androidx.test.espresso.IdlingResource!...!);
+    method public boolean unregisterLooperAsIdlingResource(android.os.Looper!);
+  }
+
+  public interface IdlingResource {
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface IdlingResource.ResourceCallback {
+    method public void onTransitionToIdle();
+  }
+
+}
+
+package androidx.test.espresso.idling {
+
+  public final class CountingIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public CountingIdlingResource(String!);
+    ctor public CountingIdlingResource(String!, boolean);
+    method public void decrement();
+    method public void dumpStateToLogs();
+    method public String! getName();
+    method public void increment();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.7.0_internal.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/3.7.0_public.txt b/espresso/idling_resource/java/androidx/test/espresso/api/3.7.0_public.txt
new file mode 100644
index 000000000..10898636d
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/3.7.0_public.txt
@@ -0,0 +1,40 @@
+// Signature format: 3.0
+package androidx.test.espresso {
+
+  public final class IdlingRegistry {
+    method public static androidx.test.espresso.IdlingRegistry! getInstance();
+    method public java.util.Collection<android.os.Looper!>! getLoopers();
+    method public java.util.Collection<androidx.test.espresso.IdlingResource!>! getResources();
+    method public boolean register(androidx.test.espresso.IdlingResource!...!);
+    method public void registerLooperAsIdlingResource(android.os.Looper!);
+    method public boolean unregister(androidx.test.espresso.IdlingResource!...!);
+    method public boolean unregisterLooperAsIdlingResource(android.os.Looper!);
+  }
+
+  public interface IdlingResource {
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface IdlingResource.ResourceCallback {
+    method public void onTransitionToIdle();
+  }
+
+}
+
+package androidx.test.espresso.idling {
+
+  public final class CountingIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public CountingIdlingResource(String!);
+    ctor public CountingIdlingResource(String!, boolean);
+    method public void decrement();
+    method public void dumpStateToLogs();
+    method public String! getName();
+    method public void increment();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/current_internal.txt b/espresso/idling_resource/java/androidx/test/espresso/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt b/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt
new file mode 100644
index 000000000..45e6dbe0a
--- /dev/null
+++ b/espresso/idling_resource/java/androidx/test/espresso/api/current_public.txt
@@ -0,0 +1,40 @@
+// Signature format: 5.0
+package androidx.test.espresso {
+
+  public final class IdlingRegistry {
+    method public static androidx.test.espresso.IdlingRegistry! getInstance();
+    method public java.util.Collection<android.os.Looper!>! getLoopers();
+    method public java.util.Collection<androidx.test.espresso.IdlingResource!>! getResources();
+    method public boolean register(androidx.test.espresso.IdlingResource!...!);
+    method public void registerLooperAsIdlingResource(android.os.Looper!);
+    method public boolean unregister(androidx.test.espresso.IdlingResource!...!);
+    method public boolean unregisterLooperAsIdlingResource(android.os.Looper!);
+  }
+
+  public interface IdlingResource {
+    method public String! getName();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface IdlingResource.ResourceCallback {
+    method public void onTransitionToIdle();
+  }
+
+}
+
+package androidx.test.espresso.idling {
+
+  public final class CountingIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public CountingIdlingResource(String!);
+    ctor public CountingIdlingResource(String!, boolean);
+    method public void decrement();
+    method public void dumpStateToLogs();
+    method public String! getName();
+    method public void increment();
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/java/androidx/test/espresso/CountingIdlingResource.java b/espresso/idling_resource/java/androidx/test/espresso/idling/CountingIdlingResource.java
similarity index 100%
rename from espresso/idling_resource/java/androidx/test/espresso/CountingIdlingResource.java
rename to espresso/idling_resource/java/androidx/test/espresso/idling/CountingIdlingResource.java
diff --git a/espresso/idling_resource/javatests/androidx/test/espresso/BUILD b/espresso/idling_resource/javatests/androidx/test/espresso/BUILD
new file mode 100644
index 000000000..b9ab29a10
--- /dev/null
+++ b/espresso/idling_resource/javatests/androidx/test/espresso/BUILD
@@ -0,0 +1,27 @@
+# Description:
+#   Tests for espresso idling resources
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "IdlingRegistryTest",
+    srcs = ["IdlingRegistryTest.java"],
+    deps = [
+        "//core",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/idling_resource/javatests/androidx/test/espresso/BUILD.bazel b/espresso/idling_resource/javatests/androidx/test/espresso/BUILD.bazel
deleted file mode 100644
index 45e268e09..000000000
--- a/espresso/idling_resource/javatests/androidx/test/espresso/BUILD.bazel
+++ /dev/null
@@ -1,30 +0,0 @@
-# Description:
-#   Tests for espresso idling resrouces
-
-licenses(["notice"])  # Apache License 2.0
-
-load(
-    "//build_extensions:android_library_instrumentation_tests.bzl",
-    "android_library_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-android_library_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["**/*.java"]),
-    target_devices = devices(),
-    deps = [
-        "//core",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//ext/junit",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/idling_resource/javatests/androidx/test/espresso/idling/BUILD b/espresso/idling_resource/javatests/androidx/test/espresso/idling/BUILD
new file mode 100644
index 000000000..511a2e471
--- /dev/null
+++ b/espresso/idling_resource/javatests/androidx/test/espresso/idling/BUILD
@@ -0,0 +1,27 @@
+# Description:
+#   Tests for espresso idling resources
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "CountingIdlingResourceTest",
+    srcs = ["CountingIdlingResourceTest.java"],
+    deps = [
+        "//core",
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml
index bfa0a8bd7..0b56363e7 100644
--- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/AndroidManifest.xml
@@ -18,6 +18,6 @@
     package="androidx.test.espresso.idling.net" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 </manifest>
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
new file mode 100644
index 000000000..9e2a5b89d
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD
@@ -0,0 +1,53 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# Description:
+# Network Idling Resources
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+android_library(
+    name = "uri_idling_resource",
+    srcs = ["UriIdlingResource.java"],
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//opensource/androidx:annotation",
+    ],
+)
+
+# rule for outputting externally released binary.
+axt_android_aar(
+    name = "idling_net_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.idling.net",
+    ],
+    included_dep = ":uri_idling_resource",
+)
+
+maven_artifact(
+    name = "idling_net_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":idling_net_aar",
+)
+
+dackka_test(
+    name = "idling_net_doc",
+    runtime_dep = ":uri_idling_resource",
+    src_jar = ":idling_net_aar-src.jar",
+)
+
+api_checks(
+    name = "idling_net_api",
+    runtime_dep = ":uri_idling_resource",
+    src_jar = ":idling_net_aar-src.jar",
+)
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD.bazel b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD.bazel
deleted file mode 100644
index d3bee8ae2..000000000
--- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/BUILD.bazel
+++ /dev/null
@@ -1,61 +0,0 @@
-# Description:
-# Network Idling Resources
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = ["//:__subpackages__"],
-)
-
-android_library(
-    name = "uri_idling_resource",
-    srcs = ["UriIdlingResource.java"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-    ],
-)
-
-# rule for outputting externally released binary. Produces
-# idling_net_release_no_deps.jar and idling_net_release.aar
-axt_release_lib(
-    name = "idling_net_release",
-    keep_spec = "androidx/test/espresso/idling/net",
-    remove_spec = "androidx/test/espresso/idling/net/R[$$\\.]",
-    deps = [
-        ":uri_idling_resource",
-    ],
-)
-
-filegroup(
-    name = "idling_net_src",
-    srcs = [
-        ":liburi_idling_resource-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "idling_net_src_jars",
-    srcs = [
-        ":idling_net_src",
-    ],
-)
-
-maven_artifact(
-    name = "idling_net_maven_artifact",
-    src = ":idling_net_release.aar",
-    artifact_deps = [
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-        "androidx.test.espresso:espresso-idling-resource:%s" % ESPRESSO_VERSION,
-    ],
-    artifact_id = "idling-net",
-    group_id = "androidx.test.espresso.idling",
-    last_updated = "20170622000000",
-    src_jar = ":idling_net_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/UriIdlingResource.java b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/UriIdlingResource.java
index 9c9df7e59..fd53d69fc 100644
--- a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/UriIdlingResource.java
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/UriIdlingResource.java
@@ -37,8 +37,6 @@
  * Imagine the case where each response that comes back causes another request to be made until
  * loading is complete. The counter will go from 0->1->0->1->0->1..., but we don't want to report
  * the webview as idle each time this happens.
- *
- * <p><b>This API is currently in beta.</b>
  */
 public class UriIdlingResource implements IdlingResource {
 
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.4.0_public.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.4.0_public.txt
new file mode 100644
index 000000000..c271533c5
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.4.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.net {
+
+  public class UriIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public UriIdlingResource(String!, long);
+    method public void beginLoad(String!);
+    method public void endLoad(String!);
+    method public String! getName();
+    method public void ignoreUri(java.util.regex.Pattern!);
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface UriIdlingResource.HandlerIntf {
+    method public void postDelayed(Runnable!, long);
+    method public void removeCallbacks(Runnable!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.5.0_internal.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.5.0_public.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.5.0_public.txt
new file mode 100644
index 000000000..c271533c5
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.5.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.net {
+
+  public class UriIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public UriIdlingResource(String!, long);
+    method public void beginLoad(String!);
+    method public void endLoad(String!);
+    method public String! getName();
+    method public void ignoreUri(java.util.regex.Pattern!);
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface UriIdlingResource.HandlerIntf {
+    method public void postDelayed(Runnable!, long);
+    method public void removeCallbacks(Runnable!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.6.0_internal.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.6.0_public.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.6.0_public.txt
new file mode 100644
index 000000000..c271533c5
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.6.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.net {
+
+  public class UriIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public UriIdlingResource(String!, long);
+    method public void beginLoad(String!);
+    method public void endLoad(String!);
+    method public String! getName();
+    method public void ignoreUri(java.util.regex.Pattern!);
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface UriIdlingResource.HandlerIntf {
+    method public void postDelayed(Runnable!, long);
+    method public void removeCallbacks(Runnable!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.7.0_internal.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.7.0_public.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.7.0_public.txt
new file mode 100644
index 000000000..c271533c5
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/3.7.0_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 3.0
+package androidx.test.espresso.idling.net {
+
+  public class UriIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public UriIdlingResource(String!, long);
+    method public void beginLoad(String!);
+    method public void endLoad(String!);
+    method public String! getName();
+    method public void ignoreUri(java.util.regex.Pattern!);
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface UriIdlingResource.HandlerIntf {
+    method public void postDelayed(Runnable!, long);
+    method public void removeCallbacks(Runnable!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/current_internal.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/current_public.txt b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/current_public.txt
new file mode 100644
index 000000000..c0611f8ab
--- /dev/null
+++ b/espresso/idling_resource/net/java/androidx/test/espresso/idling/net/api/current_public.txt
@@ -0,0 +1,20 @@
+// Signature format: 5.0
+package androidx.test.espresso.idling.net {
+
+  public class UriIdlingResource implements androidx.test.espresso.IdlingResource {
+    ctor public UriIdlingResource(String!, long);
+    method public void beginLoad(String!);
+    method public void endLoad(String!);
+    method public String! getName();
+    method public void ignoreUri(java.util.regex.Pattern!);
+    method public boolean isIdleNow();
+    method public void registerIdleTransitionCallback(androidx.test.espresso.IdlingResource.ResourceCallback!);
+  }
+
+  public static interface UriIdlingResource.HandlerIntf {
+    method public void postDelayed(Runnable!, long);
+    method public void removeCallbacks(Runnable!);
+  }
+
+}
+
diff --git a/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/BUILD b/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/BUILD
new file mode 100644
index 000000000..488414336
--- /dev/null
+++ b/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/BUILD
@@ -0,0 +1,28 @@
+# Description:
+# Tests for Network Idling Resources
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "UriIdlingResourceTest",
+    srcs = ["UriIdlingResourceTest.java"],
+    deps = [
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/BUILD.bazel b/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/BUILD.bazel
deleted file mode 100644
index 6c7fbce88..000000000
--- a/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/BUILD.bazel
+++ /dev/null
@@ -1,28 +0,0 @@
-# Description:
-# Tests for Network Idling Resources
-load(
-    "//build_extensions:android_library_instrumentation_tests.bzl",
-    "android_library_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-android_library_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["**/*.java"]),
-    target_devices = devices(),
-    deps = [
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-        "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
-        "//ext/junit",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/UriIdlingResourceTest.java b/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/UriIdlingResourceTest.java
index 71a3f8fb7..d9d4cbdca 100644
--- a/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/UriIdlingResourceTest.java
+++ b/espresso/idling_resource/net/javatests/androidx/test/espresso/idling/net/UriIdlingResourceTest.java
@@ -19,6 +19,7 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.never;
@@ -91,21 +92,25 @@ public void testIsIdle() throws Exception {
     // Implicit transition to idle after postDelayed called
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void testInvalidStateDetected() throws Exception {
     resource.beginLoad(GOOD_URL);
     resource.endLoad(GOOD_URL);
-    resource.endLoad(GOOD_URL);
+    assertThrows(IllegalStateException.class, () -> resource.endLoad(GOOD_URL));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testNegativeTimeout() throws Exception {
-    resource = new UriIdlingResource(RESOURCE_NAME, -1, true, handler);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> resource = new UriIdlingResource(RESOURCE_NAME, -1, true, handler));
   }
 
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testZeroTimeout() throws Exception {
-    resource = new UriIdlingResource(RESOURCE_NAME, 0, true, handler);
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> resource = new UriIdlingResource(RESOURCE_NAME, 0, true, handler));
   }
 
   @Test
diff --git a/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml b/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml
index b9733e45c..68a9de962 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml
+++ b/espresso/intents/java/androidx/test/espresso/intent/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.intent" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/espresso/intents/java/androidx/test/espresso/intent/BUILD b/espresso/intents/java/androidx/test/espresso/intent/BUILD
new file mode 100644
index 000000000..b469205c6
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/BUILD
@@ -0,0 +1,93 @@
+# Description:
+#   Common library for testing inter and intra app communication via intents.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+android_library(
+    name = "intents",
+    srcs = glob(
+        ["*.java"],
+        exclude = [
+            "Checks.java",
+            "ResolvedIntent.java",
+        ],
+    ),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":precondition_checks",
+        ":resolved_intent_interface",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+android_library(
+    name = "precondition_checks",
+    srcs = [
+        "Checks.java",
+    ],
+)
+
+android_library(
+    name = "resolved_intent_interface",
+    srcs = ["ResolvedIntent.java"],
+)
+
+# ** Generate the release artifacts **
+
+android_library(
+    name = "espresso_intents_aar_lib",
+    manifest = "AndroidManifest.xml",
+    exports = [
+        ":intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+    ],
+)
+
+# Generates the release artifacts
+axt_android_aar(
+    name = "espresso_intents_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.intent",
+    ],
+    included_dep = ":espresso_intents_aar_lib",
+)
+
+maven_artifact(
+    name = "espresso_intents_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":espresso_intents_aar",
+)
+
+dackka_test(
+    name = "espresso_intents_doc",
+    runtime_dep = ":espresso_intents_aar_lib",
+    src_jar = ":espresso_intents_aar-src.jar",
+)
+
+api_checks(
+    name = "espresso_intents_api",
+    runtime_dep = ":espresso_intents_aar_lib",
+    src_jar = ":espresso_intents_aar-src.jar",
+)
diff --git a/espresso/intents/java/androidx/test/espresso/intent/BUILD.bazel b/espresso/intents/java/androidx/test/espresso/intent/BUILD.bazel
deleted file mode 100644
index 7cabdec09..000000000
--- a/espresso/intents/java/androidx/test/espresso/intent/BUILD.bazel
+++ /dev/null
@@ -1,101 +0,0 @@
-# Description:
-#   Common library for testing inter and intra app communication via intents.
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = ["//:__subpackages__"],
-)
-
-INTERFACE_FILES = [
-    "ResolvedIntent.java",
-]
-
-android_library(
-    name = "intents",
-    srcs = glob(
-        ["*.java"],
-        exclude = INTERFACE_FILES + ["GmsAuthTestHelper.java"],
-    ),
-    visibility = ["//visibility:public"],
-    deps = [
-        ":resolved_intent_interface",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
-        "//runner/android_junit_runner",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library(
-    name = "precondition_checks",
-    srcs = [
-        "Checks.java",
-    ],
-)
-
-android_library(
-    name = "resolved_intent_interface",
-    srcs = INTERFACE_FILES,
-)
-
-# ** Generate the release artifacts **
-
-load("//build_extensions:release.bzl", "axt_release_lib")
-
-android_library(
-    name = "espresso_intents_release_lib",
-    exports = [
-        ":intents",
-        "//espresso/intents/java/androidx/test/espresso/intent/rule",
-    ],
-)
-
-axt_release_lib(
-    name = "espresso_intents_release",
-    keep_spec = "androidx/test/espresso/intent",
-    remove_spec = "androidx/test/espresso/intent/R[$$\.]",
-    deps = [
-        ":espresso_intents_release_lib",
-    ],
-)
-
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION", "RUNNER_VERSION", "CORE_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-filegroup(
-    name = "intents_src",
-    srcs = [
-        ":libintents-src.jar",
-        ":libresolved_intent_interface-src.jar",
-        "//espresso/intents/java/androidx/test/espresso/intent/matcher:libmatcher-src.jar",
-        "//espresso/intents/java/androidx/test/espresso/intent/rule:librule-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "intents_src_jars",
-    srcs = [
-        ":intents_src",
-    ],
-)
-
-maven_artifact(
-    name = "espresso_intents_maven_artifact",
-    src = ":espresso_intents_release.aar",
-    artifact_deps = [
-        "androidx.test.espresso:espresso-core:%s" % ESPRESSO_VERSION,
-        "androidx.test:core:%s" % CORE_VERSION,
-        "androidx.test:rules:%s" % RUNNER_VERSION,
-    ],
-    artifact_id = "espresso-intents",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":intents_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/intents/java/androidx/test/espresso/intent/Checks.java b/espresso/intents/java/androidx/test/espresso/intent/Checks.java
index aac2f4ffc..cf557c6e2 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/Checks.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/Checks.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.intent;
 
-/** Substitute for Guava Preconditions to avoid guava as a dep. */
+/** Substitute for Guava Preconditions to avoid dependency. */
 public final class Checks {
 
   private Checks() {}
diff --git a/espresso/intents/java/androidx/test/espresso/intent/Intents.java b/espresso/intents/java/androidx/test/espresso/intent/Intents.java
index 31a5fff8d..6058b48e7 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/Intents.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/Intents.java
@@ -24,7 +24,6 @@
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.view.View;
-import androidx.test.annotation.Beta;
 import androidx.test.espresso.NoMatchingViewException;
 import androidx.test.espresso.ViewAssertion;
 import androidx.test.espresso.intent.matcher.IntentMatchers;
@@ -36,6 +35,7 @@
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
 import androidx.test.runner.lifecycle.Stage;
+import com.google.errorprone.annotations.CheckReturnValue;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -48,7 +48,6 @@
  *
  * <p>An example test that simply validates an outgoing intent:
  *
- * <p><code>
  * <pre>
  * public void testValidateIntentSentToPackage() {
  *   // User action that results in an external "phone" activity being launched.
@@ -59,11 +58,9 @@
  *   intended(toPackage("com.android.phone"));
  * }
  * </pre>
- * </code>
  *
  * <p>An example test with intent stubbing:
  *
- * <p><code>
  * <pre>
  * public void testActivityResultIsHandledProperly() {
  *   // Build a result to return when a particular activity is launched.
@@ -83,7 +80,6 @@
  *   assertTrue(user.waitForText(phoneNumber));
  * }
  * </pre>
- * </code>
  */
 public final class Intents {
   private static Intents defaultInstance;
@@ -148,6 +144,7 @@ public static void release() {
    *     provided
    * @return {@link OngoingStubbing} object to set stubbed response
    */
+  @CheckReturnValue
   public static OngoingStubbing intending(Matcher<Intent> matcher) {
     return checkNotNull(defaultInstance, "Intents not initialized. Did you forget to call init()?")
         .internalIntending(matcher);
@@ -160,8 +157,8 @@ public static OngoingStubbing intending(Matcher<Intent> matcher) {
    * Intents.init is called.
    *
    * @param matcher the {@link Matcher} to be applied to captured intents
-   * @throws AssertionFailedError if the given {@link Matcher} did not match any or matched more
-   *     than one of the recorded intents
+   * @throws junit.framework.AssertionFailedError if the given {@link Matcher} did not match any or
+   *     matched more than one of the recorded intents
    */
   public static void intended(Matcher<Intent> matcher) {
     intended(matcher, times(1));
@@ -174,8 +171,9 @@ public static void intended(Matcher<Intent> matcher) {
    * that Intents.init is called.
    *
    * @param matcher the {@link Matcher} to be applied to captured intents
-   * @throws AssertionFailedError if the given {@link Matcher} did not match the expected number of
-   *     recorded intents
+   * @param verificationMode the verification mode to use
+   * @throws junit.framework.AssertionFailedError if the given {@link Matcher} did not match the
+   *     expected number of recorded intents
    */
   public static void intended(
       final Matcher<Intent> matcher, final VerificationMode verificationMode) {
@@ -239,7 +237,6 @@ public void checkException() {
    * <p>Callers can then verify the list of captured intents using their choice of assertion
    * framework, such as <a href="http://google.github.io/truth">truth</a>.
    */
-  @Beta
   public static List<Intent> getIntents() {
     final FutureTask<List<Intent>> getIntents =
         new FutureTask<>(
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.4.0_public.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.4.0_public.txt
new file mode 100644
index 000000000..0f041ad5f
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.4.0_public.txt
@@ -0,0 +1,153 @@
+// Signature format: 3.0
+package androidx.test.espresso.intent {
+
+  public interface ActivityResultFunction {
+    method public android.app.Instrumentation.ActivityResult! apply(android.content.Intent!);
+  }
+
+  public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...);
+    method public static <T> T! checkNotNull(T!);
+    method public static <T> T! checkNotNull(T!, Object!);
+    method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...);
+  }
+
+  public final class Intents {
+    method public static void assertNoUnverifiedIntents();
+    method public static void init();
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.VerificationMode!);
+    method public static androidx.test.espresso.intent.OngoingStubbing! intending(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void release();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+  public final class OngoingStubbing {
+    method public void respondWith(android.app.Instrumentation.ActivityResult!);
+    method public void respondWithFunction(androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResettingStubber extends androidx.test.runner.intent.IntentStubber {
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public final class ResettingStubberImpl implements androidx.test.espresso.intent.ResettingStubber {
+    ctor public ResettingStubberImpl();
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResolvedIntent {
+    method public boolean canBeHandledBy(String!);
+    method public android.content.Intent! getIntent();
+  }
+
+  public interface VerifiableIntent extends androidx.test.espresso.intent.ResolvedIntent {
+    method public boolean hasBeenVerified();
+    method public void markAsVerified();
+  }
+
+  public interface VerificationMode {
+    method public void verify(org.hamcrest.Matcher<android.content.Intent!>!, java.util.List<androidx.test.espresso.intent.VerifiableIntent!>!);
+  }
+
+  public final class VerificationModes {
+    method public static androidx.test.espresso.intent.VerificationMode! noUnverifiedIntents();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+}
+
+package androidx.test.espresso.intent.matcher {
+
+  public final class BundleMatchers {
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(String!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasValue(T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmpty();
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmptyOrNull();
+  }
+
+  public final class ComponentNameMatchers {
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasMyPackageName();
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  public final class IntentMatchers {
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyIntent();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! filterEquals(android.content.Intent!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? super java.lang.String>>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(android.net.Uri!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasDataString(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static <T> org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, T!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlag(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! isInternal();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! toPackage(String!);
+  }
+
+  public final class UriMatchers {
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.intent.rule {
+
+  @Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T> {
+    ctor @Deprecated public IntentsTestRule(Class<T!>!);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean, boolean);
+  }
+
+}
+
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.5.0_internal.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.5.0_public.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.5.0_public.txt
new file mode 100644
index 000000000..e7d4c0e01
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.5.0_public.txt
@@ -0,0 +1,164 @@
+// Signature format: 3.0
+package androidx.test.espresso.intent {
+
+  public interface ActivityResultFunction {
+    method public android.app.Instrumentation.ActivityResult! apply(android.content.Intent!);
+  }
+
+  public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...);
+    method public static <T> T! checkNotNull(T!);
+    method public static <T> T! checkNotNull(T!, Object!);
+    method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...);
+  }
+
+  public final class Intents {
+    method public static void assertNoUnverifiedIntents();
+    method public static java.util.List<android.content.Intent!>! getIntents();
+    method public static void init();
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.VerificationMode!);
+    method @com.google.errorprone.annotations.CheckReturnValue public static androidx.test.espresso.intent.OngoingStubbing! intending(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void release();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+  public final class OngoingStubbing {
+    method public void respondWith(android.app.Instrumentation.ActivityResult!);
+    method public void respondWithFunction(androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResettingStubber extends androidx.test.runner.intent.IntentStubber {
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public final class ResettingStubberImpl implements androidx.test.espresso.intent.ResettingStubber {
+    ctor public ResettingStubberImpl();
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResolvedIntent {
+    method public boolean canBeHandledBy(String!);
+    method public android.content.Intent! getIntent();
+  }
+
+  public interface VerifiableIntent extends androidx.test.espresso.intent.ResolvedIntent {
+    method public boolean hasBeenVerified();
+    method public void markAsVerified();
+  }
+
+  public interface VerificationMode {
+    method public void verify(org.hamcrest.Matcher<android.content.Intent!>!, java.util.List<androidx.test.espresso.intent.VerifiableIntent!>!);
+  }
+
+  public final class VerificationModes {
+    method public static androidx.test.espresso.intent.VerificationMode! noUnverifiedIntents();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+}
+
+package androidx.test.espresso.intent.matcher {
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class BundleMatchers {
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(String);
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(String!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasValue(T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmpty();
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmptyOrNull();
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ComponentNameMatchers {
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasMyPackageName();
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class IntentMatchers {
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyIntent();
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(String);
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! filterEquals(android.content.Intent!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? super java.lang.String>>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(android.net.Uri!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasDataString(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static <T> org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, T!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlag(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! isInternal();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! toPackage(String!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class UriMatchers {
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.intent.rule {
+
+  public final class IntentsRule extends org.junit.rules.ExternalResource {
+    ctor public IntentsRule();
+    method protected void before();
+  }
+
+  @Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T> {
+    ctor @Deprecated public IntentsTestRule(Class<T!>!);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean, boolean);
+  }
+
+}
+
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.6.0_internal.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.6.0_public.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.6.0_public.txt
new file mode 100644
index 000000000..f02fd4af4
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.6.0_public.txt
@@ -0,0 +1,188 @@
+// Signature format: 3.0
+package androidx.test.espresso.intent {
+
+  public interface ActivityResultFunction {
+    method public android.app.Instrumentation.ActivityResult! apply(android.content.Intent!);
+  }
+
+  public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...!);
+    method public static <T> T! checkNotNull(T!);
+    method public static <T> T! checkNotNull(T!, Object!);
+    method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...!);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...!);
+  }
+
+  public final class Intents {
+    method public static void assertNoUnverifiedIntents();
+    method public static java.util.List<android.content.Intent!>! getIntents();
+    method public static void init();
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.VerificationMode!);
+    method @com.google.errorprone.annotations.CheckReturnValue public static androidx.test.espresso.intent.OngoingStubbing! intending(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void release();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+  public final class OngoingStubbing {
+    method public void respondWith(android.app.Instrumentation.ActivityResult!);
+    method public void respondWithFunction(androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResettingStubber extends androidx.test.runner.intent.IntentStubber {
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public final class ResettingStubberImpl implements androidx.test.espresso.intent.ResettingStubber {
+    ctor public ResettingStubberImpl();
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResolvedIntent {
+    method public boolean canBeHandledBy(String!);
+    method public android.content.Intent! getIntent();
+  }
+
+  public final class RuntimePermissionsStubber {
+    ctor public RuntimePermissionsStubber();
+    method public static void intendingGrantedPermissions(java.lang.String!...);
+    method public static void intendingRevokedPermissions(java.lang.String!...);
+    field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";
+  }
+
+  public static class RuntimePermissionsStubber.ActivityResultBuilder {
+    ctor public RuntimePermissionsStubber.ActivityResultBuilder();
+    method public android.app.Instrumentation.ActivityResult! build();
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...!);
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withResultCode(int);
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...!);
+  }
+
+  public static class RuntimePermissionsStubber.Matchers {
+    ctor public RuntimePermissionsStubber.Matchers();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyPermission();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermission(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(java.lang.String!...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(org.hamcrest.Matcher<java.lang.Iterable<java.lang.String!>!>!);
+    field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";
+  }
+
+  public interface VerifiableIntent extends androidx.test.espresso.intent.ResolvedIntent {
+    method public boolean hasBeenVerified();
+    method public void markAsVerified();
+  }
+
+  public interface VerificationMode {
+    method public void verify(org.hamcrest.Matcher<android.content.Intent!>!, java.util.List<androidx.test.espresso.intent.VerifiableIntent!>!);
+  }
+
+  public final class VerificationModes {
+    method public static androidx.test.espresso.intent.VerificationMode! noUnverifiedIntents();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+}
+
+package androidx.test.espresso.intent.matcher {
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class BundleMatchers {
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(String);
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<?>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(String!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<?>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasValue(T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmpty();
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmptyOrNull();
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ComponentNameMatchers {
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasMyPackageName();
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class IntentMatchers {
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyIntent();
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(String);
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! filterEquals(android.content.Intent!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? super java.lang.String!>!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(android.net.Uri!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasDataString(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, org.hamcrest.Matcher<?>!);
+    method public static <T> org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, T!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<?>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlag(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! isInternal();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! toPackage(String!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class UriMatchers {
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.intent.rule {
+
+  public final class IntentsRule extends org.junit.rules.ExternalResource {
+    ctor public IntentsRule();
+    method protected void before();
+  }
+
+  @Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T> {
+    ctor @Deprecated public IntentsTestRule(Class<T!>!);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean, boolean);
+  }
+
+}
+
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.7.0_internal.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/3.7.0_public.txt b/espresso/intents/java/androidx/test/espresso/intent/api/3.7.0_public.txt
new file mode 100644
index 000000000..8044761ba
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/3.7.0_public.txt
@@ -0,0 +1,188 @@
+// Signature format: 3.0
+package androidx.test.espresso.intent {
+
+  public interface ActivityResultFunction {
+    method public android.app.Instrumentation.ActivityResult! apply(android.content.Intent!);
+  }
+
+  public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...!);
+    method public static <T> T! checkNotNull(T!);
+    method public static <T> T! checkNotNull(T!, Object!);
+    method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...!);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...!);
+  }
+
+  public final class Intents {
+    method public static void assertNoUnverifiedIntents();
+    method public static java.util.List<android.content.Intent!>! getIntents();
+    method public static void init();
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.VerificationMode!);
+    method @com.google.errorprone.annotations.CheckReturnValue public static androidx.test.espresso.intent.OngoingStubbing! intending(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void release();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+  public final class OngoingStubbing {
+    method public void respondWith(android.app.Instrumentation.ActivityResult!);
+    method public void respondWithFunction(androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResettingStubber extends androidx.test.runner.intent.IntentStubber {
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public final class ResettingStubberImpl implements androidx.test.espresso.intent.ResettingStubber {
+    ctor public ResettingStubberImpl();
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResolvedIntent {
+    method public boolean canBeHandledBy(String!);
+    method public android.content.Intent! getIntent();
+  }
+
+  public final class RuntimePermissionsStubber {
+    ctor public RuntimePermissionsStubber();
+    method public static void intendingGrantedPermissions(java.lang.String!...);
+    method public static void intendingRevokedPermissions(java.lang.String!...);
+    field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";
+  }
+
+  public static class RuntimePermissionsStubber.ActivityResultBuilder {
+    ctor public RuntimePermissionsStubber.ActivityResultBuilder();
+    method public android.app.Instrumentation.ActivityResult! build();
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...!);
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withResultCode(int);
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...!);
+  }
+
+  public static class RuntimePermissionsStubber.Matchers {
+    ctor public RuntimePermissionsStubber.Matchers();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyPermission();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermission(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(java.lang.String!...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(org.hamcrest.Matcher<java.lang.Iterable<? extends java.lang.String!>!>!);
+    field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";
+  }
+
+  public interface VerifiableIntent extends androidx.test.espresso.intent.ResolvedIntent {
+    method public boolean hasBeenVerified();
+    method public void markAsVerified();
+  }
+
+  public interface VerificationMode {
+    method public void verify(org.hamcrest.Matcher<android.content.Intent!>!, java.util.List<androidx.test.espresso.intent.VerifiableIntent!>!);
+  }
+
+  public final class VerificationModes {
+    method public static androidx.test.espresso.intent.VerificationMode! noUnverifiedIntents();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+}
+
+package androidx.test.espresso.intent.matcher {
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class BundleMatchers {
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(String);
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(String!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasValue(T!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmpty();
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmptyOrNull();
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ComponentNameMatchers {
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasMyPackageName();
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class IntentMatchers {
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyIntent();
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(String);
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! filterEquals(android.content.Intent!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? extends java.lang.String!>!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(android.net.Uri!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasDataString(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static <T> org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, T!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlag(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! isInternal();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! toPackage(String!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class UriMatchers {
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.intent.rule {
+
+  public final class IntentsRule extends org.junit.rules.ExternalResource {
+    ctor public IntentsRule();
+    method protected void before();
+  }
+
+  @Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T!> {
+    ctor @Deprecated public IntentsTestRule(Class<T!>!);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public IntentsTestRule(Class<T!>!, boolean, boolean);
+  }
+
+}
+
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/current_internal.txt b/espresso/intents/java/androidx/test/espresso/intent/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt b/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt
new file mode 100644
index 000000000..c552a7ef2
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/api/current_public.txt
@@ -0,0 +1,191 @@
+// Signature format: 5.0
+package androidx.test.espresso.intent {
+
+  public interface ActivityResultFunction {
+    method public android.app.Instrumentation.ActivityResult! apply(android.content.Intent!);
+  }
+
+  public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...!);
+    method public static <T> T checkNotNull(T);
+    method public static <T> T checkNotNull(T, Object!);
+    method public static <T> T checkNotNull(T, String!, java.lang.Object!...!);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...!);
+  }
+
+  public final class Intents {
+    method public static void assertNoUnverifiedIntents();
+    method public static java.util.List<android.content.Intent!>! getIntents();
+    method public static void init();
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void intended(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.VerificationMode!);
+    method @com.google.errorprone.annotations.CheckReturnValue public static androidx.test.espresso.intent.OngoingStubbing! intending(org.hamcrest.Matcher<android.content.Intent!>!);
+    method public static void release();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+  public final class OngoingStubbing {
+    method public void respondWith(android.app.Instrumentation.ActivityResult!);
+    method public void respondWithFunction(androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResettingStubber extends androidx.test.runner.intent.IntentStubber {
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public final class ResettingStubberImpl implements androidx.test.espresso.intent.ResettingStubber {
+    ctor public ResettingStubberImpl();
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+    method public void initialize();
+    method public boolean isInitialized();
+    method public void reset();
+    method public void setActivityResultForIntent(org.hamcrest.Matcher<android.content.Intent!>!, android.app.Instrumentation.ActivityResult!);
+    method public void setActivityResultFunctionForIntent(org.hamcrest.Matcher<android.content.Intent!>!, androidx.test.espresso.intent.ActivityResultFunction!);
+  }
+
+  public interface ResolvedIntent {
+    method public boolean canBeHandledBy(String!);
+    method public android.content.Intent! getIntent();
+  }
+
+  public final class RuntimePermissionsStubber {
+    ctor public RuntimePermissionsStubber();
+    method public static void intendingGrantedPermissions(java.lang.String!...);
+    method public static void intendingRevokedPermissions(java.lang.String!...);
+    field public static final String EXTRA_REQUEST_PERMISSIONS_NAMES = "android.content.pm.extra.REQUEST_PERMISSIONS_NAMES";
+  }
+
+  public static class RuntimePermissionsStubber.ActivityResultBuilder {
+    ctor public RuntimePermissionsStubber.ActivityResultBuilder();
+    method public android.app.Instrumentation.ActivityResult! build();
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withGrantedPermissions(java.lang.String!...!);
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withResultCode(int);
+    method public androidx.test.espresso.intent.RuntimePermissionsStubber.ActivityResultBuilder! withRevokedPermissions(java.lang.String!...!);
+  }
+
+  public static class RuntimePermissionsStubber.Matchers {
+    ctor public RuntimePermissionsStubber.Matchers();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyPermission();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermission(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(java.lang.String!...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPermissions(org.hamcrest.Matcher<java.lang.Iterable<? extends java.lang.String!>!>!);
+    field public static final String ACTION_REQUEST_PERMISSIONS = "android.content.pm.action.REQUEST_PERMISSIONS";
+  }
+
+  public interface VerifiableIntent extends androidx.test.espresso.intent.ResolvedIntent {
+    method public boolean hasBeenVerified();
+    method public void markAsVerified();
+  }
+
+  public interface VerificationMode {
+    method public void verify(org.hamcrest.Matcher<android.content.Intent!>!, java.util.List<androidx.test.espresso.intent.VerifiableIntent!>!);
+  }
+
+  public final class VerificationModes {
+    method public static androidx.test.espresso.intent.VerificationMode! noUnverifiedIntents();
+    method public static androidx.test.espresso.intent.VerificationMode! times(int);
+  }
+
+}
+
+package androidx.test.espresso.intent.matcher {
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class BundleMatchers {
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(String);
+    method public static org.hamcrest.Matcher<android.os.Bundle!> doesNotHaveKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(String!, T);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasEntry(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(String!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! hasValue(org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static <T> org.hamcrest.Matcher<android.os.Bundle!>! hasValue(T);
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmpty();
+    method public static org.hamcrest.Matcher<android.os.Bundle!>! isEmptyOrNull();
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class ComponentNameMatchers {
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasClassName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasMyPackageName();
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasPackageName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(String!);
+    method public static org.hamcrest.Matcher<android.content.ComponentName!>! hasShortClassName(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class IntentMatchers {
+    method public static org.hamcrest.Matcher<android.content.Intent!>! anyIntent();
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(String);
+    method public static org.hamcrest.Matcher<android.content.Intent!> doesNotHaveExtraWithKey(org.hamcrest.Matcher<java.lang.String!>);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! doesNotHaveFlag(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! doesNotHaveFlags(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! doesNotHaveFlags(int...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! filterEquals(android.content.Intent!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasAction(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(java.util.Set<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasCategories(org.hamcrest.Matcher<? extends java.lang.Iterable<? extends java.lang.String!>!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(android.content.ComponentName!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasComponent(org.hamcrest.Matcher<android.content.ComponentName!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(android.net.Uri!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasData(org.hamcrest.Matcher<android.net.Uri!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasDataString(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static <T> org.hamcrest.Matcher<android.content.Intent!>! hasExtra(String!, T);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtra(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<? extends java.lang.Object!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtraWithKey(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasExtras(org.hamcrest.Matcher<android.os.Bundle!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlag(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasFlags(int...!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasPackage(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(String!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! hasType(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.content.Intent!>! isInternal();
+    method public static org.hamcrest.Matcher<android.content.Intent!>! toPackage(String!);
+  }
+
+  @com.google.errorprone.annotations.CheckReturnValue public final class UriMatchers {
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasHost(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithName(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasParamWithValue(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasPath(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasScheme(org.hamcrest.Matcher<java.lang.String!>!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(String!, String!);
+    method public static org.hamcrest.Matcher<android.net.Uri!>! hasSchemeSpecificPart(org.hamcrest.Matcher<java.lang.String!>!, org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.intent.rule {
+
+  public final class IntentsRule extends org.junit.rules.ExternalResource {
+    ctor public IntentsRule();
+    method protected void before();
+  }
+
+  @Deprecated public class IntentsTestRule<T extends android.app.Activity> extends androidx.test.rule.ActivityTestRule<T> {
+    ctor @Deprecated public IntentsTestRule(Class<T>!);
+    ctor @Deprecated public IntentsTestRule(Class<T>!, boolean);
+    ctor @Deprecated public IntentsTestRule(Class<T>!, boolean, boolean);
+  }
+
+}
+
diff --git a/espresso/intents/java/androidx/test/espresso/intent/matcher/BUILD b/espresso/intents/java/androidx/test/espresso/intent/matcher/BUILD
new file mode 100644
index 000000000..24db5a97d
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/matcher/BUILD
@@ -0,0 +1,26 @@
+# Description:
+#  Matchers for Intents and Intent-related objects
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "matcher",
+    srcs = glob(["*.java"]),
+    deps = [
+        "//core",
+        "//espresso/intents/java/androidx/test/espresso/intent:precondition_checks",
+        "//espresso/intents/java/androidx/test/espresso/intent:resolved_intent_interface",
+        "//opensource/androidx:annotation",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/intents/java/androidx/test/espresso/intent/matcher/BUILD.bazel b/espresso/intents/java/androidx/test/espresso/intent/matcher/BUILD.bazel
deleted file mode 100644
index 4adab9d89..000000000
--- a/espresso/intents/java/androidx/test/espresso/intent/matcher/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description:
-#  Matchers for Intents and Intent-related objects
-
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = ["//visibility:public"])
-
-android_library(
-    name = "matcher",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//core",
-        "//espresso/intents/java/androidx/test/espresso/intent:precondition_checks",
-        "//espresso/intents/java/androidx/test/espresso/intent:resolved_intent_interface",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/intents/java/androidx/test/espresso/intent/matcher/BundleMatchers.java b/espresso/intents/java/androidx/test/espresso/intent/matcher/BundleMatchers.java
index cec64b59b..82a54a856 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/matcher/BundleMatchers.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/matcher/BundleMatchers.java
@@ -24,37 +24,51 @@
 import static org.hamcrest.Matchers.nullValue;
 
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import com.google.errorprone.annotations.CheckReturnValue;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 /** A collection of hamcrest matchers to match {@link Bundle} objects. */
+@CheckReturnValue
 public final class BundleMatchers {
   private BundleMatchers() {}
 
   private static class BundleMatcher extends TypeSafeMatcher<Bundle> {
     private final Matcher<String> keyMatcher;
     private final Matcher<?> valueMatcher;
-
-    BundleMatcher(Matcher<String> keyMatcher, Matcher<?> valueMatcher) {
+    /**
+     * Whether the matcher should check for presence or absence of the key and value.
+     *
+     * <p>If true, the matcher will match bundles that have a matching key-value pair. If false, the
+     * matcher will match bundles that do not have a matching key-value pair (including empty
+     * bundles).
+     */
+    private final boolean shouldBePresent;
+
+    BundleMatcher(Matcher<String> keyMatcher, Matcher<?> valueMatcher, boolean shouldBePresent) {
       super(Bundle.class);
       this.keyMatcher = checkNotNull(keyMatcher);
       this.valueMatcher = checkNotNull(valueMatcher);
+      this.shouldBePresent = shouldBePresent;
     }
 
     @Override
     public boolean matchesSafely(Bundle bundle) {
       for (String key : bundle.keySet()) {
         if (keyMatcher.matches(key) && valueMatcher.matches(bundle.get(key))) {
-          return true;
+          return shouldBePresent;
         }
       }
-      return false;
+      return !shouldBePresent;
     }
 
     @Override
     public void describeTo(Description description) {
-      description.appendText("has bundle with: key: ");
+      description.appendText("has bundle ");
+      description.appendText(shouldBePresent ? "with" : "without");
+      description.appendText(": key: ");
       description.appendDescriptionOf(keyMatcher);
       description.appendText(" value: ");
       description.appendDescriptionOf(valueMatcher);
@@ -91,7 +105,7 @@ public static Matcher<Bundle> hasEntry(String key, Matcher<?> valueMatcher) {
   }
 
   public static Matcher<Bundle> hasEntry(Matcher<String> keyMatcher, Matcher<?> valueMatcher) {
-    return new BundleMatcher(keyMatcher, valueMatcher);
+    return new BundleMatcher(keyMatcher, valueMatcher, /* shouldBePresent= */ true);
   }
 
   public static Matcher<Bundle> hasKey(String key) {
@@ -99,7 +113,17 @@ public static Matcher<Bundle> hasKey(String key) {
   }
 
   public static Matcher<Bundle> hasKey(Matcher<String> keyMatcher) {
-    return new BundleMatcher(keyMatcher, anything());
+    return new BundleMatcher(keyMatcher, anything(), /* shouldBePresent= */ true);
+  }
+
+  @NonNull
+  public static Matcher<Bundle> doesNotHaveKey(@NonNull String key) {
+    return doesNotHaveKey(is(key));
+  }
+
+  @NonNull
+  public static Matcher<Bundle> doesNotHaveKey(@NonNull Matcher<String> keyMatcher) {
+    return new BundleMatcher(keyMatcher, anything(), /* shouldBePresent= */ false);
   }
 
   public static <T> Matcher<Bundle> hasValue(T value) {
@@ -107,6 +131,6 @@ public static <T> Matcher<Bundle> hasValue(T value) {
   }
 
   public static Matcher<Bundle> hasValue(Matcher<?> valueMatcher) {
-    return new BundleMatcher(any(String.class), valueMatcher);
+    return new BundleMatcher(any(String.class), valueMatcher, /* shouldBePresent= */ true);
   }
 }
diff --git a/espresso/intents/java/androidx/test/espresso/intent/matcher/ComponentNameMatchers.java b/espresso/intents/java/androidx/test/espresso/intent/matcher/ComponentNameMatchers.java
index c8b106b8b..11ea17817 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/matcher/ComponentNameMatchers.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/matcher/ComponentNameMatchers.java
@@ -22,11 +22,13 @@
 import static org.hamcrest.Matchers.is;
 
 import android.content.ComponentName;
+import com.google.errorprone.annotations.CheckReturnValue;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
 
 /** A collection of hamcrest matchers to match {@link ComponentName} objects. */
+@CheckReturnValue
 public final class ComponentNameMatchers {
   private ComponentNameMatchers() {}
 
diff --git a/espresso/intents/java/androidx/test/espresso/intent/matcher/IntentMatchers.java b/espresso/intents/java/androidx/test/espresso/intent/matcher/IntentMatchers.java
index f457189c5..15416273a 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/matcher/IntentMatchers.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/matcher/IntentMatchers.java
@@ -18,6 +18,7 @@
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.intent.Checks.checkNotNull;
+import static androidx.test.espresso.intent.matcher.BundleMatchers.doesNotHaveKey;
 import static androidx.test.espresso.intent.matcher.BundleMatchers.hasEntry;
 import static androidx.test.espresso.intent.matcher.BundleMatchers.hasKey;
 import static androidx.test.espresso.intent.matcher.ComponentNameMatchers.hasClassName;
@@ -30,7 +31,9 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
 import androidx.test.espresso.intent.ResolvedIntent;
+import com.google.errorprone.annotations.CheckReturnValue;
 import java.util.Set;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -38,6 +41,7 @@
 import org.hamcrest.TypeSafeMatcher;
 
 /** A collection of hamcrest matchers for matching {@link Intent} objects. */
+@CheckReturnValue
 public final class IntentMatchers {
 
   private IntentMatchers() {}
@@ -82,7 +86,7 @@ public static Matcher<Intent> hasCategories(Set<String> categories) {
   }
 
   public static Matcher<Intent> hasCategories(
-      final Matcher<? extends Iterable<? super String>> categoriesMatcher) {
+      final Matcher<? extends Iterable<? extends String>> categoriesMatcher) {
     checkNotNull(categoriesMatcher);
     return new TypeSafeMatcher<Intent>() {
       @Override
@@ -193,6 +197,16 @@ public static Matcher<Intent> hasExtraWithKey(Matcher<String> keyMatcher) {
     return hasExtras(hasKey(keyMatcher));
   }
 
+  @NonNull
+  public static Matcher<Intent> doesNotHaveExtraWithKey(@NonNull String key) {
+    return doesNotHaveExtraWithKey(is(key));
+  }
+
+  @NonNull
+  public static Matcher<Intent> doesNotHaveExtraWithKey(@NonNull Matcher<String> keyMatcher) {
+    return hasExtras(doesNotHaveKey(keyMatcher));
+  }
+
   public static <T> Matcher<Intent> hasExtra(String key, T value) {
     return hasExtras(hasEntry(key, value));
   }
@@ -326,6 +340,34 @@ public boolean matchesSafely(Intent intent) {
     };
   }
 
+  public static Matcher<Intent> doesNotHaveFlag(int flag) {
+    return doesNotHaveFlags(flag);
+  }
+
+  public static Matcher<Intent> doesNotHaveFlags(int... flags) {
+    int allFlags = 0;
+    for (int i : flags) {
+      allFlags |= i;
+    }
+    return doesNotHaveFlags(allFlags);
+  }
+
+  public static Matcher<Intent> doesNotHaveFlags(final int flags) {
+
+    return new TypeSafeMatcher<Intent>() {
+      @Override
+      public void describeTo(Description description) {
+        description.appendText("does not have flags: " + Integer.toHexString(flags));
+      }
+
+      @Override
+      public boolean matchesSafely(Intent intent) {
+        int intentFlags = intent.getFlags();
+        return ((intentFlags & flags) == 0);
+      }
+    };
+  }
+
   /** Matches an intent if it {@link Intent#filterEquals(Intent)} the expected intent. */
   public static Matcher<Intent> filterEquals(Intent expectedIntent) {
     return new TypeSafeMatcher<Intent>() {
diff --git a/espresso/intents/java/androidx/test/espresso/intent/matcher/UriMatchers.java b/espresso/intents/java/androidx/test/espresso/intent/matcher/UriMatchers.java
index 1c3dbaa7b..e37c4fe2c 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/matcher/UriMatchers.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/matcher/UriMatchers.java
@@ -22,6 +22,7 @@
 import static org.hamcrest.Matchers.is;
 
 import android.net.Uri;
+import com.google.errorprone.annotations.CheckReturnValue;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -35,6 +36,7 @@
  * A collection of matchers for {@link Uri}s, which can match Uris on their properties (host, path,
  * ...).
  */
+@CheckReturnValue
 public final class UriMatchers {
 
   /** Container class for paramName and pramValues. */
diff --git a/espresso/intents/java/androidx/test/espresso/intent/rule/BUILD b/espresso/intents/java/androidx/test/espresso/intent/rule/BUILD
new file mode 100644
index 000000000..261e81fda
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/rule/BUILD
@@ -0,0 +1,27 @@
+# Description:
+# JUnit4 Rules for Intents
+
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+kt_android_library(
+    name = "rule",
+    srcs = glob(
+        [
+            "*.java",
+            "*.kt",
+        ],
+    ),
+    deps = [
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//runner/rules",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/intents/java/androidx/test/espresso/intent/rule/BUILD.bazel b/espresso/intents/java/androidx/test/espresso/intent/rule/BUILD.bazel
deleted file mode 100644
index d9a3d4bdc..000000000
--- a/espresso/intents/java/androidx/test/espresso/intent/rule/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-# Description:
-# JUnit4 Rules for Intents
-
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = ["//visibility:public"])
-
-android_library(
-    name = "rule",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//espresso/intents/java/androidx/test/espresso/intent:intents",
-        "//runner/rules",
-    ],
-)
diff --git a/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsRule.kt b/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsRule.kt
new file mode 100644
index 000000000..cddb77b6d
--- /dev/null
+++ b/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsRule.kt
@@ -0,0 +1,18 @@
+package androidx.test.espresso.intent.rule
+
+import androidx.test.espresso.intent.Intents
+import org.junit.rules.ExternalResource
+
+/**
+ * Rule for performing set up and tear down of Espresso-Intents API.
+ *
+ * Usage: `@Rule public IntentsRule intentsRule = new IntentsRule()`
+ *
+ * Then in a test method: `Intents.intended(IntentMatchers.hasComponent("com.example.FooActivity"))`
+ */
+class IntentsRule : ExternalResource() {
+
+  override fun before() = Intents.init()
+
+  override fun after() = Intents.release()
+}
diff --git a/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsTestRule.java b/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsTestRule.java
index 55964f237..bcd57f0fa 100644
--- a/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsTestRule.java
+++ b/espresso/intents/java/androidx/test/espresso/intent/rule/IntentsTestRule.java
@@ -23,9 +23,9 @@
 /**
  * This rule makes it easy to use Espresso-Intents APIs in functional UI tests. This class is an
  * extension of {@link ActivityTestRule}, which initializes Espresso-Intents before each test
- * annotated with <a href="http://junit.org/javadoc/latest/org/junit/Test.html"><code>Test</code>
- * </a> and releases Espresso-Intents after each test run. The Activity will be terminated after
- * each test and this rule can be used in the same way as {@link ActivityTestRule}.
+ * annotated with {@link org.junit.Test} and releases Espresso-Intents after each test run. The
+ * Activity will be terminated after each test and this rule can be used in the same way as {@link
+ * ActivityTestRule}.
  *
  * <p>Espresso-Intents APIs can be used in two ways:
  *
@@ -35,8 +35,8 @@
  * </ul>
  *
  * @param <T> The activity to test
- * @deprecated Use {@link androidx.test.espresso.intent.Intents.init()}, in conjunction with {@link
- *     androidx.test.core.app.ActivityScenario} or {@link
+ * @deprecated Use {@link androidx.test.espresso.intent.rule.IntentsRule}, and if necessary in
+ *     conjunction with {@link androidx.test.core.app.ActivityScenario} or {@link
  *     androidx.test.ext.junit.rules.ActivityScenarioRule} instead.
  */
 @Deprecated
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml b/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml
new file mode 100644
index 000000000..26aedbba2
--- /dev/null
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/AndroidManifest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2014 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.espresso.intents">
+
+  <uses-sdk
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34"/>
+
+  <uses-permission android:name="android.permission.CALL_PHONE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <!-- Runtime permission APIs -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+  <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+  <queries>
+    <package android:name="com.android.contacts" />
+  </queries>
+
+  <application/>
+
+  <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="androidx.test.espresso.intents">
+  </instrumentation>
+
+</manifest>
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/BUILD b/espresso/intents/javatests/androidx/test/espresso/intent/BUILD
new file mode 100644
index 000000000..956035d95
--- /dev/null
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/BUILD
@@ -0,0 +1,120 @@
+# Description:
+#   Tests for Espresso Intents lib.
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:phone_devices.bzl",
+    "devices",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RuntimePermissionStubberIntegrationTest",
+    srcs = ["RuntimePermissionStubberIntegrationTest.java"],
+    args = ["--clear_package_data"],
+    device_list = devices(),
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "IntentsIntegrationTest",
+    srcs = ["IntentsIntegrationTest.java"],
+
+    # don't run on slim device, since IntentsIntegrationTest depends on intents resolving to specific apps like com.android.contacts
+    # which are not present on slim image
+    device_list = devices(use_slim = False),
+    manifest = "AndroidManifest.xml",
+    shard_count = 3,
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "IntentsTest",
+    srcs = ["IntentsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent:resolved_intent_interface",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ResettingStubberImplTest",
+    srcs = ["ResettingStubberImplTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent:resolved_intent_interface",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/BUILD.bazel b/espresso/intents/javatests/androidx/test/espresso/intent/BUILD.bazel
deleted file mode 100644
index 3bcfe12ba..000000000
--- a/espresso/intents/javatests/androidx/test/espresso/intent/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-# Description: Tests for espresso intents
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(["**/*.java"]),
-    args = ["--clear_package_data"],
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//:androidx_annotation",
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/action",
-        "//espresso/core/java/androidx/test/espresso/assertion",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/intents/java/androidx/test/espresso/intent:intents",
-        "//espresso/intents/java/androidx/test/espresso/intent:resolved_intent_interface",
-        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
-        "//espresso/intents/java/androidx/test/espresso/intent/rule",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java
index 973dd7d82..8a5c791c0 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/IntentsIntegrationTest.java
@@ -16,6 +16,7 @@
 
 package androidx.test.espresso.intent;
 
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.pressBack;
 import static androidx.test.espresso.action.ViewActions.click;
@@ -52,11 +53,14 @@
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.not;
+import static org.junit.Assert.assertThrows;
 import static org.junit.rules.ExpectedException.none;
 
 import android.app.Activity;
 import android.app.Instrumentation.ActivityResult;
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Build;
 import androidx.test.espresso.intent.rule.IntentsTestRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -208,7 +212,7 @@ public void internalMultipleIntents() {
     intended(anyIntent(), Intents.times(2));
 
     try {
-      intended(toPackage("androidx.test.ui.app"));
+      intended(toPackage("androidx.test.espresso.intents"));
       // Can't call fail() because it throws an AssertionFailedError, just like intended() does.
       throw new IllegalStateException(
           "intended should have failed: too many matching recorded intents");
@@ -216,14 +220,14 @@ public void internalMultipleIntents() {
       // expected.
     }
     try {
-      intended(toPackage("androidx.test.ui.app"), Intents.times(3));
+      intended(toPackage("androidx.test.espresso.intents"), Intents.times(3));
       // Can't call fail() because it throws an AssertionFailedError, just like intended() does.
       throw new IllegalStateException(
           "intended should have failed: too few matching recorded intents");
     } catch (AssertionFailedError e) {
       // expected.
     }
-    intended(toPackage("androidx.test.ui.app"), Intents.times(2));
+    intended(toPackage("androidx.test.espresso.intents"), Intents.times(2));
   }
 
   @Test
@@ -254,7 +258,7 @@ public void noUnverifiedIntents() {
     } catch (AssertionFailedError e) {
       // expected.
     }
-    intended(toPackage("androidx.test.ui.app"), Intents.times(2));
+    intended(toPackage("androidx.test.espresso.intents"), Intents.times(2));
     assertNoUnverifiedIntents();
   }
 
@@ -311,8 +315,8 @@ public void componentNameMatcher() {
     intended(
         hasComponent(
             allOf(
-                hasPackageName("androidx.test.ui.app"),
-                hasShortClassName(".DisplayActivity"))));
+                hasPackageName("androidx.test.espresso.intents"),
+                hasShortClassName("androidx.test.ui.app.DisplayActivity"))));
   }
 
   @Test
@@ -325,6 +329,23 @@ public void internalIntentStubbing() {
     onView(withId(R.id.send_button)).check(matches(isDisplayed()));
   }
 
+  @Test
+  public void browserIntentNotResolved() {
+    Intent browserIntent = new Intent(Intent.ACTION_VIEW);
+    browserIntent.setData(Uri.parse("http://developer.android.com"));
+    browserIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+    Intents.intending(hasAction(Intent.ACTION_VIEW))
+        .respondWithFunction(
+            intent -> {
+              throw new ActivityNotFoundException();
+            });
+
+    assertThrows(
+        ActivityNotFoundException.class,
+        () -> getApplicationContext().startActivity(browserIntent));
+  }
+
   private void pick(String phoneNumber) {
     onView(withId(R.id.pick_button)).perform(scrollTo(), click());
     onView(withText(phoneNumber)).perform(scrollTo()).check(matches(isDisplayed()));
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/IntentsTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/IntentsTest.java
index b1fbc5a25..a3d79851d 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/IntentsTest.java
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/IntentsTest.java
@@ -19,6 +19,7 @@
 import static androidx.test.espresso.intent.Intents.times;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.anyIntent;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.toPackage;
+import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.allOf;
 import static org.junit.Assert.assertTrue;
 import static org.junit.rules.ExpectedException.none;
@@ -29,8 +30,8 @@
 import android.content.pm.ResolveInfo;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
-import com.google.common.collect.Lists;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 import junit.framework.AssertionFailedError;
@@ -88,7 +89,7 @@ public void validateAnyIntent() {
     intents.internalIntended(
         anyIntent(),
         times(1),
-        Lists.newArrayList(buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.some.package")));
+        singletonList(buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.some.package")));
   }
 
   @Test
@@ -96,7 +97,7 @@ public void validateToOnePackage() {
     intents.internalIntended(
         toPackage("com.google.some.package"),
         times(1),
-        Lists.newArrayList(buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.some.package")));
+        singletonList(buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.some.package")));
   }
 
   @Test
@@ -104,7 +105,7 @@ public void validateToMultiplePackagesOne() {
     intents.internalIntended(
         toPackage("com.google.some.package"),
         times(1),
-        Lists.newArrayList(
+        singletonList(
             buildVerifiableIntent(
                 Intent.ACTION_VIEW, "com.google.some.package", "com.google.android.other")));
   }
@@ -114,7 +115,7 @@ public void validateToMultiplePackagesTwo() {
     intents.internalIntended(
         allOf(toPackage("com.google.some.package"), toPackage("com.google.android.other")),
         times(1),
-        Lists.newArrayList(
+        singletonList(
             buildVerifiableIntent(
                 Intent.ACTION_VIEW, "com.google.some.package", "com.google.android.other")));
   }
@@ -132,7 +133,7 @@ public void validateMultiplePackagesFail() {
     intents.internalIntended(
         toPackage("com.google.some.fail"),
         times(1),
-        Lists.newArrayList(
+        singletonList(
             buildVerifiableIntent(
                 Intent.ACTION_VIEW, "com.google.some.package", "com.google.android.other")));
   }
@@ -140,7 +141,7 @@ public void validateMultiplePackagesFail() {
   @Test
   public void intended_MultipleCalls() {
     List<VerifiableIntent> intents =
-        Lists.newArrayList(
+        Arrays.asList(
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.A"),
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.B"),
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.C"));
@@ -152,7 +153,7 @@ public void intended_MultipleCalls() {
   @Test
   public void intended_MultipleCallsWithSameIntent() {
     List<VerifiableIntent> intents =
-        Lists.newArrayList(
+        Arrays.asList(
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.A"),
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.A"));
     this.intents.internalIntended(toPackage("com.google.android.A"), times(2), intents);
@@ -210,7 +211,7 @@ public void intended_NoIntents() {
   @Test
   public void assertNoUnverifiedIntents() {
     List<VerifiableIntent> intents =
-        Lists.newArrayList(
+        Arrays.asList(
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.A"),
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.B"),
             buildVerifiableIntent(Intent.ACTION_VIEW, "com.google.android.A"));
@@ -299,7 +300,7 @@ private static VerifiableIntent buildVerifiableIntent(String action, String... p
   }
 
   private static List<ResolveInfo> buildResolveInfoList(String... resolvePackage) {
-    List<ResolveInfo> resolveInfoList = Lists.newArrayList();
+    List<ResolveInfo> resolveInfoList = new ArrayList<>();
     for (String pkg : resolvePackage) {
       ResolveInfo resolveInfo = new ResolveInfo();
       resolveInfo.activityInfo = new ActivityInfo();
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BUILD b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BUILD
new file mode 100644
index 000000000..09487171c
--- /dev/null
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BUILD
@@ -0,0 +1,107 @@
+# Description:
+#   Tests for Espresso Intents lib.
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "BundleMatchersTest",
+    srcs = ["BundleMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ComponentNameMatchersTest",
+    srcs = ["ComponentNameMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "IntentMatchersTest",
+    srcs = ["IntentMatchersTest.java"],
+    shard_count = 3,
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent:resolved_intent_interface",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "RuntimePermissionMatchersTest",
+    srcs = ["RuntimePermissionMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "UriMatchersTest",
+    srcs = ["UriMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BundleMatchersTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BundleMatchersTest.java
index 06bacfa18..39685ff03 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BundleMatchersTest.java
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/BundleMatchersTest.java
@@ -16,6 +16,7 @@
 
 package androidx.test.espresso.intent.matcher;
 
+import static androidx.test.espresso.intent.matcher.BundleMatchers.doesNotHaveKey;
 import static androidx.test.espresso.intent.matcher.BundleMatchers.hasEntry;
 import static androidx.test.espresso.intent.matcher.BundleMatchers.hasKey;
 import static androidx.test.espresso.intent.matcher.BundleMatchers.hasValue;
@@ -117,6 +118,43 @@ public void hasKeyWithMultipleEntries() {
     assertTrue(hasKey(equalTo("key2")).matches(bundle));
   }
 
+  @Test
+  public void doesNotHaveKeyTesting() {
+    Bundle bundle = new Bundle();
+    bundle.putBoolean("key", true);
+
+    assertTrue(doesNotHaveKey("key2").matches(bundle));
+    assertTrue(doesNotHaveKey(equalTo("key2")).matches(bundle));
+  }
+
+  @Test
+  public void doesNotHaveKeyDoesNotMatch() {
+    Bundle bundle = new Bundle();
+    bundle.putBoolean("key", true);
+
+    assertFalse(doesNotHaveKey("key").matches(bundle));
+    assertFalse(doesNotHaveKey(equalTo("key")).matches(bundle));
+    assertFalse(doesNotHaveKey("key").matches(null));
+    assertFalse(doesNotHaveKey("key").matches("key"));
+  }
+
+  @Test
+  public void doesNotHaveKeyWithMultipleEntries() {
+    Bundle bundle = new Bundle();
+    bundle.putDouble("key", 10000000);
+    bundle.putDouble("key1", 10000001);
+    bundle.putBundle("key2", new Bundle());
+
+    assertFalse(doesNotHaveKey("key").matches(bundle));
+    assertFalse(doesNotHaveKey(equalTo("key")).matches(bundle));
+    assertFalse(doesNotHaveKey("key1").matches(bundle));
+    assertFalse(doesNotHaveKey(equalTo("key1")).matches(bundle));
+    assertFalse(doesNotHaveKey("key2").matches(bundle));
+    assertFalse(doesNotHaveKey(equalTo("key2")).matches(bundle));
+    assertTrue(doesNotHaveKey("key3").matches(bundle));
+    assertTrue(doesNotHaveKey(equalTo("key3")).matches(bundle));
+  }
+
   @Test
   public void hasValueTesting() {
     Bundle bundle = new Bundle();
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/IntentMatchersTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/IntentMatchersTest.java
index 6ec87ff63..afa15dab9 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/IntentMatchersTest.java
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/IntentMatchersTest.java
@@ -18,6 +18,9 @@
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.intent.matcher.BundleMatchers.hasEntry;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.doesNotHaveExtraWithKey;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.doesNotHaveFlag;
+import static androidx.test.espresso.intent.matcher.IntentMatchers.doesNotHaveFlags;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.filterEquals;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.hasAction;
 import static androidx.test.espresso.intent.matcher.IntentMatchers.hasCategories;
@@ -105,7 +108,6 @@ public void matchesIntentWithNoTypeAndMatcherWithType() {
         matcher.matches(new Intent(Intent.ACTION_VIEW).setData(uri).addCategory("category")));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void matchesIntentWithTypeAndMatcherWithNoType() {
     Matcher<Intent> matcher = hasAction(equalTo(Intent.ACTION_VIEW));
@@ -116,7 +118,6 @@ public void matchesIntentWithTypeAndMatcherWithNoType() {
     assertTrue(matcher.matches(intent));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void matchesIntentWithNoExtraAndMatcherWithOneExtra() {
     Matcher<Intent> matcher =
@@ -173,21 +174,18 @@ public void matchesIntentWithMultipleExtraAndMatcherWithMultipleExtra() {
                 .putExtra("key2", "value2")));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void matchesIntentWithNoCategoryAndMatcherWithOneCategory() {
     Matcher<Intent> matcher = hasCategories(hasItem(equalTo("category")));
     assertFalse(matcher.matches(new Intent(Intent.ACTION_VIEW, uri)));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void matchesIntentWithOneCategoryAndMatcherWithNoCategory() {
     Matcher<Intent> matcher = hasAction(equalTo(Intent.ACTION_VIEW));
     assertTrue(matcher.matches(new Intent(Intent.ACTION_VIEW, uri).addCategory("category")));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void matchesIntentAndMatcherWithMultipleCategory() {
     Matcher<Intent> matcher =
@@ -197,7 +195,6 @@ public void matchesIntentAndMatcherWithMultipleCategory() {
             new Intent(Intent.ACTION_VIEW, uri).addCategory("category").addCategory("category1")));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   public void matchesIntentWithOneCategoryAndMatcherWithMultipleCategories() {
     Matcher<Intent> matcher =
@@ -354,6 +351,13 @@ public void hasExtraWithKeyTesting() {
     assertTrue(hasExtraWithKey("key2").matches(intent));
   }
 
+  @Test
+  public void doesNotHaveExtraWithKeyTesting() {
+    Intent intent = new Intent().putExtra("key1", "value1").putExtra("key2", 100.0);
+    assertTrue(doesNotHaveExtraWithKey("key3").matches(intent));
+    assertTrue(doesNotHaveExtraWithKey("key4").matches(intent));
+  }
+
   @Test
   public void hasExtraTesting() {
     Intent intent =
@@ -378,6 +382,14 @@ public void hasExtraWithKeyDoesNotMatch() {
     assertFalse(hasExtraWithKey("key2").matches(intent));
   }
 
+  @Test
+  public void doesNotHaveExtraWithKeyDoesNotMatch() {
+    Intent intent = new Intent().putExtra("key1", "value1");
+    assertFalse(doesNotHaveExtraWithKey("key1").matches(intent));
+    assertFalse(doesNotHaveExtraWithKey("key1").matches(null));
+    assertFalse(doesNotHaveExtraWithKey("key1").matches("key1"));
+  }
+
   @Test
   public void hasExtraDoesNotMatch() {
     Intent intent = new Intent().putExtra("key1", "value1");
@@ -463,6 +475,50 @@ public void hasFlagsWithCustomFlagsDoesNotMatch() {
     assertFalse((hasFlags(Intent.FLAG_ACTIVITY_NO_HISTORY | 8)).matches(intent));
   }
 
+  @Test
+  public void doesNotHaveFlagsWithSingleFlag() {
+    Intent intent = new Intent();
+    assertTrue(doesNotHaveFlags(0).matches(intent));
+    assertTrue(doesNotHaveFlags(0).matches(new Intent().setFlags(1)));
+    assertTrue(doesNotHaveFlag(Intent.FLAG_GRANT_READ_URI_PERMISSION).matches(intent));
+    intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+    assertFalse(doesNotHaveFlag(Intent.FLAG_GRANT_READ_URI_PERMISSION).matches(intent));
+    assertFalse(doesNotHaveFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION).matches(intent));
+  }
+
+  @Test
+  public void doesNotHaveFlagsWithMultipleFlags() {
+    Intent intent = new Intent();
+    intent.setFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION | Intent.FLAG_ACTIVITY_NO_HISTORY);
+    assertTrue(doesNotHaveFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS).matches(intent));
+    assertFalse(doesNotHaveFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION).matches(intent));
+    assertFalse(doesNotHaveFlags(Intent.FLAG_ACTIVITY_NO_HISTORY).matches(intent));
+    assertFalse(
+        doesNotHaveFlags(
+                Intent.FLAG_DEBUG_LOG_RESOLUTION | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+            .matches(intent));
+    assertFalse(
+        doesNotHaveFlags(
+                Intent.FLAG_DEBUG_LOG_RESOLUTION, Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS)
+            .matches(intent));
+    assertTrue(
+        doesNotHaveFlags(
+                Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS,
+                Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY)
+            .matches(intent));
+  }
+
+  @Test
+  public void doesNotHaveFlagsWithCustomFlags() {
+    Intent intent = new Intent();
+    intent.addFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION | 8);
+    assertTrue((doesNotHaveFlags(16)).matches(intent));
+    assertTrue((doesNotHaveFlags(Intent.FLAG_ACTIVITY_NO_HISTORY, 16)).matches(intent));
+    assertFalse((doesNotHaveFlags(8 | 2)).matches(intent));
+    assertFalse((doesNotHaveFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION, 4)).matches(intent));
+    assertFalse((doesNotHaveFlags(Intent.FLAG_DEBUG_LOG_RESOLUTION, 8, 4)).matches(intent));
+  }
+
   @Test
   public void filterEqualsMatches() {
     Intent intent =
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/UriMatchersTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/UriMatchersTest.java
index e5ee45912..2b81dfaa2 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/matcher/UriMatchersTest.java
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/matcher/UriMatchersTest.java
@@ -32,7 +32,8 @@
 import android.net.Uri;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Sets;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.Set;
 import org.hamcrest.Matcher;
 import org.junit.Test;
@@ -209,7 +210,8 @@ public void anyOfMatcherWithMoreThanOneMatch() {
   @Test
   public void getQueryParameterNamesTesting() {
     Set<String> paramNames = getQueryParameterNames(uri);
-    assertTrue(paramNames.equals(Sets.newHashSet("q", "aq", "oq", "sourceid", "ie")));
+    assertTrue(
+        paramNames.equals(new LinkedHashSet<>(Arrays.asList("q", "aq", "oq", "sourceid", "ie"))));
   }
 
   @Test
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/rule/BUILD b/espresso/intents/javatests/androidx/test/espresso/intent/rule/BUILD
new file mode 100644
index 000000000..67adb5b65
--- /dev/null
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/rule/BUILD
@@ -0,0 +1,32 @@
+# Description:
+#   Tests for Espresso Intents lib.
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "IntentsRuleTest",
+    srcs = ["IntentsRuleTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/intents/java/androidx/test/espresso/intent/rule",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/intents/javatests/androidx/test/espresso/intent/rule/IntentsRuleTest.java b/espresso/intents/javatests/androidx/test/espresso/intent/rule/IntentsRuleTest.java
index 06781ba21..c242f133b 100644
--- a/espresso/intents/javatests/androidx/test/espresso/intent/rule/IntentsRuleTest.java
+++ b/espresso/intents/javatests/androidx/test/espresso/intent/rule/IntentsRuleTest.java
@@ -61,7 +61,7 @@ public void evaluate() throws Throwable {
 
   @Test
   public void withNoLaunchConstructor_WillNotBeInitializedAfterCreation() {
-    new IntentsTestRule<>(StubActivity.class, false, false);
+    var unused = new IntentsTestRule<>(StubActivity.class, false, false);
 
     assertThat(IntentStubberRegistry.isLoaded(), is(false));
   }
diff --git a/espresso/proguard_binary.cfg b/espresso/proguard_binary.cfg
deleted file mode 100644
index 75e93f6c4..000000000
--- a/espresso/proguard_binary.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-# ignore 'cannot find java.beans and mockito integration' warnings
--dontwarn org.hamcrest.**
-
--keep class androidx.test.espresso.** { *; }
-
-# ignore framework classes that reference TestCase and ParentRunner
--dontwarn org.junit.runners.ParentRunner
--dontwarn junit.runner.BaseTestRunner
--dontwarn junit.framework.TestCase
--dontwarn junit.framework.TestSuite
-
-# ignore 'can't find referenced method android.app.Instrumentation' from android.jar
--dontwarn androidx.test.runner.MonitoringInstrumentation
diff --git a/espresso/remote/BUILD b/espresso/remote/BUILD
new file mode 100644
index 000000000..5650ca273
--- /dev/null
+++ b/espresso/remote/BUILD
@@ -0,0 +1,19 @@
+# Alias for androidx.test.espresso.remote API library
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "remote",
+    visibility = ["//visibility:public"],
+    exports = [
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/assertion:web_assertions_proto_android_pb3",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/BUILD b/espresso/remote/java/androidx/test/espresso/BUILD
new file mode 100644
index 000000000..449f6e79e
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/BUILD
@@ -0,0 +1,26 @@
+# Description:
+#   Espresso - the new UI Test API for Android.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "data-interaction-remote",
+    srcs = [
+        "DataInteractionRemote.java",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/DataInteractionRemote.java b/espresso/remote/java/androidx/test/espresso/DataInteractionRemote.java
similarity index 94%
rename from espresso/core/java/androidx/test/espresso/DataInteractionRemote.java
rename to espresso/remote/java/androidx/test/espresso/DataInteractionRemote.java
index 8d34b2a50..c75e65da2 100644
--- a/espresso/core/java/androidx/test/espresso/DataInteractionRemote.java
+++ b/espresso/remote/java/androidx/test/espresso/DataInteractionRemote.java
@@ -17,6 +17,8 @@
 package androidx.test.espresso;
 
 import android.util.Log;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.espresso.DataInteraction.DisplayDataMatcher;
 import androidx.test.espresso.proto.matcher.ViewMatchers.DisplayDataMatcherProto;
 import androidx.test.espresso.remote.RemoteDescriptor;
@@ -25,7 +27,10 @@
 
 /**
  * Registers all supported DataInteraction remote features with the {@link RemoteDescriptorRegistry}
+ *
+ * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 public final class DataInteractionRemote {
   private static final String TAG = "DIRemote";
 
diff --git a/espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsg.java b/espresso/remote/java/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsg.java
similarity index 91%
rename from espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsg.java
rename to espresso/remote/java/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsg.java
index ecaa35ee2..6bfe6b8a6 100644
--- a/espresso/core/java/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsg.java
+++ b/espresso/remote/java/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsg.java
@@ -20,12 +20,12 @@
 import static androidx.test.espresso.remote.TypeProtoConverters.typeToByteString;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.proto.action.ViewActions.AdapterDataLoaderActionProto;
 import androidx.test.espresso.remote.ConstructorInvocation;
 import androidx.test.espresso.remote.EspressoRemoteMessage;
 import androidx.test.espresso.remote.TypeProtoConverters;
-import androidx.test.espresso.util.EspressoOptional;
 import org.hamcrest.Matcher;
 
 /**
@@ -36,7 +36,7 @@ public final class AdapterDataLoaderActionRemoteMsg
     implements EspressoRemoteMessage.To<AdapterDataLoaderActionProto> {
   @VisibleForTesting static final int NO_POSITION_SET = -1;
 
-  private final EspressoOptional<Integer> atPosition;
+  @Nullable private final Integer atPosition;
   private final Matcher<? extends Object> dataToLoadMatcher;
   private final Class<? extends AdapterViewProtocol> adapterViewProtocolClass;
 
@@ -50,7 +50,7 @@ public AdapterDataLoaderActionRemoteMsg(
   @Override
   public AdapterDataLoaderActionProto toProto() {
     return AdapterDataLoaderActionProto.newBuilder()
-        .setAtPosition(atPosition.or(NO_POSITION_SET))
+        .setAtPosition(atPosition == null ? NO_POSITION_SET : atPosition)
         .setDataToLoadMatcher(typeToAny(dataToLoadMatcher))
         .setAdapterViewProtocolClass(typeToByteString(adapterViewProtocolClass))
         .build();
@@ -73,12 +73,14 @@ public AdapterDataLoaderAction fromProto(
                   adapterViewProtocolClass.cast(
                       new ConstructorInvocation(adapterViewProtocolClass, null)
                           .invokeConstructor());
+              Integer atPosition =
+                  NO_POSITION_SET == dataLoaderActionProto.getAtPosition()
+                      ? null
+                      : dataLoaderActionProto.getAtPosition();
               return new AdapterDataLoaderAction(
                   TypeProtoConverters.<Matcher<? extends Object>>anyToType(
                       dataLoaderActionProto.getDataToLoadMatcher()),
-                  NO_POSITION_SET == dataLoaderActionProto.getAtPosition()
-                      ? EspressoOptional.<Integer>absent()
-                      : EspressoOptional.of(dataLoaderActionProto.getAtPosition()),
+                  atPosition,
                   adapterViewProtocol);
             }
           };
diff --git a/espresso/remote/java/androidx/test/espresso/action/BUILD b/espresso/remote/java/androidx/test/espresso/action/BUILD
new file mode 100644
index 000000000..43a8ad074
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/action/BUILD
@@ -0,0 +1,35 @@
+# Description:
+#  View Actions for espresso.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "remote_view_actions",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/action:adapter_view_protocol",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/remote/java/androidx/test/espresso/proto/action:ui_interaction_view_actions_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/action/GeneralClickActionRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/GeneralClickActionRemoteMessage.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/action/GeneralClickActionRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/GeneralClickActionRemoteMessage.java
diff --git a/espresso/core/java/androidx/test/espresso/action/GeneralLocationRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/GeneralLocationRemoteMessage.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/action/GeneralLocationRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/GeneralLocationRemoteMessage.java
index f741a9e5f..7591298e5 100644
--- a/espresso/core/java/androidx/test/espresso/action/GeneralLocationRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/action/GeneralLocationRemoteMessage.java
@@ -15,7 +15,7 @@
  */
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.proto.action.ViewActions.GeneralLocationProto.Location;
diff --git a/espresso/core/java/androidx/test/espresso/action/GeneralSwipeActionRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/GeneralSwipeActionRemoteMessage.java
similarity index 98%
rename from espresso/core/java/androidx/test/espresso/action/GeneralSwipeActionRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/GeneralSwipeActionRemoteMessage.java
index 718626529..8cd16c49f 100644
--- a/espresso/core/java/androidx/test/espresso/action/GeneralSwipeActionRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/action/GeneralSwipeActionRemoteMessage.java
@@ -18,7 +18,7 @@
 
 import static androidx.test.espresso.remote.TypeProtoConverters.anyToType;
 import static androidx.test.espresso.remote.TypeProtoConverters.typeToAny;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.ViewAction;
diff --git a/espresso/core/java/androidx/test/espresso/action/PressRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/PressRemoteMessage.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/action/PressRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/PressRemoteMessage.java
index c4b762896..1ca687649 100644
--- a/espresso/core/java/androidx/test/espresso/action/PressRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/action/PressRemoteMessage.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.proto.action.ViewActions.PressProto.Precision;
diff --git a/espresso/core/java/androidx/test/espresso/action/RemoteViewActions.java b/espresso/remote/java/androidx/test/espresso/action/RemoteViewActions.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/action/RemoteViewActions.java
rename to espresso/remote/java/androidx/test/espresso/action/RemoteViewActions.java
diff --git a/espresso/core/java/androidx/test/espresso/action/SwipeRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/SwipeRemoteMessage.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/action/SwipeRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/SwipeRemoteMessage.java
index c1ea977c0..163b040d7 100644
--- a/espresso/core/java/androidx/test/espresso/action/SwipeRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/action/SwipeRemoteMessage.java
@@ -15,7 +15,7 @@
  */
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.proto.action.ViewActions.SwipeViewActionProto;
diff --git a/espresso/core/java/androidx/test/espresso/action/TapRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/TapRemoteMessage.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/action/TapRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/TapRemoteMessage.java
index 34d56ecd4..2d9df25bb 100644
--- a/espresso/core/java/androidx/test/espresso/action/TapRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/action/TapRemoteMessage.java
@@ -15,7 +15,7 @@
  */
 package androidx.test.espresso.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.proto.action.ViewActions.ClickViewActionProto;
diff --git a/espresso/core/java/androidx/test/espresso/action/TranslatedCoordinatesProviderRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/action/TranslatedCoordinatesProviderRemoteMessage.java
similarity index 98%
rename from espresso/core/java/androidx/test/espresso/action/TranslatedCoordinatesProviderRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/action/TranslatedCoordinatesProviderRemoteMessage.java
index a243fbd9e..7c6a6be75 100644
--- a/espresso/core/java/androidx/test/espresso/action/TranslatedCoordinatesProviderRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/action/TranslatedCoordinatesProviderRemoteMessage.java
@@ -18,7 +18,7 @@
 
 import static androidx.test.espresso.remote.TypeProtoConverters.anyToType;
 import static androidx.test.espresso.remote.TypeProtoConverters.typeToAny;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.proto.action.ViewActions.TranslatedCoordinatesProviderProto;
diff --git a/espresso/remote/java/androidx/test/espresso/action/package-info.java b/espresso/remote/java/androidx/test/espresso/action/package-info.java
new file mode 100644
index 000000000..97d115058
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/action/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.action;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/assertion/BUILD b/espresso/remote/java/androidx/test/espresso/assertion/BUILD
new file mode 100644
index 000000000..2f13e06b9
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/assertion/BUILD
@@ -0,0 +1,28 @@
+# Description:
+#  View Assertions for New UI Test API.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "remote_view_assertions",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/remote/java/androidx/test/espresso/proto/assertion:ui_interaction_view_assertions_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/assertion/RemoteViewAssertions.java b/espresso/remote/java/androidx/test/espresso/assertion/RemoteViewAssertions.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/assertion/RemoteViewAssertions.java
rename to espresso/remote/java/androidx/test/espresso/assertion/RemoteViewAssertions.java
diff --git a/espresso/remote/java/androidx/test/espresso/assertion/package-info.java b/espresso/remote/java/androidx/test/espresso/assertion/package-info.java
new file mode 100644
index 000000000..b7ac4db3e
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/assertion/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.assertion;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/matcher/BUILD b/espresso/remote/java/androidx/test/espresso/matcher/BUILD
new file mode 100644
index 000000000..2f4789cf5
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/matcher/BUILD
@@ -0,0 +1,49 @@
+# Description:
+#  Matchers for Espresso!
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+REMOTE_HAMCREST_v1_3_CORE_MATCHERS = [
+    "RemoteHamcrestCoreMatchers13.java",
+]
+
+android_library(
+    name = "remote_view_matchers",
+    srcs = glob(
+        ["*.java"],
+        exclude = REMOTE_HAMCREST_v1_3_CORE_MATCHERS,
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:hamcrest_matchers_v1_3_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:ui_interaction_root_matchers_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//opensource/androidx:annotation",
+    ],
+)
+
+android_library(
+    name = "remote_hamcrest_v1_3_core_matchers",
+    srcs = glob(
+        REMOTE_HAMCREST_v1_3_CORE_MATCHERS,
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:hamcrest_matchers_v1_3_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/matcher/RemoteHamcrestCoreMatchers13.java b/espresso/remote/java/androidx/test/espresso/matcher/RemoteHamcrestCoreMatchers13.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/matcher/RemoteHamcrestCoreMatchers13.java
rename to espresso/remote/java/androidx/test/espresso/matcher/RemoteHamcrestCoreMatchers13.java
diff --git a/espresso/core/java/androidx/test/espresso/matcher/RemoteRootMatchers.java b/espresso/remote/java/androidx/test/espresso/matcher/RemoteRootMatchers.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/matcher/RemoteRootMatchers.java
rename to espresso/remote/java/androidx/test/espresso/matcher/RemoteRootMatchers.java
diff --git a/espresso/core/java/androidx/test/espresso/matcher/RemoteViewMatchers.java b/espresso/remote/java/androidx/test/espresso/matcher/RemoteViewMatchers.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/matcher/RemoteViewMatchers.java
rename to espresso/remote/java/androidx/test/espresso/matcher/RemoteViewMatchers.java
diff --git a/espresso/remote/java/androidx/test/espresso/matcher/package-info.java b/espresso/remote/java/androidx/test/espresso/matcher/package-info.java
new file mode 100644
index 000000000..3d38e6622
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/matcher/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.matcher;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/proto/BUILD b/espresso/remote/java/androidx/test/espresso/proto/BUILD
new file mode 100644
index 000000000..467d29f2d
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/BUILD
@@ -0,0 +1,42 @@
+# Protocol buffer definitions for remote UI interactions
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "ui_interaction_proto",
+    srcs = ["ui_interaction.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "ui_interaction_android_pb3",
+    deps = [
+        ":ui_interaction_proto",
+    ],
+)
+
+# gather up the package-infos which hide the proto generated code from public API
+java_library(
+    name = "package-infos",
+    srcs = ["package-info.java"],
+    exports = [
+        "//espresso/remote/java/androidx/test/espresso/proto/action:package-info",
+        "//espresso/remote/java/androidx/test/espresso/proto/assertion:package-info",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:package-info",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/proto/action/BUILD b/espresso/remote/java/androidx/test/espresso/proto/action/BUILD
new file mode 100644
index 000000000..687104c33
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/action/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote UI interactions view matchers
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "view_actions_proto",
+    srcs = ["view_actions.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "ui_interaction_view_actions_android_pb3",
+    deps = [":view_actions_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/proto/action/package-info.java b/espresso/remote/java/androidx/test/espresso/proto/action/package-info.java
new file mode 100644
index 000000000..d849da757
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/action/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.proto.action;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/proto/action/view_actions.proto b/espresso/remote/java/androidx/test/espresso/proto/action/view_actions.proto
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/proto/action/view_actions.proto
rename to espresso/remote/java/androidx/test/espresso/proto/action/view_actions.proto
index 42b82e79c..b7fa32010 100644
--- a/espresso/core/java/androidx/test/espresso/proto/action/view_actions.proto
+++ b/espresso/remote/java/androidx/test/espresso/proto/action/view_actions.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.ui.action;
 
-option java_package = "androidx.test.espresso.proto.action";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.proto.action";
+
 message ClickViewActionProto {
   string id = 1;
   // TODO(b/30594545): check with earl grey team which one of these fields are
diff --git a/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD b/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD
new file mode 100644
index 000000000..6de80e787
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/assertion/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote view assertions
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "view_assertions_proto",
+    srcs = ["view_assertions.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "ui_interaction_view_assertions_android_pb3",
+    deps = [":view_assertions_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/proto/assertion/package-info.java b/espresso/remote/java/androidx/test/espresso/proto/assertion/package-info.java
new file mode 100644
index 000000000..6a6df7868
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/assertion/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.proto.assertion;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/proto/assertion/view_assertions.proto b/espresso/remote/java/androidx/test/espresso/proto/assertion/view_assertions.proto
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/proto/assertion/view_assertions.proto
rename to espresso/remote/java/androidx/test/espresso/proto/assertion/view_assertions.proto
index 5f87472a6..4aa718fc9 100644
--- a/espresso/core/java/androidx/test/espresso/proto/assertion/view_assertions.proto
+++ b/espresso/remote/java/androidx/test/espresso/proto/assertion/view_assertions.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.ui.action;
 
-option java_package = "androidx.test.espresso.proto.assertion";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.proto.assertion";
+
 message MatchesViewAssertionProto {
   string id = 1;
   google.protobuf.Any viewMatcher = 2;
diff --git a/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD b/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD
new file mode 100644
index 000000000..07ea38f54
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/matcher/BUILD
@@ -0,0 +1,60 @@
+# Protocol buffer definitions for remote root, view and hamcrest matchers (v1.3)
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "root_matchers_proto",
+    srcs = ["root_matchers.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "ui_interaction_root_matchers_android_pb3",
+    deps = [":root_matchers_proto"],
+)
+
+proto_library(
+    name = "view_matchers_proto",
+    srcs = ["view_matchers.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "ui_interaction_view_matchers_android_pb3",
+    deps = [":view_matchers_proto"],
+)
+
+proto_library(
+    name = "hamcrest_matchersv1_3_proto",
+    srcs = ["hamcrest_matchersv1_3.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "hamcrest_matchers_v1_3_android_pb3",
+    deps = [":hamcrest_matchersv1_3_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/core/java/androidx/test/espresso/proto/matcher/hamcrest_matchersv1_3.proto b/espresso/remote/java/androidx/test/espresso/proto/matcher/hamcrest_matchersv1_3.proto
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/proto/matcher/hamcrest_matchersv1_3.proto
rename to espresso/remote/java/androidx/test/espresso/proto/matcher/hamcrest_matchersv1_3.proto
index 58fba16c7..52134476a 100644
--- a/espresso/core/java/androidx/test/espresso/proto/matcher/hamcrest_matchersv1_3.proto
+++ b/espresso/remote/java/androidx/test/espresso/proto/matcher/hamcrest_matchersv1_3.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.hamcrest.matcher13;
 
-option java_package = "androidx.test.espresso.proto.matcher13";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.proto.matcher13";
+
 message IsEqualProto {
   string id = 1;
   bytes expectedValue = 2;
diff --git a/espresso/remote/java/androidx/test/espresso/proto/matcher/package-info.java b/espresso/remote/java/androidx/test/espresso/proto/matcher/package-info.java
new file mode 100644
index 000000000..ada2dc5d2
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/matcher/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.proto.matcher;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/proto/matcher/root_matchers.proto b/espresso/remote/java/androidx/test/espresso/proto/matcher/root_matchers.proto
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/proto/matcher/root_matchers.proto
rename to espresso/remote/java/androidx/test/espresso/proto/matcher/root_matchers.proto
index 756d7c20b..ae124e1c7 100644
--- a/espresso/core/java/androidx/test/espresso/proto/matcher/root_matchers.proto
+++ b/espresso/remote/java/androidx/test/espresso/proto/matcher/root_matchers.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.ui.matcher;
 
-option java_package = "androidx.test.espresso.proto.matcher";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.proto.matcher";
+
 message IsFocusableProto {
   string id = 1;
 }
diff --git a/espresso/core/java/androidx/test/espresso/proto/matcher/view_matchers.proto b/espresso/remote/java/androidx/test/espresso/proto/matcher/view_matchers.proto
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/proto/matcher/view_matchers.proto
rename to espresso/remote/java/androidx/test/espresso/proto/matcher/view_matchers.proto
diff --git a/espresso/remote/java/androidx/test/espresso/proto/package-info.java b/espresso/remote/java/androidx/test/espresso/proto/package-info.java
new file mode 100644
index 000000000..69f5efb84
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/proto/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.proto;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/core/java/androidx/test/espresso/proto/ui_interaction.proto b/espresso/remote/java/androidx/test/espresso/proto/ui_interaction.proto
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/proto/ui_interaction.proto
rename to espresso/remote/java/androidx/test/espresso/proto/ui_interaction.proto
index 6c1fcb834..06f9c5447 100644
--- a/espresso/core/java/androidx/test/espresso/proto/ui_interaction.proto
+++ b/espresso/remote/java/androidx/test/espresso/proto/ui_interaction.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
 
 package google.test.remote.ui;
 
-option java_package = "androidx.test.espresso.proto";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.proto";
+
 message InteractionRequestProto {
   google.protobuf.Any view_matcher = 1;
   oneof action_or_assertion {
diff --git a/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml b/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml
new file mode 100644
index 000000000..7e40ca101
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2018 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.espresso.remote" >
+
+    <uses-sdk
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
+
+    <application />
+
+</manifest>
diff --git a/espresso/core/java/androidx/test/espresso/remote/AnyToTypeConverter.java b/espresso/remote/java/androidx/test/espresso/remote/AnyToTypeConverter.java
similarity index 98%
rename from espresso/core/java/androidx/test/espresso/remote/AnyToTypeConverter.java
rename to espresso/remote/java/androidx/test/espresso/remote/AnyToTypeConverter.java
index 1848b314e..7bf2c3ea8 100644
--- a/espresso/core/java/androidx/test/espresso/remote/AnyToTypeConverter.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/AnyToTypeConverter.java
@@ -16,7 +16,7 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.remote.EspressoRemoteMessage.From;
diff --git a/espresso/remote/java/androidx/test/espresso/remote/BUILD b/espresso/remote/java/androidx/test/espresso/remote/BUILD
new file mode 100644
index 000000000..f522c97c8
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/BUILD
@@ -0,0 +1,157 @@
+# Description:
+#  Remote package for espresso.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+COMMON_JAVACOPTS = [
+    "-Xep:ObjectToString:OFF",  # See http://go/objecttostring-lsc
+]
+
+REMOTE_REGISTRY = [
+    "RemoteDescriptorRegistry.java",
+    "RemoteDescriptor.java",
+    "FieldDescriptor.java",
+]
+
+android_library(
+    name = "registry",
+    srcs = REMOTE_REGISTRY,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@com_google_protobuf//:protobuf_javalite",
+    ],
+)
+
+PROTO_UTILS = [
+    "Converter.java",
+    "AnyToTypeConverter.java",
+    "TypeToAnyConverter.java",
+    "ByteStringToTypeConverter.java",
+    "TypeToByteStringConverter.java",
+    "ParcelableToByteStringConverter.java",
+    "ByteStringToParcelableConverter.java",
+    "TypeProtoConverters.java",
+    "ProtoUtils.java",
+    "InteractionRequest.java",
+    "GenericRemoteMessage.java",
+    "RemoteMessageSerializer.java",
+    "RemoteMessageDeserializer.java",
+    "BuilderReflector.java",
+    "ProtoReflector.java",
+]
+
+android_library(
+    name = "protoUtils",
+    srcs = PROTO_UTILS,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":registry",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:aidls",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//opensource/androidx:annotation",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+android_library(
+    name = "remote",
+    srcs = glob(
+        ["*.java"],
+        exclude = PROTO_UTILS + REMOTE_REGISTRY,
+    ),
+    javacopts = COMMON_JAVACOPTS,
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [
+        ":proguard_library.cfg",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":protoUtils",
+        ":registry",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:aidls",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/remote/java/androidx/test/espresso:data-interaction-remote",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:package-infos",  # unuseddeps: keep
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/model:remote_web_model_atoms",
+        "//espresso/remote/java/androidx/test/espresso/web/proto:package-infos",  # unuseddeps: keep
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/remote/java/androidx/test/espresso/web/webdriver:remote_webdriver_atoms",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
+    ],
+)
+
+axt_android_aar(
+    name = "espresso_remote_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso",
+    ],
+    included_dep = ":remote",
+    jarjar_rule = "aar_jarjar_rules.txt",
+)
+
+maven_artifact(
+    name = "espresso_remote_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":espresso_remote_aar",
+)
+
+dackka_test(
+    name = "espresso_remote_doc",
+    runtime_dep = ":remote",
+    src_jar = ":espresso_remote_aar-src.jar",
+)
+
+api_checks(
+    name = "espresso_remote_api",
+    runtime_dep = ":remote",
+    src_jar = ":espresso_remote_aar-src.jar",
+)
diff --git a/espresso/core/java/androidx/test/espresso/remote/BuilderReflector.java b/espresso/remote/java/androidx/test/espresso/remote/BuilderReflector.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/remote/BuilderReflector.java
rename to espresso/remote/java/androidx/test/espresso/remote/BuilderReflector.java
index f79449bef..c18c2d604 100644
--- a/espresso/core/java/androidx/test/espresso/remote/BuilderReflector.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/BuilderReflector.java
@@ -17,8 +17,8 @@
 package androidx.test.espresso.remote;
 
 import static androidx.test.espresso.remote.ProtoUtils.capitalizeFirstChar;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
diff --git a/espresso/core/java/androidx/test/espresso/remote/ByteStringToParcelableConverter.java b/espresso/remote/java/androidx/test/espresso/remote/ByteStringToParcelableConverter.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/remote/ByteStringToParcelableConverter.java
rename to espresso/remote/java/androidx/test/espresso/remote/ByteStringToParcelableConverter.java
index 9ed5715ee..a54058955 100644
--- a/espresso/core/java/androidx/test/espresso/remote/ByteStringToParcelableConverter.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/ByteStringToParcelableConverter.java
@@ -16,7 +16,7 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.os.Parcel;
 import android.os.Parcelable;
diff --git a/espresso/core/java/androidx/test/espresso/remote/ByteStringToTypeConverter.java b/espresso/remote/java/androidx/test/espresso/remote/ByteStringToTypeConverter.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/remote/ByteStringToTypeConverter.java
rename to espresso/remote/java/androidx/test/espresso/remote/ByteStringToTypeConverter.java
diff --git a/espresso/core/java/androidx/test/espresso/remote/Converter.java b/espresso/remote/java/androidx/test/espresso/remote/Converter.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/remote/Converter.java
rename to espresso/remote/java/androidx/test/espresso/remote/Converter.java
diff --git a/espresso/core/java/androidx/test/espresso/remote/EspressoRemote.java b/espresso/remote/java/androidx/test/espresso/remote/EspressoRemote.java
similarity index 96%
rename from espresso/core/java/androidx/test/espresso/remote/EspressoRemote.java
rename to espresso/remote/java/androidx/test/espresso/remote/EspressoRemote.java
index a06fbe326..62bcfc502 100644
--- a/espresso/core/java/androidx/test/espresso/remote/EspressoRemote.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/EspressoRemote.java
@@ -20,8 +20,8 @@
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.remote.InteractionResponse.RemoteError.REMOTE_ESPRESSO_ERROR_CODE;
 import static androidx.test.espresso.remote.InteractionResponse.RemoteError.REMOTE_PROTOCOL_ERROR_CODE;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static androidx.test.internal.util.LogUtil.logDebugWithProcess;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 import android.os.Bundle;
 import android.os.Handler;
@@ -31,10 +31,10 @@
 import android.os.Message;
 import android.os.Messenger;
 import android.os.RemoteException;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.util.Log;
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.DataInteractionRemote;
 import androidx.test.espresso.Root;
@@ -55,7 +55,6 @@
 import androidx.test.espresso.web.webdriver.RemoteWebDriverAtoms;
 import androidx.test.internal.runner.InstrumentationConnection;
 import androidx.test.internal.util.ParcelableIBinder;
-import com.google.common.base.Throwables;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Locale;
@@ -67,6 +66,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
+import kotlin.ExceptionsKt;
 import org.hamcrest.Matcher;
 
 /**
@@ -173,6 +173,20 @@ public synchronized boolean isRemoteProcess() {
     return isRemoteProcess;
   }
 
+  @Override
+  public boolean isRemoteClient() {
+    return !isRemoteProcess();
+  }
+
+  /**
+   * Creates a callable to run Espresso check interaction on remote processes
+   *
+   * @param rootMatcher the root matcher to use.
+   * @param viewMatcher the view matcher to use.
+   * @param iBinders a list of binders to pass along to the remote process instance
+   * @param viewAssertion the view assertion to use.
+   * @return the Callable
+   */
   @Override
   public synchronized Callable<Void> createRemoteCheckCallable(
       final Matcher<Root> rootMatcher,
@@ -650,17 +664,19 @@ private InteractionResponse executeRequest(Bundle data) {
         if (canExecute) {
           // Execute Espresso code to un-serialize and run view matchers, actions and assertions.
           status = RemoteInteractionStrategy.from(interactionRequest, data).execute();
+        } else {
+          remoteError = new RemoteError(REMOTE_ESPRESSO_ERROR_CODE, "Cannot execute interaction");
         }
 
       } catch (RemoteProtocolException rpe) {
         remoteError =
-            new RemoteError(REMOTE_PROTOCOL_ERROR_CODE, Throwables.getStackTraceAsString(rpe));
+            new RemoteError(REMOTE_PROTOCOL_ERROR_CODE, ExceptionsKt.stackTraceToString(rpe));
       } catch (RuntimeException re) {
         remoteError =
-            new RemoteError(REMOTE_ESPRESSO_ERROR_CODE, Throwables.getStackTraceAsString(re));
+            new RemoteError(REMOTE_ESPRESSO_ERROR_CODE, ExceptionsKt.stackTraceToString(re));
       } catch (Error error) {
         remoteError =
-            new RemoteError(REMOTE_ESPRESSO_ERROR_CODE, Throwables.getStackTraceAsString(error));
+            new RemoteError(REMOTE_ESPRESSO_ERROR_CODE, ExceptionsKt.stackTraceToString(error));
       }
 
       return new InteractionResponse.Builder()
diff --git a/espresso/core/java/androidx/test/espresso/remote/FieldDescriptor.java b/espresso/remote/java/androidx/test/espresso/remote/FieldDescriptor.java
similarity index 94%
rename from espresso/core/java/androidx/test/espresso/remote/FieldDescriptor.java
rename to espresso/remote/java/androidx/test/espresso/remote/FieldDescriptor.java
index 2360e48ec..b265c5df6 100644
--- a/espresso/core/java/androidx/test/espresso/remote/FieldDescriptor.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/FieldDescriptor.java
@@ -16,14 +16,14 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
-import com.google.common.collect.ImmutableList;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.TreeMap;
@@ -87,7 +87,7 @@ static List<FieldDescriptor> getFieldDescriptorsFromAnnotation(
         targetFields.put(order, of(field, remoteMsgFieldAnnotation));
       }
     }
-    return ImmutableList.copyOf(targetFields.values());
+    return new ArrayList<>(targetFields.values());
   }
 
   @Override
diff --git a/espresso/core/java/androidx/test/espresso/remote/GenericRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/remote/GenericRemoteMessage.java
similarity index 99%
rename from espresso/core/java/androidx/test/espresso/remote/GenericRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/remote/GenericRemoteMessage.java
index 450fa256e..7bb75eb00 100644
--- a/espresso/core/java/androidx/test/espresso/remote/GenericRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/GenericRemoteMessage.java
@@ -17,7 +17,7 @@
 
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
diff --git a/espresso/core/java/androidx/test/espresso/remote/InteractionRequest.java b/espresso/remote/java/androidx/test/espresso/remote/InteractionRequest.java
similarity index 98%
rename from espresso/core/java/androidx/test/espresso/remote/InteractionRequest.java
rename to espresso/remote/java/androidx/test/espresso/remote/InteractionRequest.java
index 23c39fdc8..a25bf60a3 100644
--- a/espresso/core/java/androidx/test/espresso/remote/InteractionRequest.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/InteractionRequest.java
@@ -16,13 +16,13 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
+import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.view.View;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.Root;
 import androidx.test.espresso.ViewAction;
@@ -156,8 +156,6 @@ public ViewAssertion getViewAssertion() {
 
   /**
    * Creates an instance of {@link InteractionRequest} from a View matcher and action.
-   *
-   * @return remote request object
    */
   public static class Builder {
     private final RemoteDescriptorRegistry remoteDescriptorRegistry;
diff --git a/espresso/core/java/androidx/test/espresso/remote/InteractionResponse.java b/espresso/remote/java/androidx/test/espresso/remote/InteractionResponse.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/remote/InteractionResponse.java
rename to espresso/remote/java/androidx/test/espresso/remote/InteractionResponse.java
index 58e1b8e96..bb9ff5491 100644
--- a/espresso/core/java/androidx/test/espresso/remote/InteractionResponse.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/InteractionResponse.java
@@ -17,14 +17,14 @@
 package androidx.test.espresso.remote;
 
 import static androidx.test.espresso.remote.InteractionResponse.Status.Ok;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.proto.UiInteraction.Error;
 import androidx.test.espresso.proto.UiInteraction.InteractionResultProto;
@@ -129,10 +129,8 @@ public enum Status {
     Error
   }
 
-  /**
-   * TODO(b/31122396): parse this from a proto Enum representing wire protocol error codes and their
-   * default description.
-   */
+  // TODO(b/31122396): parse this from a proto Enum representing wire protocol error codes and their
+  // default description.
   public static final class RemoteError {
     private static final String TAG = "RemoteError";
 
diff --git a/espresso/core/java/androidx/test/espresso/remote/ParcelableToByteStringConverter.java b/espresso/remote/java/androidx/test/espresso/remote/ParcelableToByteStringConverter.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/remote/ParcelableToByteStringConverter.java
rename to espresso/remote/java/androidx/test/espresso/remote/ParcelableToByteStringConverter.java
diff --git a/espresso/core/java/androidx/test/espresso/remote/ProtoReflector.java b/espresso/remote/java/androidx/test/espresso/remote/ProtoReflector.java
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/remote/ProtoReflector.java
rename to espresso/remote/java/androidx/test/espresso/remote/ProtoReflector.java
diff --git a/espresso/core/java/androidx/test/espresso/remote/ProtoUtils.java b/espresso/remote/java/androidx/test/espresso/remote/ProtoUtils.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/remote/ProtoUtils.java
rename to espresso/remote/java/androidx/test/espresso/remote/ProtoUtils.java
index 1314932d7..24c92fa39 100644
--- a/espresso/core/java/androidx/test/espresso/remote/ProtoUtils.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/ProtoUtils.java
@@ -16,8 +16,8 @@
  */
 package androidx.test.espresso.remote;
 
-import com.google.common.collect.Lists;
 import java.lang.reflect.Field;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 
@@ -60,7 +60,7 @@ public static <T extends Enum> T checkedGetEnumForProto(int protoEnumIndex, Clas
    */
   public static List<Field> getFilteredFieldList(Class<?> clazz, List<String> targetFieldNames)
       throws NoSuchFieldException {
-    List<Field> targetFields = Lists.newLinkedList();
+    List<Field> targetFields = new LinkedList<>();
     for (String targetFieldName : targetFieldNames) {
       targetFields.add(getFieldRecursively(clazz, targetFieldName, null));
     }
diff --git a/espresso/core/java/androidx/test/espresso/remote/RemoteDescriptor.java b/espresso/remote/java/androidx/test/espresso/remote/RemoteDescriptor.java
similarity index 94%
rename from espresso/core/java/androidx/test/espresso/remote/RemoteDescriptor.java
rename to espresso/remote/java/androidx/test/espresso/remote/RemoteDescriptor.java
index cd863b595..c9136488e 100644
--- a/espresso/core/java/androidx/test/espresso/remote/RemoteDescriptor.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/RemoteDescriptor.java
@@ -16,18 +16,19 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+import static java.util.Collections.singletonList;
 
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
-import com.google.common.base.Joiner;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import androidx.test.espresso.util.StringJoinerKt;
 import com.google.protobuf.Parser;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
@@ -162,7 +163,7 @@ public static final class Builder {
         "androidx.test.espresso.remote.GenericRemoteMessage";
 
     private Class<?> instanceType;
-    private List<FieldDescriptor> instanceFieldDescriptorList = Lists.newArrayList();
+    private List<FieldDescriptor> instanceFieldDescriptorList = new ArrayList<>();
 
     private Class<?> remoteType;
     private List<Class<?>> remoteConstrTypes;
@@ -191,7 +192,7 @@ private static List<FieldDescriptor> getFieldDescriptorsFromAnnotation(
                   "RemoteMsgField field annotations found for type: %s. Ignoring"
                       + "field descriptors: %s, registered with RemoteDescriptorRegistry",
                   instanceType,
-                  Joiner.on(",").join(originalFieldDescriptors)));
+                  StringJoinerKt.joinToString(originalFieldDescriptors, ",")));
         }
         // return annotated field descriptors
         return annotatedFieldList;
@@ -228,7 +229,7 @@ public Builder setInstanceType(@NonNull Class<?> instanceType) {
      * @return fluent builder interface
      */
     public Builder setInstanceFieldDescriptors(@Nullable FieldDescriptor... fieldDescriptors) {
-      this.instanceFieldDescriptorList = ImmutableList.copyOf(fieldDescriptors);
+      this.instanceFieldDescriptorList = Arrays.asList(fieldDescriptors);
       return this;
     }
 
@@ -260,7 +261,7 @@ public Builder setRemoteType(@NonNull Class<?> remoteType) {
      * @return fluent builder interface
      */
     public Builder setRemoteConstrTypes(@Nullable Class<?>... remoteConstrTypes) {
-      this.remoteConstrTypes = ImmutableList.copyOf(remoteConstrTypes);
+      this.remoteConstrTypes = Arrays.asList(remoteConstrTypes);
       return this;
     }
 
@@ -320,13 +321,13 @@ public RemoteDescriptor build() {
 
       // Most remote message constructors will use the instance type as constructor param type
       if (null == remoteConstrTypes) {
-        remoteConstrTypes = ImmutableList.<Class<?>>of(instanceType);
+        remoteConstrTypes = singletonList(instanceType);
       }
 
       // GenericRemoteMessage constructor param type is always Object.class
       try {
         if (remoteType.isAssignableFrom(Class.forName(GENERIC_REMOTE_MESSAGE_CLS))) {
-          remoteConstrTypes = ImmutableList.<Class<?>>of(Object.class);
+          remoteConstrTypes = singletonList(Object.class);
         }
       } catch (ClassNotFoundException cnfe) {
         throw new IllegalStateException(
diff --git a/espresso/core/java/androidx/test/espresso/remote/RemoteDescriptorRegistry.java b/espresso/remote/java/androidx/test/espresso/remote/RemoteDescriptorRegistry.java
similarity index 98%
rename from espresso/core/java/androidx/test/espresso/remote/RemoteDescriptorRegistry.java
rename to espresso/remote/java/androidx/test/espresso/remote/RemoteDescriptorRegistry.java
index 9b60eb024..fe2e97860 100644
--- a/espresso/core/java/androidx/test/espresso/remote/RemoteDescriptorRegistry.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/RemoteDescriptorRegistry.java
@@ -16,12 +16,12 @@
 
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import java.util.HashMap;
 import java.util.List;
diff --git a/espresso/core/java/androidx/test/espresso/remote/RemoteMessageDeserializer.java b/espresso/remote/java/androidx/test/espresso/remote/RemoteMessageDeserializer.java
similarity index 82%
rename from espresso/core/java/androidx/test/espresso/remote/RemoteMessageDeserializer.java
rename to espresso/remote/java/androidx/test/espresso/remote/RemoteMessageDeserializer.java
index 4c306641b..f021351a2 100644
--- a/espresso/core/java/androidx/test/espresso/remote/RemoteMessageDeserializer.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/RemoteMessageDeserializer.java
@@ -16,20 +16,19 @@
  */
 package androidx.test.espresso.remote;
 
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.LogUtil.lazyArg;
 import static androidx.test.internal.util.LogUtil.logDebug;
-import static com.google.common.base.Preconditions.checkNotNull;
 
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
-import com.google.common.base.Function;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
+import androidx.test.espresso.util.StringJoinerKt;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.MessageLite;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -99,7 +98,7 @@ public Object fromProto(@NonNull MessageLite messageLite) {
   private Object fromProtoInternal(MessageLite messageLite, RemoteDescriptor remoteDescriptor) {
     // List that will be used to store constructor parameters. These values will later be passed
     // along to the constructor of the target object
-    List<Object> constructorParams = Lists.newArrayList();
+    List<Object> constructorParams = new ArrayList<>();
     // Create a new proto reflector to interact with a proto msg
     ProtoReflector protoReflector =
         new ProtoReflector(remoteDescriptor.getProtoType(), messageLite);
@@ -112,19 +111,11 @@ private Object fromProtoInternal(MessageLite messageLite, RemoteDescriptor remot
       // Process Iterable types
       if (Iterable.class.isAssignableFrom(fieldDescriptor.fieldType)) {
         List<Any> iterable = protoReflector.getAnyList(fieldDescriptor.fieldName);
-        constructorParam =
-            Iterables.transform(
-                iterable,
-                new Function<MessageLite, Object>() {
-                  @Override
-                  public Object apply(MessageLite messageLite) {
-                    if (messageLite instanceof Any) {
-                      return TypeProtoConverters.anyToType(
-                          (Any) messageLite, remoteDescriptorRegistry);
-                    }
-                    return fromProto(messageLite);
-                  }
-                });
+        List<Object> anys = new ArrayList<>();
+        for (Any any : iterable) {
+          anys.add(TypeProtoConverters.anyToType(any, remoteDescriptorRegistry));
+        }
+        constructorParam = anys;
       } else if (Serializable.class.isAssignableFrom(fieldDescriptor.fieldType)
           || Object.class == fieldDescriptor.fieldType
           || fieldDescriptor.fieldType.isPrimitive()) {
@@ -148,17 +139,11 @@ public Object apply(MessageLite messageLite) {
     // Reflectively create the instance and return it
     Object instance = null;
     try {
+      // Transform fieldDescriptorList into a new list which contains only field types
       Class<?>[] constructorTypes = new Class<?>[fieldDescriptorList.size()];
-      Lists.transform(
-              fieldDescriptorList,
-              new Function<FieldDescriptor, Class<?>>() {
-                @Override
-                public Class<?> apply(FieldDescriptor fieldDescriptor) {
-                  // Transform fieldDescriptorList into a new list which contains only field types
-                  return fieldDescriptor.fieldType;
-                }
-              })
-          .toArray(constructorTypes);
+      for (int i = 0; i < fieldDescriptorList.size(); i++) {
+        constructorTypes[i] = fieldDescriptorList.get(i).fieldType;
+      }
 
       instance =
           new ConstructorInvocation(
@@ -172,8 +157,8 @@ public Class<?> apply(FieldDescriptor fieldDescriptor) {
           messageLite.getClass().getSimpleName(),
           instance,
           remoteDescriptor.getInstanceType(),
-          Joiner.on(",").join(constructorParams),
-          Arrays.toString(remoteDescriptor.getInstanceType().getConstructors()));
+          StringJoinerKt.joinToString(constructorParams, ","),
+          lazyArg(() -> Arrays.toString(remoteDescriptor.getInstanceType().getConstructors())));
     }
     return instance;
   }
diff --git a/espresso/core/java/androidx/test/espresso/remote/RemoteMessageSerializer.java b/espresso/remote/java/androidx/test/espresso/remote/RemoteMessageSerializer.java
similarity index 91%
rename from espresso/core/java/androidx/test/espresso/remote/RemoteMessageSerializer.java
rename to espresso/remote/java/androidx/test/espresso/remote/RemoteMessageSerializer.java
index cfe91edcb..5d0a9c97c 100644
--- a/espresso/core/java/androidx/test/espresso/remote/RemoteMessageSerializer.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/RemoteMessageSerializer.java
@@ -17,14 +17,12 @@
 package androidx.test.espresso.remote;
 
 import static androidx.test.espresso.remote.ProtoUtils.getFilteredFieldList;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 import static androidx.test.internal.util.LogUtil.logDebug;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
 
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
-import com.google.common.base.Function;
-import com.google.common.collect.Lists;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.MessageLite;
@@ -99,19 +97,13 @@ public MessageLite toProto() {
   private MessageLite toProtoInternal() {
     List<Field> targetFields = null;
     try {
+      // Transform fieldDescriptorList into a new list which contains field names
+      List<String> fieldNames = new ArrayList<>();
+      for (FieldDescriptor fieldDescriptor : fieldDescriptorList) {
+        fieldNames.add(fieldDescriptor.fieldName);
+      }
       // Filter a class declared fields based on field descriptor names
-      targetFields =
-          getFilteredFieldList(
-              instance.getClass(),
-              Lists.transform(
-                  fieldDescriptorList,
-                  new Function<FieldDescriptor, String>() {
-                    @Override
-                    public String apply(FieldDescriptor fieldDescriptor) {
-                      // Transform fieldDescriptorList into a new list which contains field names
-                      return fieldDescriptor.fieldName;
-                    }
-                  }));
+      targetFields = getFilteredFieldList(instance.getClass(), fieldNames);
       return createProtoFromTargetFields(targetFields, instance);
     } catch (Exception e) {
       if ((e instanceof RemoteProtocolException)) {
diff --git a/espresso/core/java/androidx/test/espresso/remote/TypeProtoConverters.java b/espresso/remote/java/androidx/test/espresso/remote/TypeProtoConverters.java
similarity index 97%
rename from espresso/core/java/androidx/test/espresso/remote/TypeProtoConverters.java
rename to espresso/remote/java/androidx/test/espresso/remote/TypeProtoConverters.java
index 5bd0dc8a7..f7baf83db 100644
--- a/espresso/core/java/androidx/test/espresso/remote/TypeProtoConverters.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/TypeProtoConverters.java
@@ -17,7 +17,7 @@
 
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
@@ -131,6 +131,7 @@ public static ByteString parcelableToByteString(@NonNull Parcelable parcelable)
    * Performs a {@link ByteString} to {@link Parcelable} conversion.
    *
    * @param byteString the {@link ByteString} to convert to a {@link Parcelable}
+   * @param parcelableClass the class type to create
    * @return instance of {@link Parcelable}
    */
   public static Parcelable byteStringToParcelable(
diff --git a/espresso/core/java/androidx/test/espresso/remote/TypeToAnyConverter.java b/espresso/remote/java/androidx/test/espresso/remote/TypeToAnyConverter.java
similarity index 94%
rename from espresso/core/java/androidx/test/espresso/remote/TypeToAnyConverter.java
rename to espresso/remote/java/androidx/test/espresso/remote/TypeToAnyConverter.java
index f7a4194ac..05abc0183 100644
--- a/espresso/core/java/androidx/test/espresso/remote/TypeToAnyConverter.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/TypeToAnyConverter.java
@@ -16,8 +16,8 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import androidx.annotation.NonNull;
 import androidx.test.espresso.remote.EspressoRemoteMessage.To;
diff --git a/espresso/core/java/androidx/test/espresso/remote/TypeToByteStringConverter.java b/espresso/remote/java/androidx/test/espresso/remote/TypeToByteStringConverter.java
similarity index 96%
rename from espresso/core/java/androidx/test/espresso/remote/TypeToByteStringConverter.java
rename to espresso/remote/java/androidx/test/espresso/remote/TypeToByteStringConverter.java
index 3d6c42f21..a2706ab5d 100644
--- a/espresso/core/java/androidx/test/espresso/remote/TypeToByteStringConverter.java
+++ b/espresso/remote/java/androidx/test/espresso/remote/TypeToByteStringConverter.java
@@ -16,7 +16,7 @@
  */
 package androidx.test.espresso.remote;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import com.google.protobuf.ByteString;
diff --git a/espresso/remote/java/androidx/test/espresso/remote/aar_jarjar_rules.txt b/espresso/remote/java/androidx/test/espresso/remote/aar_jarjar_rules.txt
new file mode 100644
index 000000000..85afed7de
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/aar_jarjar_rules.txt
@@ -0,0 +1,2 @@
+rule com.google.protobuf.** androidx.test.espresso.remote.internal.deps.protobuf.@1
+
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.4.0_public.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.4.0_public.txt
new file mode 100644
index 000000000..e0bbc4f1c
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.4.0_public.txt
@@ -0,0 +1,179 @@
+// Signature format: 3.0
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<?>, Class<? extends java.lang.annotation.Annotation>?, Class<?>!...);
+    method public Object! invokeConstructor(java.lang.Object!...);
+  }
+
+  public interface Converter<I, O> {
+    method public O! convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T! fromProto(M!);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M! toProto();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<?>, String, int);
+    field public final String! fieldName;
+    field public final Class<?>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    ctor public GenericRemoteMessage(Object);
+    method public com.google.protobuf.MessageLite! toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,com.google.protobuf.MessageLite!>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T! checkedGetEnumForProto(int, Class<T!>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<?>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<?>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<?>! getProtoBuilderClass();
+    method public com.google.protobuf.Parser<?>! getProtoParser();
+    method public Class<?>! getProtoType();
+    method public Class<?>![]! getRemoteConstrTypes();
+    method public Class<?>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<?>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<?>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T! anyToType(com.google.protobuf.Any);
+    method public static android.os.Parcelable! byteStringToParcelable(com.google.protobuf.ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T! byteStringToType(com.google.protobuf.ByteString);
+    method public static com.google.protobuf.ByteString! parcelableToByteString(android.os.Parcelable);
+    method public static <T> com.google.protobuf.Any! typeToAny(T);
+    method public static com.google.protobuf.ByteString! typeToByteString(Object);
+  }
+
+}
+
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.5.0_internal.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.5.0_public.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.5.0_public.txt
new file mode 100644
index 000000000..e0bbc4f1c
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.5.0_public.txt
@@ -0,0 +1,179 @@
+// Signature format: 3.0
+package androidx.test.espresso.remote {
+
+  public interface Bindable {
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public final class ConstructorInvocation {
+    ctor public ConstructorInvocation(Class<?>, Class<? extends java.lang.annotation.Annotation>?, Class<?>!...);
+    method public Object! invokeConstructor(java.lang.Object!...);
+  }
+
+  public interface Converter<I, O> {
+    method public O! convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public interface EspressoRemoteMessage {
+  }
+
+  public static interface EspressoRemoteMessage.From<T, M> {
+    method public T! fromProto(M!);
+  }
+
+  public static interface EspressoRemoteMessage.To<M> {
+    method public M! toProto();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<?>, String, int);
+    field public final String! fieldName;
+    field public final Class<?>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    ctor public GenericRemoteMessage(Object);
+    method public com.google.protobuf.MessageLite! toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,com.google.protobuf.MessageLite!>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class NoRemoteEspressoInstanceException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public NoRemoteEspressoInstanceException(String!);
+  }
+
+  public class NoopRemoteInteraction implements androidx.test.espresso.remote.RemoteInteraction {
+    ctor public NoopRemoteInteraction();
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T! checkedGetEnumForProto(int, Class<T!>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<?>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<?>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<?>! getProtoBuilderClass();
+    method public com.google.protobuf.Parser<?>! getProtoParser();
+    method public Class<?>! getProtoType();
+    method public Class<?>![]! getRemoteConstrTypes();
+    method public Class<?>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<?>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<?>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public class RemoteEspressoException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteEspressoException(String!);
+    ctor public RemoteEspressoException(String!, Throwable!);
+  }
+
+  public interface RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...);
+    method public boolean isRemoteProcess();
+    field public static final String BUNDLE_EXECUTION_STATUS = "executionStatus";
+  }
+
+  public class RemoteInteractionRegistry {
+    method public static androidx.test.espresso.remote.RemoteInteraction! getInstance();
+    method public static void registerInstance(androidx.test.espresso.remote.RemoteInteraction!);
+  }
+
+  public class RemoteProtocolException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public RemoteProtocolException(String!);
+    ctor public RemoteProtocolException(String!, Throwable!);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T! anyToType(com.google.protobuf.Any);
+    method public static android.os.Parcelable! byteStringToParcelable(com.google.protobuf.ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T! byteStringToType(com.google.protobuf.ByteString);
+    method public static com.google.protobuf.ByteString! parcelableToByteString(android.os.Parcelable);
+    method public static <T> com.google.protobuf.Any! typeToAny(T);
+    method public static com.google.protobuf.ByteString! typeToByteString(Object);
+  }
+
+}
+
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.6.0_internal.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.6.0_public.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.6.0_public.txt
new file mode 100644
index 000000000..12486e15d
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.6.0_public.txt
@@ -0,0 +1,124 @@
+// Signature format: 3.0
+package androidx.test.espresso.remote {
+
+  public interface Converter<I, O> {
+    method public O! convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<?>, String, int);
+    field public final String! fieldName;
+    field public final Class<?>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    ctor public GenericRemoteMessage(Object);
+    method public com.google.protobuf.MessageLite! toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,com.google.protobuf.MessageLite!>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T! checkedGetEnumForProto(int, Class<T!>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<?>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<?>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<?>! getProtoBuilderClass();
+    method public com.google.protobuf.Parser<?>! getProtoParser();
+    method public Class<?>! getProtoType();
+    method public Class<?>![]! getRemoteConstrTypes();
+    method public Class<?>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...?);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<?>!...?);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<?>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<?>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<?>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T! anyToType(com.google.protobuf.Any);
+    method public static android.os.Parcelable! byteStringToParcelable(com.google.protobuf.ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T! byteStringToType(com.google.protobuf.ByteString);
+    method public static com.google.protobuf.ByteString! parcelableToByteString(android.os.Parcelable);
+    method public static <T> com.google.protobuf.Any! typeToAny(T);
+    method public static com.google.protobuf.ByteString! typeToByteString(Object);
+  }
+
+}
+
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.7.0_internal.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/3.7.0_public.txt b/espresso/remote/java/androidx/test/espresso/remote/api/3.7.0_public.txt
new file mode 100644
index 000000000..fa2ac87fc
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/3.7.0_public.txt
@@ -0,0 +1,124 @@
+// Signature format: 3.0
+package androidx.test.espresso.remote {
+
+  public interface Converter<I, O> {
+    method public O! convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<? extends java.lang.Object!>, String, int);
+    field public final String! fieldName;
+    field public final Class<? extends java.lang.Object!>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite!> {
+    ctor public GenericRemoteMessage(Object);
+    method public com.google.protobuf.MessageLite! toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,com.google.protobuf.MessageLite!>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite!> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite!> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T! checkedGetEnumForProto(int, Class<T!>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<? extends java.lang.Object!>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<? extends java.lang.Object!>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<? extends java.lang.Object!>! getProtoBuilderClass();
+    method public com.google.protobuf.Parser<? extends java.lang.Object!>! getProtoParser();
+    method public Class<? extends java.lang.Object!>! getProtoType();
+    method public Class<? extends java.lang.Object!>![]! getRemoteConstrTypes();
+    method public Class<? extends java.lang.Object!>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...?);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<? extends java.lang.Object!>!...?);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<? extends java.lang.Object!>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<? extends java.lang.Object!>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T! anyToType(com.google.protobuf.Any);
+    method public static android.os.Parcelable! byteStringToParcelable(com.google.protobuf.ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T! byteStringToType(com.google.protobuf.ByteString);
+    method public static com.google.protobuf.ByteString! parcelableToByteString(android.os.Parcelable);
+    method public static <T> com.google.protobuf.Any! typeToAny(T);
+    method public static com.google.protobuf.ByteString! typeToByteString(Object);
+  }
+
+}
+
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/current_internal.txt b/espresso/remote/java/androidx/test/espresso/remote/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt b/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt
new file mode 100644
index 000000000..df2b99e3b
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/remote/api/current_public.txt
@@ -0,0 +1,124 @@
+// Signature format: 5.0
+package androidx.test.espresso.remote {
+
+  public interface Converter<I, O> {
+    method public O convert(I);
+  }
+
+  public final class EspressoRemote implements androidx.test.espresso.remote.RemoteInteraction {
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemoteCheckCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAssertion!);
+    method public java.util.concurrent.Callable<java.lang.Void!>! createRemotePerformCallable(org.hamcrest.Matcher<androidx.test.espresso.Root!>!, org.hamcrest.Matcher<android.view.View!>!, java.util.Map<java.lang.String!,android.os.IBinder!>!, androidx.test.espresso.ViewAction!...!);
+    method public static androidx.test.espresso.remote.EspressoRemote! getInstance();
+    method public void init();
+    method public boolean isRemoteProcess();
+    method public void terminate();
+  }
+
+  public final class FieldDescriptor {
+    method public static androidx.test.espresso.remote.FieldDescriptor! of(Class<? extends java.lang.Object!>, String, int);
+    field public final String! fieldName;
+    field public final Class<? extends java.lang.Object!>! fieldType;
+    field public final int order;
+  }
+
+  public final class GenericRemoteMessage implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite!> {
+    ctor public GenericRemoteMessage(Object);
+    method public com.google.protobuf.MessageLite! toProto();
+    field public static final androidx.test.espresso.remote.EspressoRemoteMessage.From<java.lang.Object!,com.google.protobuf.MessageLite!>! FROM;
+  }
+
+  public final class InteractionRequest implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite!> {
+    method public org.hamcrest.Matcher<androidx.test.espresso.Root!>! getRootMatcher();
+    method public androidx.test.espresso.ViewAction! getViewAction();
+    method public androidx.test.espresso.ViewAssertion! getViewAssertion();
+    method public org.hamcrest.Matcher<android.view.View!>! getViewMatcher();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionRequest.Builder {
+    ctor public InteractionRequest.Builder();
+    method public androidx.test.espresso.remote.InteractionRequest! build();
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRequestProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setRootMatcher(org.hamcrest.Matcher<androidx.test.espresso.Root!>);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAction(androidx.test.espresso.ViewAction);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewAssertion(androidx.test.espresso.ViewAssertion);
+    method public androidx.test.espresso.remote.InteractionRequest.Builder! setViewMatcher(org.hamcrest.Matcher<android.view.View!>);
+  }
+
+  public final class InteractionResponse implements androidx.test.espresso.remote.EspressoRemoteMessage.To<com.google.protobuf.MessageLite!> {
+    method public androidx.test.espresso.remote.InteractionResponse.RemoteError! getRemoteError();
+    method public androidx.test.espresso.remote.InteractionResponse.Status! getStatus();
+    method public boolean hasRemoteError();
+    method public com.google.protobuf.MessageLite! toProto();
+  }
+
+  public static class InteractionResponse.Builder {
+    ctor public InteractionResponse.Builder();
+    method public androidx.test.espresso.remote.InteractionResponse! build();
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setRemoteError(androidx.test.espresso.remote.InteractionResponse.RemoteError?);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setResultProto(byte[]);
+    method public androidx.test.espresso.remote.InteractionResponse.Builder! setStatus(androidx.test.espresso.remote.InteractionResponse.Status);
+  }
+
+  public static final class InteractionResponse.RemoteError {
+    method public int getCode();
+    method public String! getDescription();
+    field public static final int REMOTE_ESPRESSO_ERROR_CODE = 0; // 0x0
+    field public static final int REMOTE_PROTOCOL_ERROR_CODE = 1; // 0x1
+  }
+
+  public enum InteractionResponse.Status {
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Error;
+    enum_constant public static final androidx.test.espresso.remote.InteractionResponse.Status Ok;
+  }
+
+  public final class ProtoUtils {
+    method public static String! capitalizeFirstChar(String!);
+    method public static <T extends java.lang.Enum> T checkedGetEnumForProto(int, Class<T>!);
+    method public static java.util.List<java.lang.reflect.Field!>! getFilteredFieldList(Class<? extends java.lang.Object!>!, java.util.List<java.lang.String!>!) throws java.lang.NoSuchFieldException;
+  }
+
+  public final class RemoteDescriptor {
+    method public java.util.List<androidx.test.espresso.remote.FieldDescriptor!>! getInstanceFieldDescriptorList();
+    method public Class<? extends java.lang.Object!>! getInstanceType();
+    method public String! getInstanceTypeName();
+    method public Class<? extends java.lang.Object!>! getProtoBuilderClass();
+    method public com.google.protobuf.Parser<? extends java.lang.Object!>! getProtoParser();
+    method public Class<? extends java.lang.Object!>! getProtoType();
+    method public Class<? extends java.lang.Object!>![]! getRemoteConstrTypes();
+    method public Class<? extends java.lang.Object!>! getRemoteType();
+  }
+
+  public static final class RemoteDescriptor.Builder {
+    ctor public RemoteDescriptor.Builder();
+    method public androidx.test.espresso.remote.RemoteDescriptor! build();
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceFieldDescriptors(androidx.test.espresso.remote.FieldDescriptor!...?);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setInstanceType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoBuilderType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoParser(com.google.protobuf.Parser<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setProtoType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteConstrTypes(Class<? extends java.lang.Object!>!...?);
+    method public androidx.test.espresso.remote.RemoteDescriptor.Builder! setRemoteType(Class<? extends java.lang.Object!>);
+  }
+
+  public final class RemoteDescriptorRegistry {
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForInstanceType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForMsgType(Class<? extends java.lang.Object!>);
+    method public androidx.test.espresso.remote.RemoteDescriptor! argForRemoteTypeUrl(String);
+    method public static androidx.test.espresso.remote.RemoteDescriptorRegistry! getInstance();
+    method public boolean hasArgForInstanceType(Class<? extends java.lang.Object!>);
+    method public boolean registerRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+    method public void unregisterRemoteTypeArgs(java.util.List<androidx.test.espresso.remote.RemoteDescriptor!>);
+  }
+
+  public final class TypeProtoConverters {
+    method public static <T> T anyToType(com.google.protobuf.Any);
+    method public static android.os.Parcelable! byteStringToParcelable(com.google.protobuf.ByteString, Class<android.os.Parcelable!>);
+    method public static <T> T byteStringToType(com.google.protobuf.ByteString);
+    method public static com.google.protobuf.ByteString! parcelableToByteString(android.os.Parcelable);
+    method public static <T> com.google.protobuf.Any! typeToAny(T);
+    method public static com.google.protobuf.ByteString! typeToByteString(Object);
+  }
+
+}
+
diff --git a/espresso/core/java/androidx/test/espresso/remote/proguard_library.cfg b/espresso/remote/java/androidx/test/espresso/remote/proguard_library.cfg
similarity index 100%
rename from espresso/core/java/androidx/test/espresso/remote/proguard_library.cfg
rename to espresso/remote/java/androidx/test/espresso/remote/proguard_library.cfg
diff --git a/espresso/web/java/androidx/test/espresso/web/action/AtomActionRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/web/action/AtomActionRemoteMessage.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/action/AtomActionRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/web/action/AtomActionRemoteMessage.java
diff --git a/espresso/remote/java/androidx/test/espresso/web/action/BUILD b/espresso/remote/java/androidx/test/espresso/web/action/BUILD
new file mode 100644
index 000000000..5a53b24b8
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/action/BUILD
@@ -0,0 +1,40 @@
+# Description:
+#   Espresso Web Actions
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "remote_web_actions",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/action:web_actions_proto_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//opensource/androidx:annotation",
+        "@com_google_protobuf//:protobuf_javalite",
+    ],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/action/RemoteWebActions.java b/espresso/remote/java/androidx/test/espresso/web/action/RemoteWebActions.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/action/RemoteWebActions.java
rename to espresso/remote/java/androidx/test/espresso/web/action/RemoteWebActions.java
diff --git a/espresso/remote/java/androidx/test/espresso/web/action/package-info.java b/espresso/remote/java/androidx/test/espresso/web/action/package-info.java
new file mode 100644
index 000000000..5030f65d8
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/action/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.action;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/web/assertion/BUILD b/espresso/remote/java/androidx/test/espresso/web/assertion/BUILD
new file mode 100644
index 000000000..d1c1cd944
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/assertion/BUILD
@@ -0,0 +1,40 @@
+# Description:
+#   Espresso Web Assertion
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "remote_web_assertions",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/assertion:web_assertions_proto_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
+    ],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/ByteStringToDocumentConverter.java b/espresso/remote/java/androidx/test/espresso/web/assertion/ByteStringToDocumentConverter.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/assertion/ByteStringToDocumentConverter.java
rename to espresso/remote/java/androidx/test/espresso/web/assertion/ByteStringToDocumentConverter.java
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/CheckResultWebAssertionRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/web/assertion/CheckResultWebAssertionRemoteMessage.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/assertion/CheckResultWebAssertionRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/web/assertion/CheckResultWebAssertionRemoteMessage.java
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/CompressorDecompressor.java b/espresso/remote/java/androidx/test/espresso/web/assertion/CompressorDecompressor.java
similarity index 95%
rename from espresso/web/java/androidx/test/espresso/web/assertion/CompressorDecompressor.java
rename to espresso/remote/java/androidx/test/espresso/web/assertion/CompressorDecompressor.java
index 6c4f73a40..217af759c 100644
--- a/espresso/web/java/androidx/test/espresso/web/assertion/CompressorDecompressor.java
+++ b/espresso/remote/java/androidx/test/espresso/web/assertion/CompressorDecompressor.java
@@ -18,12 +18,12 @@
 
 import androidx.annotation.VisibleForTesting;
 import androidx.test.internal.util.LogUtil;
-import com.google.common.io.ByteStreams;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
+import kotlin.io.ByteStreamsKt;
 
 /** Compresses an input source. By default this class uses the GZIP format for compression. */
 final class CompressorDecompressor {
@@ -75,7 +75,7 @@ public byte[] compress(byte[] bytes) throws IOException {
       ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
       GZIPOutputStream gzipOutputStream = new GZIPOutputStream(byteArrayOutputStream);
       try {
-        ByteStreams.copy(new ByteArrayInputStream(bytes), gzipOutputStream);
+        ByteStreamsKt.copyTo(new ByteArrayInputStream(bytes), gzipOutputStream, bytes.length);
       } finally {
         if (gzipOutputStream != null) {
           gzipOutputStream.close();
@@ -92,7 +92,7 @@ public byte[] decompress(byte[] bytes) throws IOException {
       ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(bytes);
       GZIPInputStream gzipInputStream = new GZIPInputStream(byteArrayInputStream);
       try {
-        return ByteStreams.toByteArray(gzipInputStream);
+        return ByteStreamsKt.readBytes(gzipInputStream);
       } finally {
         if (gzipInputStream != null) {
           gzipInputStream.close();
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/DocumentProtoConverters.java b/espresso/remote/java/androidx/test/espresso/web/assertion/DocumentProtoConverters.java
similarity index 96%
rename from espresso/web/java/androidx/test/espresso/web/assertion/DocumentProtoConverters.java
rename to espresso/remote/java/androidx/test/espresso/web/assertion/DocumentProtoConverters.java
index befa25d14..cb182ef8e 100644
--- a/espresso/web/java/androidx/test/espresso/web/assertion/DocumentProtoConverters.java
+++ b/espresso/remote/java/androidx/test/espresso/web/assertion/DocumentProtoConverters.java
@@ -16,7 +16,7 @@
  */
 package androidx.test.espresso.web.assertion;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.annotation.NonNull;
 import com.google.protobuf.ByteString;
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/DocumentToByteStringConverter.java b/espresso/remote/java/androidx/test/espresso/web/assertion/DocumentToByteStringConverter.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/assertion/DocumentToByteStringConverter.java
rename to espresso/remote/java/androidx/test/espresso/web/assertion/DocumentToByteStringConverter.java
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/RemoteWebViewAssertions.java b/espresso/remote/java/androidx/test/espresso/web/assertion/RemoteWebViewAssertions.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/assertion/RemoteWebViewAssertions.java
rename to espresso/remote/java/androidx/test/espresso/web/assertion/RemoteWebViewAssertions.java
diff --git a/espresso/remote/java/androidx/test/espresso/web/assertion/package-info.java b/espresso/remote/java/androidx/test/espresso/web/assertion/package-info.java
new file mode 100644
index 000000000..40a71c849
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/assertion/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.assertion;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/web/matcher/BUILD b/espresso/remote/java/androidx/test/espresso/web/matcher/BUILD
new file mode 100644
index 000000000..869294007
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/matcher/BUILD
@@ -0,0 +1,26 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "remote_web_matchers",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/matcher:remote_web_matchers_proto_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/matcher/RemoteWebMatchers.java b/espresso/remote/java/androidx/test/espresso/web/matcher/RemoteWebMatchers.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/matcher/RemoteWebMatchers.java
rename to espresso/remote/java/androidx/test/espresso/web/matcher/RemoteWebMatchers.java
diff --git a/espresso/remote/java/androidx/test/espresso/web/matcher/package-info.java b/espresso/remote/java/androidx/test/espresso/web/matcher/package-info.java
new file mode 100644
index 000000000..4e1d6d1e3
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/matcher/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.matcher;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/web/model/BUILD b/espresso/remote/java/androidx/test/espresso/web/model/BUILD
new file mode 100644
index 000000000..ac8c24bd3
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/model/BUILD
@@ -0,0 +1,29 @@
+# Description:
+#   Encoder/Decoders for WebView / JSON.
+#   Atom interface for wrapping javascripts.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "remote_web_model_atoms",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/model:remote_web_model_atoms_proto_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//opensource/androidx:annotation",
+        "@com_google_protobuf//:protobuf_javalite",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/model/RemoteWebModelAtoms.java b/espresso/remote/java/androidx/test/espresso/web/model/RemoteWebModelAtoms.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/model/RemoteWebModelAtoms.java
rename to espresso/remote/java/androidx/test/espresso/web/model/RemoteWebModelAtoms.java
diff --git a/espresso/web/java/androidx/test/espresso/web/model/ScriptWithArgsSimpleAtomRemoteMessage.java b/espresso/remote/java/androidx/test/espresso/web/model/ScriptWithArgsSimpleAtomRemoteMessage.java
similarity index 93%
rename from espresso/web/java/androidx/test/espresso/web/model/ScriptWithArgsSimpleAtomRemoteMessage.java
rename to espresso/remote/java/androidx/test/espresso/web/model/ScriptWithArgsSimpleAtomRemoteMessage.java
index 11e80bf7f..4ac06c29f 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/ScriptWithArgsSimpleAtomRemoteMessage.java
+++ b/espresso/remote/java/androidx/test/espresso/web/model/ScriptWithArgsSimpleAtomRemoteMessage.java
@@ -16,14 +16,15 @@
  */
 package androidx.test.espresso.web.model;
 
+
 import androidx.test.espresso.remote.EspressoRemoteMessage;
 import androidx.test.espresso.remote.TypeProtoConverters;
 import androidx.test.espresso.web.model.Atoms.ScriptWithArgsSimpleAtom;
 import androidx.test.espresso.web.proto.model.WebModelAtoms.ScriptWithArgsSimpleAtomProto;
 import androidx.test.espresso.web.proto.model.WebModelAtoms.ScriptWithArgsSimpleAtomProto.Builder;
-import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.MessageLite;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -44,7 +45,7 @@ public ScriptWithArgsSimpleAtom fromProto(MessageLite message) {
               (ScriptWithArgsSimpleAtomProto) message;
 
           String script = scriptWithArgsSimpleAtomProto.getScript();
-          List<Object> nonContextualArguments = Lists.newArrayList();
+          List<Object> nonContextualArguments = new ArrayList<>();
           List<ByteString> argsList = scriptWithArgsSimpleAtomProto.getArgsList();
           for (ByteString arg : argsList) {
             nonContextualArguments.add(TypeProtoConverters.byteStringToType(arg));
@@ -66,7 +67,7 @@ public ScriptWithArgsSimpleAtomProto toProto() {
 
     List<Object> nonContextualArguments = scriptWithArgsSimpleAtom.getNonContextualArguments();
     if (!nonContextualArguments.isEmpty()) {
-      List<ByteString> argsList = Lists.newArrayListWithExpectedSize(nonContextualArguments.size());
+      List<ByteString> argsList = new ArrayList<>(nonContextualArguments.size());
       for (Object object : nonContextualArguments) {
         argsList.add(TypeProtoConverters.typeToByteString(object));
       }
diff --git a/espresso/remote/java/androidx/test/espresso/web/model/package-info.java b/espresso/remote/java/androidx/test/espresso/web/model/package-info.java
new file mode 100644
index 000000000..934b8f33e
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/model/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.model;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/BUILD
new file mode 100644
index 000000000..309c67908
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/BUILD
@@ -0,0 +1,24 @@
+# Protocol buffer definitions for web remote UI interactions
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+# gather up the package-infos which hide the proto generated code from public API
+java_library(
+    name = "package-infos",
+    exports = [
+        "//espresso/remote/java/androidx/test/espresso/web/proto/action:package-info",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/assertion:package-info",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/matcher:package-info",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/model:package-info",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/sugar:package-info",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/webdriver:package-info",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD
new file mode 100644
index 000000000..f639b5e41
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/action/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote web actions
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "web_actions_proto",
+    srcs = ["web_actions.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "web_actions_proto_android_pb3",
+    deps = [":web_actions_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/action/package-info.java b/espresso/remote/java/androidx/test/espresso/web/proto/action/package-info.java
new file mode 100644
index 000000000..58832ac2f
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/action/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.proto.action;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/action/web_actions.proto b/espresso/remote/java/androidx/test/espresso/web/proto/action/web_actions.proto
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/proto/action/web_actions.proto
rename to espresso/remote/java/androidx/test/espresso/web/proto/action/web_actions.proto
index 3d7c54ab5..4d6eb907b 100644
--- a/espresso/web/java/androidx/test/espresso/web/proto/action/web_actions.proto
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/action/web_actions.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.web.action;
 
-option java_package = "androidx.test.espresso.web.proto.action";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.web.proto.action";
+
 message AtomActionProto {
   string id = 1;
 
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD
new file mode 100644
index 000000000..752c1d5ee
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote web assertions
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "web_assertions_proto",
+    srcs = ["web_assertions.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "web_assertions_proto_android_pb3",
+    deps = [":web_assertions_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/assertion/package-info.java b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/package-info.java
new file mode 100644
index 000000000..6d0fe3bf9
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.proto.assertion;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/assertion/web_assertions.proto b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/web_assertions.proto
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/proto/assertion/web_assertions.proto
rename to espresso/remote/java/androidx/test/espresso/web/proto/assertion/web_assertions.proto
index 6c104107d..961e7af6d 100644
--- a/espresso/web/java/androidx/test/espresso/web/proto/assertion/web_assertions.proto
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/assertion/web_assertions.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.web.assertion;
 
-option java_package = "androidx.test.espresso.web.proto.assertion";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.web.proto.assertion";
+
 message CheckResultAssertionProto {
   string id = 1;
   oneof result {
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD
new file mode 100644
index 000000000..c55bbf4ea
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote web matchers
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "remote_web_matchers_proto",
+    srcs = ["remote_web_matchers.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "remote_web_matchers_proto_android_pb3",
+    deps = [":remote_web_matchers_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/matcher/package-info.java b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/package-info.java
new file mode 100644
index 000000000..cdc7d439b
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.proto.matcher;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/matcher/remote_web_matchers.proto b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/remote_web_matchers.proto
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/proto/matcher/remote_web_matchers.proto
rename to espresso/remote/java/androidx/test/espresso/web/proto/matcher/remote_web_matchers.proto
index dfd5e0f50..bd2a5e5e0 100644
--- a/espresso/web/java/androidx/test/espresso/web/proto/matcher/remote_web_matchers.proto
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/matcher/remote_web_matchers.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.web.model;
 
-option java_package = "androidx.test.espresso.web.proto.matcher";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.web.proto.matcher";
+
 message WithBodyMatcherProto {
   string id = 1;
   google.protobuf.Any bodyMatcher = 2;
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD
new file mode 100644
index 000000000..393423173
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/model/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote web model atoms
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "remote_web_model_atoms_proto",
+    srcs = ["web_model_atoms.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "remote_web_model_atoms_proto_android_pb3",
+    deps = [":remote_web_model_atoms_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/model/package-info.java b/espresso/remote/java/androidx/test/espresso/web/proto/model/package-info.java
new file mode 100644
index 000000000..9d33fe175
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/model/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.proto.model;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/model/web_model_atoms.proto b/espresso/remote/java/androidx/test/espresso/web/proto/model/web_model_atoms.proto
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/proto/model/web_model_atoms.proto
rename to espresso/remote/java/androidx/test/espresso/web/proto/model/web_model_atoms.proto
index 568844e18..21b191e44 100644
--- a/espresso/web/java/androidx/test/espresso/web/proto/model/web_model_atoms.proto
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/model/web_model_atoms.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.web.model;
 
-option java_package = "androidx.test.espresso.web.proto.model";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.web.proto.model";
+
 message CastOrDieAtomProto {
   string id = 1;
   bytes clazz = 2;
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD
new file mode 100644
index 000000000..426f907ed
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote web sugar atoms
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "web_sugar_proto",
+    srcs = ["web_sugar.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "web_sugar_proto_android_pb3",
+    deps = [":web_sugar_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/sugar/package-info.java b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/package-info.java
new file mode 100644
index 000000000..e12ba87eb
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.proto.sugar;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/sugar/web_sugar.proto b/espresso/remote/java/androidx/test/espresso/web/proto/sugar/web_sugar.proto
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/proto/sugar/web_sugar.proto
rename to espresso/remote/java/androidx/test/espresso/web/proto/sugar/web_sugar.proto
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD
new file mode 100644
index 000000000..f0e5ab03b
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/BUILD
@@ -0,0 +1,34 @@
+# Protocol buffer definitions for remote web driver atoms
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+proto_library(
+    name = "web_driver_atoms_proto",
+    srcs = ["web_webdriver_atoms.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "web_driver_atoms_proto_android_pb3",
+    deps = [":web_driver_atoms_proto"],
+)
+
+java_library(
+    name = "package-info",
+    srcs = ["package-info.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/package-info.java b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/package-info.java
new file mode 100644
index 000000000..6b8bad015
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.proto.webdriver;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/webdriver/web_webdriver_atoms.proto b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/web_webdriver_atoms.proto
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/proto/webdriver/web_webdriver_atoms.proto
rename to espresso/remote/java/androidx/test/espresso/web/proto/webdriver/web_webdriver_atoms.proto
index 374d7d1a0..aa1cf4e25 100644
--- a/espresso/web/java/androidx/test/espresso/web/proto/webdriver/web_webdriver_atoms.proto
+++ b/espresso/remote/java/androidx/test/espresso/web/proto/webdriver/web_webdriver_atoms.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.web.webdriver;
 
-option java_package = "androidx.test.espresso.web.proto.webdriver";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.web.proto.webdriver";
+
 message FindElementSimpleAtomProto {
   string id = 1;
   bytes locatorType = 2;
diff --git a/espresso/remote/java/androidx/test/espresso/web/sugar/BUILD b/espresso/remote/java/androidx/test/espresso/web/sugar/BUILD
new file mode 100644
index 000000000..5cbace9ab
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/sugar/BUILD
@@ -0,0 +1,26 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "remote_sugar",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/sugar:web_sugar_proto_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/sugar/RemoteWebSugar.java b/espresso/remote/java/androidx/test/espresso/web/sugar/RemoteWebSugar.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/sugar/RemoteWebSugar.java
rename to espresso/remote/java/androidx/test/espresso/web/sugar/RemoteWebSugar.java
diff --git a/espresso/remote/java/androidx/test/espresso/web/sugar/package-info.java b/espresso/remote/java/androidx/test/espresso/web/sugar/package-info.java
new file mode 100644
index 000000000..22bbee63c
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/sugar/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.sugar;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/java/androidx/test/espresso/web/webdriver/BUILD b/espresso/remote/java/androidx/test/espresso/web/webdriver/BUILD
new file mode 100644
index 000000000..fc1e05218
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/webdriver/BUILD
@@ -0,0 +1,29 @@
+# Description:
+#   Exposes webdriver automation js fragments as atoms.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/remote:__subpackages__"],
+)
+
+android_library(
+    name = "remote_webdriver_atoms",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/webdriver:web_driver_atoms_proto_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/webdriver",
+        "//opensource/androidx:annotation",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/webdriver/RemoteWebDriverAtoms.java b/espresso/remote/java/androidx/test/espresso/web/webdriver/RemoteWebDriverAtoms.java
similarity index 100%
rename from espresso/web/java/androidx/test/espresso/web/webdriver/RemoteWebDriverAtoms.java
rename to espresso/remote/java/androidx/test/espresso/web/webdriver/RemoteWebDriverAtoms.java
diff --git a/espresso/remote/java/androidx/test/espresso/web/webdriver/package-info.java b/espresso/remote/java/androidx/test/espresso/web/webdriver/package-info.java
new file mode 100644
index 000000000..f543f97f6
--- /dev/null
+++ b/espresso/remote/java/androidx/test/espresso/web/webdriver/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.webdriver;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/remote/javatests/androidx/test/espresso/BUILD b/espresso/remote/javatests/androidx/test/espresso/BUILD
new file mode 100644
index 000000000..08cc044db
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/BUILD
@@ -0,0 +1,28 @@
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+axt_android_library_test(
+    name = "DisplayDataMatcherRemoteMsgTest",
+    srcs = ["DisplayDataMatcherRemoteMsgTest.java"],
+    deps = [
+        "//espresso/core",
+        "//espresso/remote/java/androidx/test/espresso:data-interaction-remote",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java b/espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
similarity index 86%
rename from espresso/core/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
rename to espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
index 60aa094a1..cca0720da 100644
--- a/espresso/core/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/DisplayDataMatcherRemoteMsgTest.java
@@ -35,10 +35,8 @@
 import androidx.test.espresso.proto.matcher.ViewMatchers.DisplayDataMatcherProto;
 import androidx.test.espresso.remote.GenericRemoteMessage;
 import androidx.test.espresso.remote.RemoteDescriptorRegistry;
-import androidx.test.espresso.util.EspressoOptional;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.base.Function;
 import org.hamcrest.Matcher;
 import org.junit.Before;
 import org.junit.Test;
@@ -64,15 +62,7 @@ private static DisplayDataMatcherProto toProto() {
     Matcher<String> stringMatcher = allOf(instanceOf(String.class), equalTo(TEXT_VIEW_TEXT));
     AdapterViewProtocol adapterViewProtocol = AdapterViewProtocols.standardProtocol();
     AdapterDataLoaderAction adapterDataLoaderAction =
-        new AdapterDataLoaderAction(
-            stringMatcher, EspressoOptional.<Integer>absent(), adapterViewProtocol);
-    Function<AdapterDataLoaderAction, ViewInteraction> noOpDataLoaderFunction =
-        new Function<AdapterDataLoaderAction, ViewInteraction>() {
-          @Override
-          public ViewInteraction apply(AdapterDataLoaderAction adapterDataLoaderAction) {
-            return null;
-          }
-        };
+        new AdapterDataLoaderAction(stringMatcher, (Integer) null, adapterViewProtocol);
 
     DisplayDataMatcher displayDataMatcher =
         new DisplayDataMatcher(
@@ -80,7 +70,7 @@ public ViewInteraction apply(AdapterDataLoaderAction adapterDataLoaderAction) {
             stringMatcher,
             adapterViewProtocol,
             adapterDataLoaderAction,
-            noOpDataLoaderFunction);
+            adapterDataLoaderAction1 -> {});
     return (DisplayDataMatcherProto) new GenericRemoteMessage(displayDataMatcher).toProto();
   }
 
diff --git a/espresso/remote/javatests/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsgTest.java b/espresso/remote/javatests/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsgTest.java
new file mode 100644
index 000000000..fc4ec0e13
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/action/AdapterDataLoaderActionRemoteMsgTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.action;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
+
+import androidx.test.espresso.matcher.RemoteHamcrestCoreMatchers13;
+import androidx.test.espresso.proto.action.ViewActions.AdapterDataLoaderActionProto;
+import androidx.test.espresso.remote.RemoteDescriptorRegistry;
+import androidx.test.espresso.remote.TypeProtoConverters;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import org.hamcrest.Matcher;
+import org.hamcrest.MatcherAssert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Tests for {@link AdapterDataLoaderActionRemoteMsg} */
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class AdapterDataLoaderActionRemoteMsgTest {
+  private static final Integer EXPECTED_INT = 5;
+  private static final String EXPECTED_STRING = "Cortado";
+
+  private static AdapterDataLoaderActionProto toProto(Integer expectedInt, String expectedString) {
+    Matcher<String> stringMatcher = allOf(instanceOf(String.class), is(expectedString));
+    AdapterDataLoaderAction adapterDataLoaderAction =
+        new AdapterDataLoaderAction(
+            stringMatcher, expectedInt, AdapterViewProtocols.standardProtocol());
+
+    return new AdapterDataLoaderActionRemoteMsg(adapterDataLoaderAction).toProto();
+  }
+
+  @Before
+  public void initRegistry() {
+    RemoteHamcrestCoreMatchers13.init(RemoteDescriptorRegistry.getInstance());
+    RemoteViewActions.init(RemoteDescriptorRegistry.getInstance());
+  }
+
+  @Test
+  public void transformationToProto() {
+    AdapterDataLoaderActionProto adapterDataLoaderActionProto =
+        toProto(EXPECTED_INT, EXPECTED_STRING);
+
+    assertThat(adapterDataLoaderActionProto.getAtPosition()).isEqualTo(EXPECTED_INT);
+    assertThat(adapterDataLoaderActionProto.getDataToLoadMatcher()).isNotNull();
+    assertThat(
+            TypeProtoConverters.<Class<? extends AdapterViewProtocol>>byteStringToType(
+                adapterDataLoaderActionProto.getAdapterViewProtocolClass()))
+        .isAssignableTo(AdapterViewProtocol.class);
+  }
+
+  @Test
+  public void transformationToProto_noPosition_SetsNoProtoConstant() {
+    AdapterDataLoaderActionProto adapterDataLoaderActionProto = toProto(null, EXPECTED_STRING);
+
+    assertThat(adapterDataLoaderActionProto.getAtPosition())
+        .isEqualTo(AdapterDataLoaderActionRemoteMsg.NO_POSITION_SET);
+    assertThat(adapterDataLoaderActionProto.getDataToLoadMatcher()).isNotNull();
+  }
+
+  @Test
+  public void transformationFromProto() {
+    AdapterDataLoaderActionProto adapterDataLoaderActionProto =
+        toProto(EXPECTED_INT, EXPECTED_STRING);
+
+    AdapterDataLoaderAction adapterDataLoaderAction =
+        AdapterDataLoaderActionRemoteMsg.FROM.fromProto(adapterDataLoaderActionProto);
+
+    assertThat(adapterDataLoaderAction.atPosition).isEqualTo(EXPECTED_INT);
+    MatcherAssert.assertThat(
+        EXPECTED_STRING, (Matcher<? super String>) adapterDataLoaderAction.dataToLoadMatcher);
+    assertThat(adapterDataLoaderAction.adapterViewProtocol).isNotNull();
+  }
+
+  @Test
+  public void transformationFromProto_noPosition_SetsOptionalAbsent() {
+    AdapterDataLoaderActionProto adapterDataLoaderActionProto = toProto(null, EXPECTED_STRING);
+
+    AdapterDataLoaderAction adapterDataLoaderAction =
+        AdapterDataLoaderActionRemoteMsg.FROM.fromProto(adapterDataLoaderActionProto);
+
+    assertThat(adapterDataLoaderAction.atPosition).isNull();
+  }
+}
diff --git a/espresso/remote/javatests/androidx/test/espresso/action/BUILD b/espresso/remote/javatests/androidx/test/espresso/action/BUILD
new file mode 100644
index 000000000..ef457ccf1
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/action/BUILD
@@ -0,0 +1,63 @@
+# Description:
+#   Tests for espresso actions
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "AdapterDataLoaderActionRemoteMsgTest",
+    srcs =
+        ["AdapterDataLoaderActionRemoteMsgTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto/action:ui_interaction_view_actions_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteViewActionsTest",
+    srcs =
+        ["RemoteViewActionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/intents/java/androidx/test/espresso/intent:intents",
+        "//espresso/intents/java/androidx/test/espresso/intent/matcher",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/proto/action:ui_interaction_view_actions_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/action/RemoteViewActionsTest.java b/espresso/remote/javatests/androidx/test/espresso/action/RemoteViewActionsTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/action/RemoteViewActionsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/action/RemoteViewActionsTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/assertion/BUILD b/espresso/remote/javatests/androidx/test/espresso/assertion/BUILD
new file mode 100644
index 000000000..82222b1d9
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/assertion/BUILD
@@ -0,0 +1,37 @@
+# Description:
+#   Tests for espresso assertions
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteViewAssertionsTest",
+    srcs = ["RemoteViewAssertionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto/assertion:ui_interaction_view_assertions_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:test_resources",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/assertion/RemoteViewAssertionsTest.java b/espresso/remote/javatests/androidx/test/espresso/assertion/RemoteViewAssertionsTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/assertion/RemoteViewAssertionsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/assertion/RemoteViewAssertionsTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/matcher/BUILD b/espresso/remote/javatests/androidx/test/espresso/matcher/BUILD
new file mode 100644
index 000000000..db20bcb89
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/matcher/BUILD
@@ -0,0 +1,57 @@
+# Description:
+#   Tests for espresso matchers
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteHamcrestCoreMatcher13Test",
+    srcs =
+        ["RemoteHamcrestCoreMatcher13Test.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:hamcrest_matchers_v1_3_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteViewMatchersTest",
+    srcs = ["RemoteViewMatchersTest.java"],
+    shard_count = 5,
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto/matcher:ui_interaction_view_matchers_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/RemoteHamcrestCoreMatcher13Test.java b/espresso/remote/javatests/androidx/test/espresso/matcher/RemoteHamcrestCoreMatcher13Test.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/matcher/RemoteHamcrestCoreMatcher13Test.java
rename to espresso/remote/javatests/androidx/test/espresso/matcher/RemoteHamcrestCoreMatcher13Test.java
diff --git a/espresso/core/javatests/androidx/test/espresso/matcher/RemoteViewMatchersTest.java b/espresso/remote/javatests/androidx/test/espresso/matcher/RemoteViewMatchersTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/matcher/RemoteViewMatchersTest.java
rename to espresso/remote/javatests/androidx/test/espresso/matcher/RemoteViewMatchersTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/proto/BUILD b/espresso/remote/javatests/androidx/test/espresso/proto/BUILD
new file mode 100644
index 000000000..6c9d5083a
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/proto/BUILD
@@ -0,0 +1,27 @@
+# Protocol buffer definitions for any proto transformers. Only used in tests!
+
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//opensource/visibility:testing_pkg"],
+)
+
+proto_library(
+    name = "test_protos",
+    srcs = ["test_protos.proto"],
+    deps = [
+        "@com_google_protobuf//:any_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "test_protos_android_pb3",
+    deps = [
+        ":test_protos",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/proto/test_protos.proto b/espresso/remote/javatests/androidx/test/espresso/proto/test_protos.proto
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/proto/test_protos.proto
rename to espresso/remote/javatests/androidx/test/espresso/proto/test_protos.proto
index 1d50f1a93..92001a277 100644
--- a/espresso/core/javatests/androidx/test/espresso/proto/test_protos.proto
+++ b/espresso/remote/javatests/androidx/test/espresso/proto/test_protos.proto
@@ -3,10 +3,10 @@ syntax = "proto3";
 
 package google.test.remote.ui.test;
 
-option java_package = "androidx.test.espresso.proto";
-
 import "google/protobuf/any.proto";
 
+option java_package = "androidx.test.espresso.proto";
+
 message TestProto {
   string hello = 1;
 }
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/AnyToTypeConverterTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/AnyToTypeConverterTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/AnyToTypeConverterTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/AnyToTypeConverterTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/remote/BUILD b/espresso/remote/javatests/androidx/test/espresso/remote/BUILD
new file mode 100644
index 000000000..dc598ac69
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/remote/BUILD
@@ -0,0 +1,459 @@
+# Description:
+#   Tests for espresso remote classes
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+UTIL_SRCS = [
+    "RemoteDescriptorRegistryInitializer.java",
+]
+
+android_library(
+    name = "util",
+    srcs = UTIL_SRCS,
+    visibility = [
+        "//visibility:private",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "AnyToTypeConverterTest",
+    srcs =
+        ["AnyToTypeConverterTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "BuilderReflectorTest",
+    srcs =
+        ["BuilderReflectorTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ByteStringToTypeConverterTest",
+    srcs =
+        ["ByteStringToTypeConverterTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "EspressoRemoteTest",
+    srcs =
+        ["EspressoRemoteTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "InteractionRequestTest",
+    srcs =
+        ["InteractionRequestTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "InteractionResponseTest",
+    srcs =
+        ["InteractionResponseTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ProtoReflectorTest",
+    srcs =
+        ["ProtoReflectorTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ProtoUtilsTest",
+    srcs =
+        ["ProtoUtilsTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteDescriptorRegistryTest",
+    srcs =
+        ["RemoteDescriptorRegistryTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteDescriptorTest",
+    srcs =
+        ["RemoteDescriptorTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteMessageDeserializerTest",
+    srcs =
+        ["RemoteMessageDeserializerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteMessageSerializerTest",
+    srcs =
+        ["RemoteMessageSerializerTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "TypeToAnyConverterTest",
+    srcs =
+        ["TypeToAnyConverterTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/action",
+        "//espresso/core/java/androidx/test/espresso/assertion",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util/concurrent",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/action:remote_view_actions",
+        "//espresso/remote/java/androidx/test/espresso/assertion:remote_view_assertions",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_view_matchers",
+        "//espresso/remote/java/androidx/test/espresso/proto:ui_interaction_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//ext/junit",
+        "//opensource/proto:any_java_proto_lite",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@androidsdk//:legacy_test-36",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
+
+axt_android_library_test(
+    name = "TypeToByteStringConverterTest",
+    srcs =
+        ["TypeToByteStringConverterTest.java"],
+    deps = [
+        ":util",
+        "//core",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/BuilderReflectorTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/BuilderReflectorTest.java
similarity index 98%
rename from espresso/core/javatests/androidx/test/espresso/remote/BuilderReflectorTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/BuilderReflectorTest.java
index e23c984a1..3d37ac0d4 100644
--- a/espresso/core/javatests/androidx/test/espresso/remote/BuilderReflectorTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/remote/BuilderReflectorTest.java
@@ -28,9 +28,9 @@
 import androidx.test.espresso.proto.TestProtos.GenericTestProto;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Lists;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
+import java.util.Arrays;
 import java.util.List;
 import org.junit.Before;
 import org.junit.Test;
@@ -79,7 +79,7 @@ public void setValuesOnBuilder() {
     Any any3 = buildAny(ANY_TYPE_URL_THREE, ANY_TYPE_VALUE_THREE);
 
     Any anyValue = any1;
-    List<Any> anyList = Lists.newArrayList(any2, any3);
+    List<Any> anyList = Arrays.asList(any2, any3);
     ByteString value = TypeProtoConverters.typeToByteString(STRING_VALUE);
 
     Object protoMsg =
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/ByteStringToTypeConverterTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/ByteStringToTypeConverterTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/ByteStringToTypeConverterTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/ByteStringToTypeConverterTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/EspressoRemoteTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/EspressoRemoteTest.java
similarity index 98%
rename from espresso/core/javatests/androidx/test/espresso/remote/EspressoRemoteTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/EspressoRemoteTest.java
index c173dd117..633f17db7 100644
--- a/espresso/core/javatests/androidx/test/espresso/remote/EspressoRemoteTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/remote/EspressoRemoteTest.java
@@ -42,14 +42,13 @@
 import androidx.test.espresso.matcher.RootMatchers;
 import androidx.test.espresso.proto.UiInteraction.InteractionResultProto;
 import androidx.test.espresso.remote.EspressoRemote.RemoteInteractionStrategy;
+import androidx.test.espresso.util.concurrent.ListeningExecutorService;
+import androidx.test.espresso.util.concurrent.ThreadFactoryBuilder;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.internal.runner.InstrumentationConnection;
 import androidx.test.internal.util.ParcelableIBinder;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.io.UnsupportedEncodingException;
 import java.util.HashSet;
 import java.util.Set;
@@ -79,7 +78,7 @@ public class EspressoRemoteTest {
   public void setup() {
     MockitoAnnotations.initMocks(this);
     remoteExecutor =
-        MoreExecutors.listeningDecorator(
+        new ListeningExecutorService(
             new ThreadPoolExecutor(
                 0 /*corePoolSize*/,
                 5 /*maximumPoolSize*/,
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/InteractionRequestTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/InteractionRequestTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/InteractionRequestTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/InteractionRequestTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/InteractionResponseTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/InteractionResponseTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/InteractionResponseTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/InteractionResponseTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/ProtoReflectorTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/ProtoReflectorTest.java
similarity index 96%
rename from espresso/core/javatests/androidx/test/espresso/remote/ProtoReflectorTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/ProtoReflectorTest.java
index 33a24c77e..689b10981 100644
--- a/espresso/core/javatests/androidx/test/espresso/remote/ProtoReflectorTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/remote/ProtoReflectorTest.java
@@ -23,9 +23,9 @@
 import androidx.test.espresso.proto.TestProtos.GenericTestProto;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Lists;
 import com.google.protobuf.Any;
 import com.google.protobuf.ByteString;
+import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -58,7 +58,7 @@ public void reflectivelyReadProto() {
     Any any3 = buildAny(ANY_TYPE_URL_THREE, ANY_TYPE_VALUE_THREE);
 
     Any anyValue1 = any1;
-    Iterable anyList1 = Lists.newArrayList(any2, any3);
+    Iterable anyList1 = Arrays.asList(any2, any3);
     ByteString value1 = TypeProtoConverters.typeToByteString(STRING_VALUE_ONE);
 
     ProtoReflector protoReflector =
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/ProtoUtilsTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/ProtoUtilsTest.java
similarity index 90%
rename from espresso/core/javatests/androidx/test/espresso/remote/ProtoUtilsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/ProtoUtilsTest.java
index 14ccfa4c0..1543209fd 100644
--- a/espresso/core/javatests/androidx/test/espresso/remote/ProtoUtilsTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/remote/ProtoUtilsTest.java
@@ -18,13 +18,15 @@
 
 import static androidx.test.espresso.remote.ProtoUtils.capitalizeFirstChar;
 import static androidx.test.espresso.remote.ProtoUtils.getFilteredFieldList;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Lists;
 import java.lang.reflect.Field;
+import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -40,7 +42,7 @@ public void orderedFieldList_returnsOrderListOfFields_ContainsFieldsInOrder()
     String field1 = "field1";
     String field2 = "field2";
     String field3 = "field3";
-    List<String> filters = Lists.newArrayList(field1, field2, field3);
+    List<String> filters = Arrays.asList(field1, field2, field3);
 
     List<Field> orderedFieldList = getFilteredFieldList(FieldsFromClass.class, filters);
     assertThat(orderedFieldList.size(), equalTo(3));
@@ -51,7 +53,7 @@ public void orderedFieldList_returnsOrderListOfFields_ContainsFieldsInOrder()
 
   @Test
   public void orderedFieldList_withEmptyFilters_ReturnsEmptyList() throws NoSuchFieldException {
-    List<String> filters = Lists.newArrayList();
+    List<String> filters = emptyList();
 
     List<Field> orderedFieldList = getFilteredFieldList(FieldsFromClass.class, filters);
     assertThat(orderedFieldList.size(), equalTo(0));
@@ -60,7 +62,7 @@ public void orderedFieldList_withEmptyFilters_ReturnsEmptyList() throws NoSuchFi
   @Test
   public void orderedFieldList_getFieldFromParentClass() throws NoSuchFieldException {
     String superField1 = "superField1";
-    List<String> filters = Lists.newArrayList(superField1);
+    List<String> filters = singletonList(superField1);
 
     List<Field> orderedFieldList = getFilteredFieldList(FieldsFromClass.class, filters);
     assertThat(orderedFieldList.size(), equalTo(1));
@@ -73,7 +75,7 @@ public void orderedFieldList_getFieldFromClassAndParentClass_ContainsFieldsInOrd
     String superField2 = "superField2";
     String field1 = "field1";
     String field2 = "field2";
-    List<String> filters = Lists.newArrayList(superField1, field1, superField2, field2);
+    List<String> filters = Arrays.asList(superField1, field1, superField2, field2);
 
     List<Field> orderedFieldList = getFilteredFieldList(FieldsFromClass.class, filters);
     assertThat(orderedFieldList.size(), equalTo(4));
@@ -85,7 +87,7 @@ public void orderedFieldList_getFieldFromClassAndParentClass_ContainsFieldsInOrd
 
   @Test
   public void orderedFieldList_nonExistingField_ThrowsNSFE() {
-    List<String> filters = Lists.newArrayList("iamNotAField");
+    List<String> filters = singletonList("iamNotAField");
     try {
       getFilteredFieldList(FieldsFromClass.class, filters);
     } catch (NoSuchFieldException expected) {
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryInitializer.java b/espresso/remote/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryInitializer.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryInitializer.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryInitializer.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/RemoteDescriptorRegistryTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/RemoteDescriptorTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/RemoteDescriptorTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/RemoteDescriptorTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/RemoteDescriptorTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/RemoteMessageDeserializerTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/RemoteMessageDeserializerTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/RemoteMessageDeserializerTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/RemoteMessageDeserializerTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/RemoteMessageSerializerTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/RemoteMessageSerializerTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/RemoteMessageSerializerTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/RemoteMessageSerializerTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/TypeToAnyConverterTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/TypeToAnyConverterTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/TypeToAnyConverterTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/TypeToAnyConverterTest.java
diff --git a/espresso/core/javatests/androidx/test/espresso/remote/TypeToByteStringConverterTest.java b/espresso/remote/javatests/androidx/test/espresso/remote/TypeToByteStringConverterTest.java
similarity index 100%
rename from espresso/core/javatests/androidx/test/espresso/remote/TypeToByteStringConverterTest.java
rename to espresso/remote/javatests/androidx/test/espresso/remote/TypeToByteStringConverterTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/web/action/BUILD b/espresso/remote/javatests/androidx/test/espresso/web/action/BUILD
new file mode 100644
index 000000000..39147dc04
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/web/action/BUILD
@@ -0,0 +1,57 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteWebActionsTest",
+    srcs = ["RemoteWebActionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/model:remote_web_model_atoms",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/action:web_actions_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/assertion:web_assertions_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/matcher:remote_web_matchers_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/model:remote_web_model_atoms_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/sugar:web_sugar_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/webdriver:web_driver_atoms_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/remote/java/androidx/test/espresso/web/webdriver:remote_webdriver_atoms",
+        "//espresso/remote/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//espresso/web/java/androidx/test/espresso/web/webdriver",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/action/RemoteWebActionsTest.java b/espresso/remote/javatests/androidx/test/espresso/web/action/RemoteWebActionsTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/action/RemoteWebActionsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/action/RemoteWebActionsTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/web/assertion/BUILD b/espresso/remote/javatests/androidx/test/espresso/web/assertion/BUILD
new file mode 100644
index 000000000..36808407e
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/web/assertion/BUILD
@@ -0,0 +1,116 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "ByteStringToDocumentConverterTest",
+    srcs = ["ByteStringToDocumentConverterTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "DocumentToByteStringConverterTest",
+    srcs = ["DocumentToByteStringConverterTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "GZIPCompressionTest",
+    srcs = ["GZIPCompressionTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteWebAssertionsTest",
+    srcs = ["RemoteWebAssertionsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/model:remote_web_model_atoms",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/assertion:web_assertions_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/remote/java/androidx/test/espresso/web/webdriver:remote_webdriver_atoms",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//espresso/web/java/androidx/test/espresso/web/webdriver",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/assertion/ByteStringToDocumentConverterTest.java b/espresso/remote/javatests/androidx/test/espresso/web/assertion/ByteStringToDocumentConverterTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/assertion/ByteStringToDocumentConverterTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/assertion/ByteStringToDocumentConverterTest.java
diff --git a/espresso/web/javatests/androidx/test/espresso/web/assertion/DocumentToByteStringConverterTest.java b/espresso/remote/javatests/androidx/test/espresso/web/assertion/DocumentToByteStringConverterTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/assertion/DocumentToByteStringConverterTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/assertion/DocumentToByteStringConverterTest.java
diff --git a/espresso/web/javatests/androidx/test/espresso/web/assertion/GZIPCompressionTest.java b/espresso/remote/javatests/androidx/test/espresso/web/assertion/GZIPCompressionTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/assertion/GZIPCompressionTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/assertion/GZIPCompressionTest.java
diff --git a/espresso/web/javatests/androidx/test/espresso/web/assertion/RemoteWebAssertionsTest.java b/espresso/remote/javatests/androidx/test/espresso/web/assertion/RemoteWebAssertionsTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/assertion/RemoteWebAssertionsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/assertion/RemoteWebAssertionsTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/web/matcher/BUILD b/espresso/remote/javatests/androidx/test/espresso/web/matcher/BUILD
new file mode 100644
index 000000000..e54c7ba71
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/web/matcher/BUILD
@@ -0,0 +1,42 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteWebMatchersTest",
+    srcs = ["RemoteWebMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/matcher:remote_web_matchers_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/matcher/RemoteWebMatchersTest.java b/espresso/remote/javatests/androidx/test/espresso/web/matcher/RemoteWebMatchersTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/matcher/RemoteWebMatchersTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/matcher/RemoteWebMatchersTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/web/model/BUILD b/espresso/remote/javatests/androidx/test/espresso/web/model/BUILD
new file mode 100644
index 000000000..43815e94c
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/web/model/BUILD
@@ -0,0 +1,70 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteAtomsTest",
+    srcs = ["RemoteAtomsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/model:remote_web_model_atoms",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/model:remote_web_model_atoms_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "RemoteWebModelAtomsTest",
+    srcs = ["RemoteWebModelAtomsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/model:remote_web_model_atoms",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/model:remote_web_model_atoms_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/model/RemoteAtomsTest.java b/espresso/remote/javatests/androidx/test/espresso/web/model/RemoteAtomsTest.java
similarity index 96%
rename from espresso/web/javatests/androidx/test/espresso/web/model/RemoteAtomsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/model/RemoteAtomsTest.java
index 20ca139d1..5e1aa72e6 100644
--- a/espresso/web/javatests/androidx/test/espresso/web/model/RemoteAtomsTest.java
+++ b/espresso/remote/javatests/androidx/test/espresso/web/model/RemoteAtomsTest.java
@@ -16,6 +16,8 @@
 
 package androidx.test.espresso.web.model;
 
+import static java.util.Collections.emptyList;
+import static java.util.Collections.unmodifiableList;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.Matchers.hasItems;
@@ -30,7 +32,7 @@
 import androidx.test.espresso.web.proto.model.WebModelAtoms.TransformingAtomProto;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Lists;
+import java.util.Arrays;
 import java.util.List;
 import org.hamcrest.Matchers;
 import org.junit.Before;
@@ -45,7 +47,7 @@ public class RemoteAtomsTest {
   private static final String SCRIPT = "return document.title;";
   private static final Object ARG1 = "arg1";
   private static final Object ARG2 = "arg1";
-  private static final List<Object> ARGS = Lists.newArrayList(ARG1, ARG2);
+  private static final List<Object> ARGS = unmodifiableList(Arrays.asList(ARG1, ARG2));
 
   private static TransformingAtomProto transformingAtom_transformationToProto(Atom atom) {
     TransformingAtomProto atomProto =
@@ -106,7 +108,7 @@ public void scriptWithArgs_transformationFromProto() {
   public void scriptWithArgs_emptyArgs_transformationToProto() {
     ScriptWithArgsSimpleAtomProto scriptWithArgsProto =
         new ScriptWithArgsSimpleAtomRemoteMessage(
-                (ScriptWithArgsSimpleAtom) Atoms.scriptWithArgs(SCRIPT, Lists.newArrayList()))
+                (ScriptWithArgsSimpleAtom) Atoms.scriptWithArgs(SCRIPT, emptyList()))
             .toProto();
     assertThat(scriptWithArgsProto, notNullValue());
 
@@ -118,7 +120,7 @@ public void scriptWithArgs_emptyArgs_transformationToProto() {
   public void scriptWithArgs_emptyArgs_transformationFromProto() {
     ScriptWithArgsSimpleAtomProto scriptWithArgsProto =
         new ScriptWithArgsSimpleAtomRemoteMessage(
-                (ScriptWithArgsSimpleAtom) Atoms.scriptWithArgs(SCRIPT, Lists.newArrayList()))
+                (ScriptWithArgsSimpleAtom) Atoms.scriptWithArgs(SCRIPT, emptyList()))
             .toProto();
 
     Object objectFromProto =
diff --git a/espresso/web/javatests/androidx/test/espresso/web/model/RemoteWebModelAtomsTest.java b/espresso/remote/javatests/androidx/test/espresso/web/model/RemoteWebModelAtomsTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/model/RemoteWebModelAtomsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/model/RemoteWebModelAtomsTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/web/sugar/BUILD b/espresso/remote/javatests/androidx/test/espresso/web/sugar/BUILD
new file mode 100644
index 000000000..90b1bf3ee
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/web/sugar/BUILD
@@ -0,0 +1,39 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteWebSugarTest",
+    srcs = ["RemoteWebSugarTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/sugar:web_sugar_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/sugar/RemoteWebSugarTest.java b/espresso/remote/javatests/androidx/test/espresso/web/sugar/RemoteWebSugarTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/sugar/RemoteWebSugarTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/sugar/RemoteWebSugarTest.java
diff --git a/espresso/remote/javatests/androidx/test/espresso/web/webdriver/BUILD b/espresso/remote/javatests/androidx/test/espresso/web/webdriver/BUILD
new file mode 100644
index 000000000..f91104b4a
--- /dev/null
+++ b/espresso/remote/javatests/androidx/test/espresso/web/webdriver/BUILD
@@ -0,0 +1,43 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "RemoteWebDriverAtomsTest",
+    srcs = ["RemoteWebDriverAtomsTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/javatests/androidx/test/espresso/remote:util",
+        "//espresso/remote/java/androidx/test/espresso/remote:protoUtils",
+        "//espresso/remote/java/androidx/test/espresso/remote:registry",
+        "//espresso/remote/java/androidx/test/espresso/web/action:remote_web_actions",
+        "//espresso/remote/java/androidx/test/espresso/web/assertion:remote_web_assertions",
+        "//espresso/remote/java/androidx/test/espresso/web/matcher:remote_web_matchers",
+        "//espresso/remote/java/androidx/test/espresso/web/model:remote_web_model_atoms",
+        "//espresso/remote/java/androidx/test/espresso/web/proto/webdriver:web_driver_atoms_proto_android_pb3",
+        "//espresso/remote/java/androidx/test/espresso/web/sugar:remote_sugar",
+        "//espresso/remote/java/androidx/test/espresso/web/webdriver:remote_webdriver_atoms",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//espresso/web/java/androidx/test/espresso/web/webdriver",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/webdriver/RemoteWebDriverAtomsTest.java b/espresso/remote/javatests/androidx/test/espresso/web/webdriver/RemoteWebDriverAtomsTest.java
similarity index 100%
rename from espresso/web/javatests/androidx/test/espresso/web/webdriver/RemoteWebDriverAtomsTest.java
rename to espresso/remote/javatests/androidx/test/espresso/web/webdriver/RemoteWebDriverAtomsTest.java
diff --git a/espresso/web/BUILD b/espresso/web/BUILD
new file mode 100644
index 000000000..2168702a7
--- /dev/null
+++ b/espresso/web/BUILD
@@ -0,0 +1,14 @@
+# Alias for androidx.test.espresso.web API library
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "web",
+    actual = "//espresso/web/java/androidx/test/espresso/web:espresso_web_aar_lib",
+    visibility = ["//visibility:public"],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml b/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml
index c0a9c6d90..6a795549e 100644
--- a/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml
+++ b/espresso/web/java/androidx/test/espresso/web/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.espresso.web" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/espresso/web/java/androidx/test/espresso/web/BUILD b/espresso/web/java/androidx/test/espresso/web/BUILD
new file mode 100644
index 000000000..ab69038e8
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/BUILD
@@ -0,0 +1,55 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+android_library(
+    name = "espresso_web_aar_lib",
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [
+        ":proguard_library.cfg",
+    ],
+    exports = [
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//espresso/web/java/androidx/test/espresso/web/webdriver",
+    ],
+)
+
+axt_android_aar(
+    name = "espresso_web_aar",
+    expected_class_prefixes = [
+        "androidx.test.espresso.web",
+    ],
+    included_dep = ":espresso_web_aar_lib",
+)
+
+maven_artifact(
+    name = "espresso_web_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":espresso_web_aar",
+)
+
+dackka_test(
+    name = "espresso_web_doc",
+    runtime_dep = ":espresso_web_aar_lib",
+    src_jar = ":espresso_web_aar-src.jar",
+)
+
+api_checks(
+    name = "espresso_web_api",
+    runtime_dep = ":espresso_web_aar_lib",
+    src_jar = ":espresso_web_aar-src.jar",
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/BUILD.bazel
deleted file mode 100644
index 2b903002d..000000000
--- a/espresso/web/java/androidx/test/espresso/web/BUILD.bazel
+++ /dev/null
@@ -1,73 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "ESPRESSO_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-# ** Generate the release artifacts **
-
-android_library(
-    name = "espresso_web_release_lib",
-    exports = [
-        "//espresso/web/java/androidx/test/espresso/web/action",
-        "//espresso/web/java/androidx/test/espresso/web/assertion",
-        "//espresso/web/java/androidx/test/espresso/web/matcher",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "//espresso/web/java/androidx/test/espresso/web/sugar",
-        "//espresso/web/java/androidx/test/espresso/web/webdriver",
-    ],
-)
-
-axt_release_lib(
-    name = "espresso_web_release",
-    jarjar_rules = "release_jarjar_rules.txt",
-    keep_spec = "androidx.test.espresso.web",
-    proguard_specs = [
-        "//:proguard_binary.cfg",
-        "//espresso:proguard_binary.cfg",
-        ":proguard_binary.cfg",
-    ],
-    remove_spec = "androidx/test/espresso/web/R[$$\\.]",
-    deps = [
-        ":espresso_web_release_lib",
-    ],
-)
-
-filegroup(
-    name = "web_src",
-    srcs = [
-        "//espresso/web/java/androidx/test/espresso/web/action:libaction-src.jar",
-        "//espresso/web/java/androidx/test/espresso/web/assertion:libassertion-src.jar",
-        "//espresso/web/java/androidx/test/espresso/web/matcher:libmatcher-src.jar",
-        "//espresso/web/java/androidx/test/espresso/web/model:libmodel-src.jar",
-        "//espresso/web/java/androidx/test/espresso/web/sugar:libsugar-src.jar",
-        "//espresso/web/java/androidx/test/espresso/web/webdriver:libwebdriver-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "web_src_jars",
-    srcs = [
-        ":web_src",
-    ],
-)
-
-maven_artifact(
-    name = "espresso_web_maven_artifact",
-    src = ":espresso_web_release.aar",
-    artifact_deps = [
-        "androidx.test.espresso:espresso-core:%s" % ESPRESSO_VERSION,
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-        "org.ccil.cowan.tagsoup:tagsoup:1.2",
-    ],
-    artifact_id = "espresso-web",
-    group_id = "androidx.test.espresso",
-    last_updated = "20170622000000",
-    src_jar = ":web_src_jars.jar",
-    version = "%s" % ESPRESSO_VERSION,
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java b/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java
index 96ba4da48..d525578fd 100644
--- a/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java
+++ b/espresso/web/java/androidx/test/espresso/web/action/AtomAction.java
@@ -17,10 +17,9 @@
 package androidx.test.espresso.web.action;
 
 import static androidx.test.espresso.matcher.ViewMatchers.isJavascriptEnabled;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.util.concurrent.Futures.transform;
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static androidx.test.espresso.web.util.concurrent.Futures.transform;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.os.Build;
 import android.os.Bundle;
@@ -30,6 +29,8 @@
 import android.util.Log;
 import android.view.View;
 import android.webkit.WebView;
+import androidx.annotation.Nullable;
+import androidx.concurrent.futures.ResolvableFuture;
 import androidx.test.espresso.PerformException;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
@@ -38,16 +39,14 @@
 import androidx.test.espresso.web.model.ElementReference;
 import androidx.test.espresso.web.model.Evaluation;
 import androidx.test.espresso.web.model.WindowReference;
-import com.google.common.base.Function;
+import androidx.test.platform.concurrent.DirectExecutor;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.SettableFuture;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
+import kotlin.jvm.functions.Function1;
 import org.hamcrest.Matcher;
 
 /**
@@ -67,7 +66,7 @@ public final class AtomAction<E> implements ViewAction, Bindable {
   private static final String TAG = "AtomAction";
   private static final String ID = TAG;
   private static final String EVALUATION_ERROR_KEY = "evaluation_error_key";
-  private final SettableFuture<Evaluation> futureEval = SettableFuture.create();
+  private final ResolvableFuture<Evaluation> futureEval = ResolvableFuture.create();
   final Atom<E> atom;
   @Nullable final WindowReference window;
   @Nullable final ElementReference element;
@@ -112,7 +111,7 @@ public String getDescription() {
   }
 
   @Override
-  public void perform(UiController controller, View view) {
+  public void perform(UiController uiController, View view) {
     WebView webView = (WebView) view;
     if (Build.VERSION.SDK_INT >= 23 && !webView.isHardwareAccelerated()) {
       throw new PerformException.Builder()
@@ -151,7 +150,7 @@ public void run() {
             }
           }
         },
-        MoreExecutors.directExecutor());
+        DirectExecutor.INSTANCE);
   }
 
   private void reportException(Throwable throwable) {
@@ -166,19 +165,19 @@ private void reportException(Throwable throwable) {
 
   /**
    * Return a Future, which will be set and transformed from futureEval. Espresso's public API
-   * cannot have guava types in its method signatures, so return Future instead of ListenableFuture
+   * cannot have Guava types in its method signatures, so return Future instead of ListenableFuture
    * or SettableFuture.
    */
   public Future<E> getFuture() {
     return transform(
         futureEval,
-        new Function<Evaluation, E>() {
+        new Function1<Evaluation, E>() {
           @Override
-          public E apply(Evaluation e) {
+          public E invoke(Evaluation e) {
             return atom.transform(e);
           }
         },
-        directExecutor());
+        DirectExecutor.INSTANCE);
   }
 
   /** Blocks until the atom has completed execution. */
diff --git a/espresso/web/java/androidx/test/espresso/web/action/BUILD b/espresso/web/java/androidx/test/espresso/web/action/BUILD
new file mode 100644
index 000000000..59715966e
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/action/BUILD
@@ -0,0 +1,43 @@
+# Description:
+#   Espresso Web Actions
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+# to generate EvaluationAtom.java.opensource,
+# blaze build //tools/android/webdriver/atom:EvaluationAtom_src
+# cp blaze-genfiles/tools/android/webdriver/atom/EvaluationAtom.java third_party/android/androidx_test/espresso/web/java/androidx/test/espresso/web/action/EvaluationAtom.java.opensource
+
+android_library(
+    name = "action",
+    srcs = glob(
+        ["*.java"],
+    ),
+    custom_package = "androidx.test.espresso.web.action",
+    idl_import_root = "idls",
+    idl_srcs = glob(["idls/**"]),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote:bindable",
+        "//espresso/core/java/androidx/test/espresso/remote:interface",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/core/java/androidx/test/espresso/util",
+        "//espresso/web/java/androidx/test/espresso/web/bridge",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//espresso/web/java/androidx/test/espresso/web/util/concurrent",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:androidx_concurrent_concurrent_futures",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/action/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/action/BUILD.bazel
deleted file mode 100644
index a3a1f06c0..000000000
--- a/espresso/web/java/androidx/test/espresso/web/action/BUILD.bazel
+++ /dev/null
@@ -1,55 +0,0 @@
-# Espresso Web Actions
-
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = ["//visibility:public"])
-
-REMOTE_WEB_ACTIONS = [
-    "RemoteWebActions.java",
-    "*RemoteMessage.java",
-]
-
-android_library(
-    name = "action",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_WEB_ACTIONS,
-    ),
-    custom_package = "androidx.test.espresso.web.action",
-    idl_import_root = "idls",
-    idl_srcs = glob(["idls/**"]),
-    deps = [
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote:bindable",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/core/java/androidx/test/espresso/util",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "//opensource/java_lib:EvaluationAtom",
-        "//opensource/java_lib:webbridge",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
-)
-
-android_library(
-    name = "remote_web_actions",
-    srcs = glob(
-        REMOTE_WEB_ACTIONS,
-    ),
-    deps = [
-        ":action",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "//espresso/web/java/androidx/test/espresso/web/proto/action:web_actions_proto_android_pb3",
-        "@com_google_protobuf//:protobuf_javalite",
-    ],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/action/EnableJavascriptAction.java b/espresso/web/java/androidx/test/espresso/web/action/EnableJavascriptAction.java
index 8a28f9d00..6d72d7ae5 100644
--- a/espresso/web/java/androidx/test/espresso/web/action/EnableJavascriptAction.java
+++ b/espresso/web/java/androidx/test/espresso/web/action/EnableJavascriptAction.java
@@ -18,7 +18,6 @@
 
 import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
 
-import android.os.Build;
 import android.view.View;
 import android.webkit.WebView;
 import androidx.test.espresso.UiController;
@@ -48,13 +47,10 @@ public String getDescription() {
   }
 
   @Override
-  public void perform(UiController controller, View view) {
+  public void perform(UiController uiController, View view) {
     WebView webView = (WebView) view;
     if (!webView.getSettings().getJavaScriptEnabled()) {
       webView.getSettings().setJavaScriptEnabled(true);
-      if (Build.VERSION.SDK_INT < 19) {
-        webView.reload();
-      }
     }
   }
 }
diff --git a/espresso/web/java/androidx/test/espresso/web/action/EvaluationAtom.java b/espresso/web/java/androidx/test/espresso/web/action/EvaluationAtom.java
new file mode 100755
index 000000000..bbd013d9a
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/action/EvaluationAtom.java
@@ -0,0 +1,260 @@
+package androidx.test.espresso.web.action;
+// GENERATED CODE DO NOT EDIT
+final class EvaluationAtom {
+/* field: EXECUTE_SCRIPT_ANDROID license: 
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+ */
+  static final String EXECUTE_SCRIPT_ANDROID =
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar k=this||self;fu" +
+    "nction l(a){var b=typeof a;return\"object\"!=b?b:a?Array.isArray(a)?" +
+    "\"array\":b:\"null\"}function m(a){var b=l(a);return\"array\"==b||\"objec" +
+    "t\"==b&&\"number\"==typeof a.length}function n(a){var b=typeof a;retu" +
+    "rn\"object\"==b&&null!=a||\"function\"==b}\nfunction p(a,b){function c(" +
+    "){}c.prototype=b.prototype;a.j=b.prototype;a.prototype=new c;a.pro" +
+    "totype.constructor=a;a.i=function(d,e,f){for(var g=Array(arguments" +
+    ".length-2),h=2;h<arguments.length;h++)g[h-2]=arguments[h];return b" +
+    ".prototype[e].apply(d,g)}};function q(a,b){for(var c=a.length,d=Ar" +
+    "ray(c),e=\"string\"===typeof a?a.split(\"\"):a,f=0;f<c;f++)f in e&&(d[" +
+    "f]=b.call(void 0,e[f],f,a));return d};function r(a,b){var c={},d;f" +
+    "or(d in a)b.call(void 0,a[d],d,a)&&(c[d]=a[d]);return c}function t" +
+    "(a,b){var c={},d;for(d in a)c[d]=b.call(void 0,a[d],d,a);return c}" +
+    "function u(a,b){return null!==a&&b in a}function v(a,b){for(var c " +
+    "in a)if(b.call(void 0,a[c],c,a))return c};var w=String.prototype.t" +
+    "rim?function(a){return a.trim()}:function(a){return/^[\\s\\xa0]*([\\s" +
+    "\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};function x(a,b){return a<b?-1:a>b?1:" +
+    "0};function y(){var a=k.navigator;return a&&(a=a.userAgent)?a:\"\"};" +
+    "/*\n\n Copyright 2014 Software Freedom Conservancy\n\n Licensed under " +
+    "the Apache License, Version 2.0 (the \"License\");\n you may not use " +
+    "this file except in compliance with the License.\n You may obtain a" +
+    " copy of the License at\n\n      http://www.apache.org/licenses/LICE" +
+    "NSE-2.0\n\n Unless required by applicable law or agreed to in writin" +
+    "g, software\n distributed under the License is distributed on an \"A" +
+    "S IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either" +
+    " express or implied.\n See the License for the specific language go" +
+    "verning permissions and\n limitations under the License.\n*/\nvar z=w" +
+    "indow;function A(a,b){this.code=a;this.h=B[a]||\"unknown error\";thi" +
+    "s.message=b||\"\";a=this.h.replace(/((?:^|\\s+)[a-z])/g,function(c){r" +
+    "eturn c.toUpperCase().replace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5;if(" +
+    "0>b||a.indexOf(\"Error\",b)!=b)a+=\"Error\";this.name=a;a=Error(this.m" +
+    "essage);a.name=this.name;this.stack=a.stack||\"\"}p(A,Error);\nvar B=" +
+    "{15:\"element not selectable\",11:\"element not visible\",31:\"unknown " +
+    "error\",30:\"unknown error\",24:\"invalid cookie domain\",29:\"invalid e" +
+    "lement coordinates\",12:\"invalid element state\",32:\"invalid selecto" +
+    "r\",51:\"invalid selector\",52:\"invalid selector\",17:\"javascript erro" +
+    "r\",405:\"unsupported operation\",34:\"move target out of bounds\",27:\"" +
+    "no such alert\",7:\"no such element\",8:\"no such frame\",23:\"no such w" +
+    "indow\",28:\"script timeout\",33:\"session not created\",10:\"stale elem" +
+    "ent reference\",21:\"timeout\",25:\"unable to set cookie\",\n26:\"unexpec" +
+    "ted alert open\",13:\"unknown error\",9:\"unknown command\"};A.prototyp" +
+    "e.toString=function(){return this.name+\": \"+this.message};function" +
+    " C(){}\nfunction D(a,b,c){if(null==b)c.push(\"null\");else{if(\"object" +
+    "\"==typeof b){if(Array.isArray(b)){var d=b;b=d.length;c.push(\"[\");f" +
+    "or(var e=\"\",f=0;f<b;f++)c.push(e),D(a,d[f],c),e=\",\";c.push(\"]\");re" +
+    "turn}if(b instanceof String||b instanceof Number||b instanceof Boo" +
+    "lean)b=b.valueOf();else{c.push(\"{\");e=\"\";for(d in b)Object.prototy" +
+    "pe.hasOwnProperty.call(b,d)&&(f=b[d],\"function\"!=typeof f&&(c.push" +
+    "(e),E(d,c),c.push(\":\"),D(a,f,c),e=\",\"));c.push(\"}\");return}}switch" +
+    "(typeof b){case \"string\":E(b,c);break;case \"number\":c.push(isFinit" +
+    "e(b)&&\n!isNaN(b)?String(b):\"null\");break;case \"boolean\":c.push(Str" +
+    "ing(b));break;case \"function\":c.push(\"null\");break;default:throw E" +
+    "rror(\"Unknown type: \"+typeof b);}}}var F={'\"':'\\\\\"',\"\\\\\":\"\\\\\\\\\",\"/" +
+    "\":\"\\\\/\",\"\\b\":\"\\\\b\",\"\\f\":\"\\\\f\",\"\\n\":\"\\\\n\",\"\\r\":\"\\\\r\",\"\\t\":\"\\\\t\",\"\\v" +
+    "\":\"\\\\u000b\"},G=/\\uffff/.test(\"\\uffff\")?/[\\\\\"\\x00-\\x1f\\x7f-\\uffff]/" +
+    "g:/[\\\\\"\\x00-\\x1f\\x7f-\\xff]/g;function E(a,b){b.push('\"',a.replace(" +
+    "G,function(c){var d=F[c];d||(d=\"\\\\u\"+(c.charCodeAt(0)|65536).toStr" +
+    "ing(16).slice(1),F[c]=d);return d}),'\"')};function H(a){return(a=a" +
+    ".exec(y()))?a[1]:\"\"}H(/Android\\s+([0-9.]+)/)||H(/Version\\/([0-9.]+" +
+    ")/);function I(a){var b=0,c=w(String(J)).split(\".\");a=w(String(a))" +
+    ".split(\".\");for(var d=Math.max(c.length,a.length),e=0;0==b&&e<d;e+" +
+    "+){var f=c[e]||\"\",g=a[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\"" +
+    ",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].lengt" +
+    "h&&0==g[0].length)break;b=x(0==f[1].length?0:parseInt(f[1],10),0==" +
+    "g[1].length?0:parseInt(g[1],10))||x(0==f[2].length,0==g[2].length)" +
+    "||x(f[2],g[2]);f=f[3];g=g[3]}while(0==b)}}var K=/Android\\s+([0-9\\." +
+    "]+)/.exec(y()),J=K?K[1]:\"0\";I(2.3);I(4);function L(a){function b(c" +
+    ",d){switch(l(c)){case \"string\":case \"number\":case \"boolean\":return" +
+    " c;case \"function\":return c.toString();case \"array\":return q(c,fun" +
+    "ction(f){return b(f,d)});case \"object\":if(0<=d.indexOf(c))throw ne" +
+    "w A(17,\"Recursive object cannot be transferred\");if(u(c,\"nodeType\"" +
+    ")&&(1==c.nodeType||9==c.nodeType)){var e={};e.ELEMENT=M(c);return " +
+    "e}if(u(c,\"document\"))return e={},e.WINDOW=M(c),e;d.push(c);if(m(c)" +
+    ")return q(c,function(f){return b(f,d)});c=r(c,function(f,g){return" +
+    "\"number\"===typeof g||\n\"string\"===typeof g});return t(c,function(f)" +
+    "{return b(f,d)});default:return null}}return b(a,[])}function N(a," +
+    "b){return Array.isArray(a)?q(a,function(c){return N(c,b)}):n(a)?\"f" +
+    "unction\"==typeof a?a:u(a,\"ELEMENT\")?O(a.ELEMENT,b):u(a,\"WINDOW\")?O" +
+    "(a.WINDOW,b):t(a,function(c){return N(c,b)}):a}function P(a){a=a||" +
+    "document;var b=a.$wdc_;b||(b=a.$wdc_={},b.g=Date.now());b.g||(b.g=" +
+    "Date.now());return b}\nfunction M(a){var b=P(a.ownerDocument),c=v(b" +
+    ",function(d){return d==a});c||(c=\":wdc:\"+b.g++,b[c]=a);return c}\nf" +
+    "unction O(a,b){a=decodeURIComponent(a);b=b||document;var c=P(b);if" +
+    "(!u(c,a))throw new A(10,\"Element does not exist in cache\");var d=c" +
+    "[a];if(u(d,\"setInterval\")){if(d.closed)throw delete c[a],new A(23," +
+    "\"Window has been closed.\");return d}for(var e=d,f=!!HTMLElement.pr" +
+    "ototype.attachShadow;e;){if(e==b.documentElement)return d;f&&e ins" +
+    "tanceof ShadowRoot?e.host.shadowRoot!==e?e=null:e=e.host:e=e.paren" +
+    "tNode}delete c[a];throw new A(10,\"Element is no longer attached to" +
+    " the DOM\");};function Q(a,b,c,d){d=d||z;try{a:{var e=a;if(\"string\"" +
+    "===typeof e)try{a=new d.Function(e);break a}catch(h){throw h;}a=d=" +
+    "=window?e:new d.Function(\"return (\"+e+\").apply(null,arguments);\")}" +
+    "var f=N(b,d.document);var g={status:0,value:L(a.apply(null,f))}}ca" +
+    "tch(h){g={status:u(h,\"code\")?h.code:13,value:{message:h.message}}}" +
+    "c&&(a=[],D(new C,g,a),g=a.join(\"\"));return g}var R=[\"_\"],S=k;R[0]i" +
+    "n S||\"undefined\"==typeof S.execScript||S.execScript(\"var \"+R[0]);\n" +
+    "for(var T;R.length&&(T=R.shift());)R.length||void 0===Q?S[T]&&S[T]" +
+    "!==Object.prototype[T]?S=S[T]:S=S[T]={}:S[T]=Q;;return this._.appl" +
+    "y(null,arguments);}).apply({navigator:typeof window!=\"undefined\"?w" +
+    "indow.navigator:null},arguments);}\n";
+  static final String EXECUTE_SCRIPT_ANDROID_license =
+    "\n\n Copyright 2014 Software Freedom Conservancy\n\n Licensed under th" +
+    "e Apache License, Version 2.0 (the \"License\");\n you may not use th" +
+    "is file except in compliance with the License.\n You may obtain a c" +
+    "opy of the License at\n\n      http://www.apache.org/licenses/LICENS" +
+    "E-2.0\n\n Unless required by applicable law or agreed to in writing," +
+    " software\n distributed under the License is distributed on an \"AS " +
+    "IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either e" +
+    "xpress or implied.\n See the License for the specific language gove" +
+    "rning permissions and\n limitations under the License.\n\n\n Copyright" +
+    " The Closure Library Authors.\n SPDX-License-Identifier: Apache-2.0" +
+    "\n";
+  private static final String EXECUTE_SCRIPT_ANDROID_original() {
+    return EXECUTE_SCRIPT_ANDROID.replaceAll("xxx_rpl_lic", EXECUTE_SCRIPT_ANDROID_license);
+  }
+
+/* field: GET_ELEMENT_ANDROID license: 
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+ */
+  static final String GET_ELEMENT_ANDROID =
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar h=this||self;fu" +
+    "nction k(a,b){function e(){}e.prototype=b.prototype;a.j=b.prototyp" +
+    "e;a.prototype=new e;a.prototype.constructor=a;a.i=function(c,d,f){" +
+    "for(var g=Array(arguments.length-2),n=2;n<arguments.length;n++)g[n" +
+    "-2]=arguments[n];return b.prototype[d].apply(c,g)}};var l=String.p" +
+    "rototype.trim?function(a){return a.trim()}:function(a){return/^[\\s" +
+    "\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};function m(a,b){return a<b" +
+    "?-1:a>b?1:0};function p(){var a=h.navigator;return a&&(a=a.userAge" +
+    "nt)?a:\"\"};/*\n\n Copyright 2014 Software Freedom Conservancy\n\n Licen" +
+    "sed under the Apache License, Version 2.0 (the \"License\");\n you ma" +
+    "y not use this file except in compliance with the License.\n You ma" +
+    "y obtain a copy of the License at\n\n      http://www.apache.org/lic" +
+    "enses/LICENSE-2.0\n\n Unless required by applicable law or agreed to" +
+    " in writing, software\n distributed under the License is distribute" +
+    "d on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KI" +
+    "ND, either express or implied.\n See the License for the specific l" +
+    "anguage governing permissions and\n limitations under the License.\n" +
+    "*/\nfunction q(a,b){this.code=a;this.h=r[a]||\"unknown error\";this.m" +
+    "essage=b||\"\";a=this.h.replace(/((?:^|\\s+)[a-z])/g,function(e){retu" +
+    "rn e.toUpperCase().replace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5;if(0>b" +
+    "||a.indexOf(\"Error\",b)!=b)a+=\"Error\";this.name=a;a=Error(this.mess" +
+    "age);a.name=this.name;this.stack=a.stack||\"\"}k(q,Error);\nvar r={15" +
+    ":\"element not selectable\",11:\"element not visible\",31:\"unknown err" +
+    "or\",30:\"unknown error\",24:\"invalid cookie domain\",29:\"invalid elem" +
+    "ent coordinates\",12:\"invalid element state\",32:\"invalid selector\"," +
+    "51:\"invalid selector\",52:\"invalid selector\",17:\"javascript error\"," +
+    "405:\"unsupported operation\",34:\"move target out of bounds\",27:\"no " +
+    "such alert\",7:\"no such element\",8:\"no such frame\",23:\"no such wind" +
+    "ow\",28:\"script timeout\",33:\"session not created\",10:\"stale element" +
+    " reference\",21:\"timeout\",25:\"unable to set cookie\",\n26:\"unexpected" +
+    " alert open\",13:\"unknown error\",9:\"unknown command\"};q.prototype.t" +
+    "oString=function(){return this.name+\": \"+this.message};function t(" +
+    "a){return(a=a.exec(p()))?a[1]:\"\"}t(/Android\\s+([0-9.]+)/)||t(/Vers" +
+    "ion\\/([0-9.]+)/);function u(a){var b=0,e=l(String(v)).split(\".\");a" +
+    "=l(String(a)).split(\".\");for(var c=Math.max(e.length,a.length),d=0" +
+    ";0==b&&d<c;d++){var f=e[d]||\"\",g=a[d]||\"\";do{f=/(\\d*)(\\D*)(.*)/.ex" +
+    "ec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(" +
+    "0==f[0].length&&0==g[0].length)break;b=m(0==f[1].length?0:parseInt" +
+    "(f[1],10),0==g[1].length?0:parseInt(g[1],10))||m(0==f[2].length,0=" +
+    "=g[2].length)||m(f[2],g[2]);f=f[3];g=g[3]}while(0==b)}}var w=/Andr" +
+    "oid\\s+([0-9\\.]+)/.exec(p()),v=w?w[1]:\"0\";u(2.3);u(4);function x(a," +
+    "b){a=decodeURIComponent(a);b=b||document;var e=b||document;var c=e" +
+    ".$wdc_;c||(c=e.$wdc_={},c.g=Date.now());c.g||(c.g=Date.now());e=c;" +
+    "if(!(null!==e&&a in e))throw new q(10,\"Element does not exist in c" +
+    "ache\");c=e[a];if(null!==c&&\"setInterval\"in c){if(c.closed)throw de" +
+    "lete e[a],new q(23,\"Window has been closed.\");return c}for(var d=c" +
+    ",f=!!HTMLElement.prototype.attachShadow;d;){if(d==b.documentElemen" +
+    "t)return c;f&&d instanceof ShadowRoot?d.host.shadowRoot!==d?d=null" +
+    ":d=d.host:d=d.parentNode}delete e[a];\nthrow new q(10,\"Element is n" +
+    "o longer attached to the DOM\");}var y=[\"_\"],z=h;y[0]in z||\"undefin" +
+    "ed\"==typeof z.execScript||z.execScript(\"var \"+y[0]);for(var A;y.le" +
+    "ngth&&(A=y.shift());)y.length||void 0===x?z[A]&&z[A]!==Object.prot" +
+    "otype[A]?z=z[A]:z=z[A]={}:z[A]=x;;return this._.apply(null,argumen" +
+    "ts);}).apply({navigator:typeof window!=\"undefined\"?window.navigato" +
+    "r:null},arguments);}\n";
+  static final String GET_ELEMENT_ANDROID_license =
+    "\n\n Copyright 2014 Software Freedom Conservancy\n\n Licensed under th" +
+    "e Apache License, Version 2.0 (the \"License\");\n you may not use th" +
+    "is file except in compliance with the License.\n You may obtain a c" +
+    "opy of the License at\n\n      http://www.apache.org/licenses/LICENS" +
+    "E-2.0\n\n Unless required by applicable law or agreed to in writing," +
+    " software\n distributed under the License is distributed on an \"AS " +
+    "IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either e" +
+    "xpress or implied.\n See the License for the specific language gove" +
+    "rning permissions and\n limitations under the License.\n\n\n Copyright" +
+    " The Closure Library Authors.\n SPDX-License-Identifier: Apache-2.0" +
+    "\n";
+  private static final String GET_ELEMENT_ANDROID_original() {
+    return GET_ELEMENT_ANDROID.replaceAll("xxx_rpl_lic", GET_ELEMENT_ANDROID_license);
+  }
+
+  public static void main(String[] args) {
+    if (args.length == 0) {
+      {
+        String message =     "EXECUTE_SCRIPT_ANDROID third_party/javascript/browser_automation/b" +
+    "ot/fragments/execute_script_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "GET_ELEMENT_ANDROID tools/android/webdriver/atom/get_element_andro" +
+    "id.js";
+        System.out.println(message);
+      }
+      System.exit(0);
+    }
+    String name = args[0];
+    if("EXECUTE_SCRIPT_ANDROID".equals(name)) {
+      System.out.print(EvaluationAtom.EXECUTE_SCRIPT_ANDROID_original());
+      System.exit(0);
+    }
+    if("GET_ELEMENT_ANDROID".equals(name)) {
+      System.out.print(EvaluationAtom.GET_ELEMENT_ANDROID_original());
+      System.exit(0);
+    }
+    System.exit(1);
+  }
+}
\ No newline at end of file
diff --git a/espresso/web/java/androidx/test/espresso/web/action/JavascriptEvaluation.java b/espresso/web/java/androidx/test/espresso/web/action/JavascriptEvaluation.java
index b63555b2f..5bd528990 100644
--- a/espresso/web/java/androidx/test/espresso/web/action/JavascriptEvaluation.java
+++ b/espresso/web/java/androidx/test/espresso/web/action/JavascriptEvaluation.java
@@ -16,35 +16,33 @@
 
 package androidx.test.espresso.web.action;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.util.concurrent.Futures.transform;
-import static com.google.common.util.concurrent.Futures.transformAsync;
-import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
+import static androidx.test.espresso.web.util.concurrent.Futures.transform;
+import static androidx.test.espresso.web.util.concurrent.Futures.transformAsync;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 
-import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
 import android.webkit.ValueCallback;
 import android.webkit.WebHistoryItem;
 import android.webkit.WebView;
+import androidx.annotation.Nullable;
+import androidx.test.espresso.web.bridge.Conduit;
+import androidx.test.espresso.web.bridge.JavaScriptBridge;
 import androidx.test.espresso.web.model.Evaluation;
 import androidx.test.espresso.web.model.ModelCodec;
 import androidx.test.espresso.web.model.WindowReference;
-import com.google.android.apps.common.testing.testrunner.web.Conduit;
-import com.google.android.apps.common.testing.testrunner.web.JavaScriptBridge;
-import com.google.common.base.Function;
-import com.google.common.util.concurrent.AbstractFuture;
-import com.google.common.util.concurrent.AsyncFunction;
-import com.google.common.util.concurrent.Futures;
+import androidx.test.espresso.web.util.concurrent.AbstractFuture;
+import androidx.test.espresso.web.util.concurrent.AsyncFunction;
+import androidx.test.espresso.web.util.concurrent.Futures;
+import androidx.test.platform.concurrent.DirectExecutor;
 import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.MoreExecutors;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
+import kotlin.jvm.functions.Function1;
 
 /**
  * Wraps scripts into WebDriver atoms, which are used to ensure consistent behaviour cross-browser.
@@ -54,10 +52,10 @@ private JavascriptEvaluation() {}
 
   private static final ScriptPreparer SCRIPT_PREPARER;
   private static final AsyncFunction<PreparedScript, String> RAW_EVALUATOR;
-  private static final Function<String, Evaluation> DECODE_EVALUATION =
-      new Function<String, Evaluation>() {
+  private static final Function1<String, Evaluation> DECODE_EVALUATION =
+      new Function1<String, Evaluation>() {
         @Override
-        public Evaluation apply(String in) {
+        public Evaluation invoke(String in) {
           return ModelCodec.decodeEvaluation(in);
         }
       };
@@ -77,13 +75,9 @@ public void handleMessage(Message m) {
       };
 
   static {
-    if (Build.VERSION.SDK_INT < 19) {
-      SCRIPT_PREPARER = new ScriptPreparer(true);
-      RAW_EVALUATOR = new AsyncConduitEvaluation();
-    } else {
+
       SCRIPT_PREPARER = new ScriptPreparer(false);
       RAW_EVALUATOR = new AsyncJavascriptEvaluation();
-    }
   }
 
   /**
@@ -109,11 +103,11 @@ static ListenableFuture<Evaluation> evaluate(
     SanitizerTask sanitizer = new SanitizerTask(unprepared);
     view.post(sanitizer);
     ListenableFuture<PreparedScript> preparedScript =
-        transform(sanitizer, SCRIPT_PREPARER, directExecutor());
+        transform(sanitizer, SCRIPT_PREPARER, DirectExecutor.INSTANCE);
     ListenableFuture<String> rawEvaluation =
-        transformAsync(preparedScript, RAW_EVALUATOR, directExecutor());
+        transformAsync(preparedScript, RAW_EVALUATOR, DirectExecutor.INSTANCE);
     ListenableFuture<Evaluation> parsedEvaluation =
-        transform(rawEvaluation, DECODE_EVALUATION, directExecutor());
+        transform(rawEvaluation, DECODE_EVALUATION, DirectExecutor.INSTANCE);
     return parsedEvaluation;
   }
 
@@ -166,11 +160,11 @@ private void innerSanity() {
 
       if (isWebViewSane()) {
         PreparedScript docCheckScript =
-            SCRIPT_PREPARER.apply(
+            SCRIPT_PREPARER.invoke(
                 new UnpreparedScript(
                     unprepared.view,
                     DOC_ELEMENT_PRESENT,
-                    Collections.EMPTY_LIST,
+                    Collections.emptyList(),
                     unprepared.window));
         ListenableFuture<String> futureRaw = null;
         try {
@@ -180,7 +174,7 @@ private void innerSanity() {
           return;
         }
         final ListenableFuture<Evaluation> futureParsed =
-            Futures.transform(futureRaw, DECODE_EVALUATION, directExecutor());
+            Futures.transform(futureRaw, DECODE_EVALUATION, DirectExecutor.INSTANCE);
 
         futureParsed.addListener(
             new Runnable() {
@@ -190,23 +184,20 @@ public void run() {
                   Evaluation eval = futureParsed.get();
                   if (eval.getStatus() == 0) {
                     if ((Boolean) eval.getValue()) {
-                      if (Build.VERSION.SDK_INT == 10) {
-                        set(unprepared);
-                      } else {
-                        // webview seems ready, but force it to respond to a requestFocusNodeHref
-                        // call
-                        // and check if it is still sane after the response.
-                        // This works around flakes in API 15 where progress updates may not be sent
-                        // without a requestFocusNodeHref call.
-                        unprepared.view.post(
-                            new Runnable() {
-                              @Override
-                              public void run() {
-                                unprepared.view.requestFocusNodeHref(
-                                    MAIN_HANDLER.obtainMessage(SANITIZER_SYNC, SanitizerTask.this));
-                              }
-                            });
-                      }
+
+                      // webview seems ready, but force it to respond to a requestFocusNodeHref
+                      // call
+                      // and check if it is still sane after the response.
+                      // This works around flakes in API 15 where progress updates may not be sent
+                      // without a requestFocusNodeHref call.
+                      unprepared.view.post(
+                          new Runnable() {
+                            @Override
+                            public void run() {
+                              unprepared.view.requestFocusNodeHref(
+                                  MAIN_HANDLER.obtainMessage(SANITIZER_SYNC, SanitizerTask.this));
+                            }
+                          });
                     } else {
                       unprepared.view.postDelayed(SanitizerTask.this, DELAY);
                     }
@@ -221,7 +212,7 @@ public void run() {
                 }
               }
             },
-            MoreExecutors.directExecutor());
+            DirectExecutor.INSTANCE);
 
       } else {
         unprepared.view.postDelayed(this, DELAY);
@@ -308,7 +299,7 @@ private static class PreparedScript {
     }
   }
 
-  private static final class ScriptPreparer implements Function<UnpreparedScript, PreparedScript> {
+  private static final class ScriptPreparer implements Function1<UnpreparedScript, PreparedScript> {
     private final boolean conduitize;
 
     public ScriptPreparer(boolean conduitize) {
@@ -316,7 +307,7 @@ public ScriptPreparer(boolean conduitize) {
     }
 
     @Override
-    public PreparedScript apply(UnpreparedScript unprepared) {
+    public PreparedScript invoke(UnpreparedScript unprepared) {
       StringBuilder atomized = atomize(unprepared.script, unprepared.args, unprepared.window);
       Conduit conduit = null;
       if (conduitize) {
@@ -405,30 +396,6 @@ private StringBuilder escapeAndQuote(StringBuilder scriptBuffer, String toWrap)
     }
   }
 
-  private static final class AsyncConduitEvaluation
-      implements AsyncFunction<PreparedScript, String> {
-    @Override
-    public ListenableFuture<String> apply(final PreparedScript in) {
-
-      if (null == in.conduit) {
-        return Futures.<String>immediateFailedFuture(new RuntimeException("Not a conduit script!"));
-      } else {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-          in.view.loadUrl(in.script);
-        } else {
-          in.view.post(
-              new Runnable() {
-                @Override
-                public void run() {
-                  in.view.loadUrl(in.script);
-                }
-              });
-        }
-        return in.conduit.getResult();
-      }
-    }
-  }
-
   private static final class AsyncJavascriptEvaluation
       implements AsyncFunction<PreparedScript, String> {
     @Override
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.4.0_public.txt b/espresso/web/java/androidx/test/espresso/web/api/3.4.0_public.txt
new file mode 100644
index 000000000..9048d3719
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.4.0_public.txt
@@ -0,0 +1,225 @@
+// Signature format: 3.0
+package androidx.test.espresso.web.action {
+
+  public final class AtomAction<E> implements androidx.test.espresso.remote.Bindable androidx.test.espresso.ViewAction {
+    ctor public AtomAction(androidx.test.espresso.web.model.Atom<E!>!, androidx.test.espresso.web.model.WindowReference?, androidx.test.espresso.web.model.ElementReference?);
+    method public E! get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+    method public E! get(long, java.util.concurrent.TimeUnit!) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public java.util.concurrent.Future<E!>! getFuture();
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public class EnableJavascriptAction implements androidx.test.espresso.ViewAction {
+    ctor public EnableJavascriptAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface IAtomActionResultPropagator extends android.os.IInterface {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+  public abstract static class IAtomActionResultPropagator.Stub implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Stub();
+    method public static androidx.test.espresso.web.action.IAtomActionResultPropagator! asInterface(android.os.IBinder!);
+    method protected boolean dispatchTransaction(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+  public static class IAtomActionResultPropagator.Stub.Proxy implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.web.assertion {
+
+  public final class TagSoupDocumentParser {
+    method public static androidx.test.espresso.web.assertion.TagSoupDocumentParser! newInstance() throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+    method public org.w3c.dom.Document! parse(String!) throws java.io.IOException, org.xml.sax.SAXException;
+  }
+
+  public abstract class WebAssertion<E> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public WebAssertion(androidx.test.espresso.web.model.Atom<E!>!);
+    method protected abstract void checkResult(android.webkit.WebView!, E!);
+    method public final androidx.test.espresso.web.model.Atom<E!>! getAtom();
+    method public final androidx.test.espresso.ViewAssertion! toViewAssertion(E!);
+  }
+
+  public final class WebViewAssertions {
+    method public static androidx.test.espresso.web.assertion.WebAssertion<org.w3c.dom.Document!>! webContent(org.hamcrest.Matcher<org.w3c.dom.Document!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!);
+  }
+
+  public static interface WebViewAssertions.ResultDescriber<E> {
+    method public String! apply(E!);
+  }
+
+}
+
+package androidx.test.espresso.web.matcher {
+
+  public final class AmbiguousElementMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public AmbiguousElementMatcherException(String!);
+  }
+
+  public final class DomMatchers {
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! containingTextInBody(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementById(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementByXPath(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithId(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithXpath(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! withBody(org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.web.model {
+
+  public interface Atom<R> {
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public R! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public final class Atoms {
+    method public static <E> androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,E!>! castOrDie(Class<E!>!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getCurrentUrl();
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getTitle();
+    method public static <O> androidx.test.espresso.web.model.Atom<O!>! script(String!, androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,O!>!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! script(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! scriptWithArgs(String!, java.util.List<java.lang.Object!>!);
+    method public static <I, O> androidx.test.espresso.web.model.Atom<O!>! transform(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+  }
+
+  public final class ElementReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+  public final class Evaluation implements androidx.test.espresso.web.model.JSONAble android.os.Parcelable {
+    ctor protected Evaluation(android.os.Parcel!);
+    method public int describeContents();
+    method public String! getMessage();
+    method public int getStatus();
+    method public Object? getValue();
+    method public boolean hasMessage();
+    method public void readFromParcel(android.os.Parcel!);
+    method public String! toJSONString();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.espresso.web.model.Evaluation!>! CREATOR;
+  }
+
+  public interface JSONAble {
+    method public String! toJSONString();
+  }
+
+  public static interface JSONAble.DeJSONFactory {
+    method public Object! attemptDeJSONize(java.util.Map<java.lang.String!,java.lang.Object!>!);
+  }
+
+  public final class ModelCodec {
+    method public static void addDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+    method public static androidx.test.espresso.web.model.Evaluation! decodeEvaluation(String!);
+    method public static String! encode(Object!);
+    method public static void removeDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+  }
+
+  public class SimpleAtom implements androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation> {
+    ctor public SimpleAtom(String!);
+    ctor public SimpleAtom(String!, androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement!);
+    method public final java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method protected java.util.List<java.lang.Object!>! getNonContextualArguments();
+    method public final String! getScript();
+    method protected androidx.test.espresso.web.model.Evaluation! handleBadEvaluation(androidx.test.espresso.web.model.Evaluation!);
+    method protected void handleNoElementReference();
+    method public final androidx.test.espresso.web.model.Evaluation! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public enum SimpleAtom.ElementReferencePlacement {
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement FIRST;
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement LAST;
+  }
+
+  public class TransformingAtom<I, O> implements androidx.test.espresso.web.model.Atom<O> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TransformingAtom(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public O! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public static interface TransformingAtom.Transformer<I, O> {
+    method public O! apply(I!);
+  }
+
+  public final class WindowReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+}
+
+package androidx.test.espresso.web.sugar {
+
+  public final class Web {
+    ctor public Web();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public static class Web.WebInteraction<R> {
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! check(androidx.test.espresso.web.assertion.WebAssertion<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! forceJavascriptEnabled();
+    method public R! get();
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.WindowReference!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>!);
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! perform(androidx.test.espresso.web.model.Atom<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! reset();
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withContextualElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.ElementReference!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withNoTimeout();
+    method @android.support.annotation.CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+}
+
+package androidx.test.espresso.web.webdriver {
+
+  public final class DriverAtoms {
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! clearElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! findElement(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.util.List<androidx.test.espresso.web.model.ElementReference!>!>! findMultipleElements(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getText();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! selectActiveElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webClick();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webKeys(String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.Boolean!>! webScrollIntoView();
+  }
+
+  public enum Locator {
+    method public String! getType();
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CLASS_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CSS_SELECTOR;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator ID;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator PARTIAL_LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator TAG_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator XPATH;
+  }
+
+}
+
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.5.0_internal.txt b/espresso/web/java/androidx/test/espresso/web/api/3.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.5.0_public.txt b/espresso/web/java/androidx/test/espresso/web/api/3.5.0_public.txt
new file mode 100644
index 000000000..457a8a571
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.5.0_public.txt
@@ -0,0 +1,224 @@
+// Signature format: 3.0
+package androidx.test.espresso.web.action {
+
+  public final class AtomAction<E> implements androidx.test.espresso.remote.Bindable androidx.test.espresso.ViewAction {
+    ctor public AtomAction(androidx.test.espresso.web.model.Atom<E!>!, androidx.test.espresso.web.model.WindowReference?, androidx.test.espresso.web.model.ElementReference?);
+    method public E! get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+    method public E! get(long, java.util.concurrent.TimeUnit!) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public java.util.concurrent.Future<E!>! getFuture();
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public class EnableJavascriptAction implements androidx.test.espresso.ViewAction {
+    ctor public EnableJavascriptAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface IAtomActionResultPropagator extends android.os.IInterface {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+  public abstract static class IAtomActionResultPropagator.Stub extends com.google.android.aidl.BaseStub implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Stub();
+    method public static androidx.test.espresso.web.action.IAtomActionResultPropagator! asInterface(android.os.IBinder!);
+  }
+
+  public static class IAtomActionResultPropagator.Stub.Proxy extends com.google.android.aidl.BaseProxy implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.web.assertion {
+
+  public final class TagSoupDocumentParser {
+    method public static androidx.test.espresso.web.assertion.TagSoupDocumentParser! newInstance() throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+    method public org.w3c.dom.Document! parse(String!) throws java.io.IOException, org.xml.sax.SAXException;
+  }
+
+  public abstract class WebAssertion<E> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public WebAssertion(androidx.test.espresso.web.model.Atom<E!>!);
+    method protected abstract void checkResult(android.webkit.WebView!, E!);
+    method public final androidx.test.espresso.web.model.Atom<E!>! getAtom();
+    method public final androidx.test.espresso.ViewAssertion! toViewAssertion(E!);
+  }
+
+  public final class WebViewAssertions {
+    method public static androidx.test.espresso.web.assertion.WebAssertion<org.w3c.dom.Document!>! webContent(org.hamcrest.Matcher<org.w3c.dom.Document!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!);
+  }
+
+  public static interface WebViewAssertions.ResultDescriber<E> {
+    method public String! apply(E!);
+  }
+
+}
+
+package androidx.test.espresso.web.matcher {
+
+  public final class AmbiguousElementMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public AmbiguousElementMatcherException(String!);
+  }
+
+  public final class DomMatchers {
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! containingTextInBody(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementById(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementByXPath(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithId(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithXpath(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! withBody(org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.web.model {
+
+  public interface Atom<R> {
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public R! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public final class Atoms {
+    method public static <E> androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,E!>! castOrDie(Class<E!>!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getCurrentUrl();
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getTitle();
+    method public static <O> androidx.test.espresso.web.model.Atom<O!>! script(String!, androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,O!>!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! script(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! scriptWithArgs(String!, java.util.List<java.lang.Object!>!);
+    method public static <I, O> androidx.test.espresso.web.model.Atom<O!>! transform(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+  }
+
+  public final class ElementReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+  public final class Evaluation implements androidx.test.espresso.web.model.JSONAble android.os.Parcelable {
+    ctor protected Evaluation(android.os.Parcel!);
+    method public int describeContents();
+    method public String! getMessage();
+    method public int getStatus();
+    method public Object? getValue();
+    method public boolean hasMessage();
+    method public void readFromParcel(android.os.Parcel!);
+    method public String! toJSONString();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.espresso.web.model.Evaluation!>! CREATOR;
+  }
+
+  public interface JSONAble {
+    method public String! toJSONString();
+  }
+
+  public static interface JSONAble.DeJSONFactory {
+    method public Object! attemptDeJSONize(java.util.Map<java.lang.String!,java.lang.Object!>!);
+  }
+
+  public final class ModelCodec {
+    method public static void addDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+    method public static androidx.test.espresso.web.model.Evaluation! decodeEvaluation(String!);
+    method public static String! encode(Object!);
+    method public static void removeDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+  }
+
+  public class SimpleAtom implements androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation> {
+    ctor public SimpleAtom(String!);
+    ctor public SimpleAtom(String!, androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement!);
+    method public final java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method protected java.util.List<java.lang.Object!>! getNonContextualArguments();
+    method public final String! getScript();
+    method protected androidx.test.espresso.web.model.Evaluation! handleBadEvaluation(androidx.test.espresso.web.model.Evaluation!);
+    method protected void handleNoElementReference();
+    method public final androidx.test.espresso.web.model.Evaluation! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public enum SimpleAtom.ElementReferencePlacement {
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement FIRST;
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement LAST;
+  }
+
+  public class TransformingAtom<I, O> implements androidx.test.espresso.web.model.Atom<O> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TransformingAtom(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public O! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public static interface TransformingAtom.Transformer<I, O> {
+    method public O! apply(I!);
+  }
+
+  public final class WindowReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+}
+
+package androidx.test.espresso.web.sugar {
+
+  public final class Web {
+    ctor public Web();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public static class Web.WebInteraction<R> {
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! check(androidx.test.espresso.web.assertion.WebAssertion<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! forceJavascriptEnabled();
+    method public R! get();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.WindowReference!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>!);
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! perform(androidx.test.espresso.web.model.Atom<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! reset();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withContextualElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.ElementReference!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withNoTimeout();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+}
+
+package androidx.test.espresso.web.webdriver {
+
+  public final class DriverAtoms {
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! clearElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! findElement(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.util.List<androidx.test.espresso.web.model.ElementReference!>!>! findMultipleElements(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getText();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! selectActiveElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webClick();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webKeys(String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.Boolean!>! webScrollIntoView();
+  }
+
+  public enum Locator {
+    method public String! getType();
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CLASS_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CSS_SELECTOR;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator ID;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator PARTIAL_LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator TAG_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator XPATH;
+  }
+
+}
+
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.6.0_internal.txt b/espresso/web/java/androidx/test/espresso/web/api/3.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.6.0_public.txt b/espresso/web/java/androidx/test/espresso/web/api/3.6.0_public.txt
new file mode 100644
index 000000000..4e296dc16
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.6.0_public.txt
@@ -0,0 +1,224 @@
+// Signature format: 3.0
+package androidx.test.espresso.web.action {
+
+  public final class AtomAction<E> implements androidx.test.espresso.remote.Bindable androidx.test.espresso.ViewAction {
+    ctor public AtomAction(androidx.test.espresso.web.model.Atom<E!>!, androidx.test.espresso.web.model.WindowReference?, androidx.test.espresso.web.model.ElementReference?);
+    method public E! get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+    method public E! get(long, java.util.concurrent.TimeUnit!) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public java.util.concurrent.Future<E!>! getFuture();
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public class EnableJavascriptAction implements androidx.test.espresso.ViewAction {
+    ctor public EnableJavascriptAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  @javax.annotation.processing.Generated("tmp_aidl_gen_path") public interface IAtomActionResultPropagator extends android.os.IInterface {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+  public abstract static class IAtomActionResultPropagator.Stub extends com.google.android.aidl.BaseStub implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Stub();
+    method public static androidx.test.espresso.web.action.IAtomActionResultPropagator! asInterface(android.os.IBinder!);
+  }
+
+  public static class IAtomActionResultPropagator.Stub.Proxy extends com.google.android.aidl.BaseProxy implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.web.assertion {
+
+  public final class TagSoupDocumentParser {
+    method public static androidx.test.espresso.web.assertion.TagSoupDocumentParser! newInstance() throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+    method public org.w3c.dom.Document! parse(String!) throws java.io.IOException, org.xml.sax.SAXException;
+  }
+
+  public abstract class WebAssertion<E> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public WebAssertion(androidx.test.espresso.web.model.Atom<E!>!);
+    method protected abstract void checkResult(android.webkit.WebView!, E!);
+    method public final androidx.test.espresso.web.model.Atom<E!>! getAtom();
+    method public final androidx.test.espresso.ViewAssertion! toViewAssertion(E!);
+  }
+
+  public final class WebViewAssertions {
+    method public static androidx.test.espresso.web.assertion.WebAssertion<org.w3c.dom.Document!>! webContent(org.hamcrest.Matcher<org.w3c.dom.Document!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E!>!);
+  }
+
+  public static interface WebViewAssertions.ResultDescriber<E> {
+    method public String! apply(E!);
+  }
+
+}
+
+package androidx.test.espresso.web.matcher {
+
+  public final class AmbiguousElementMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public AmbiguousElementMatcherException(String!);
+  }
+
+  public final class DomMatchers {
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! containingTextInBody(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementById(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementByXPath(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithId(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithXpath(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! withBody(org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.web.model {
+
+  public interface Atom<R> {
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public R! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public final class Atoms {
+    method public static <E> androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,E!>! castOrDie(Class<E!>!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getCurrentUrl();
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getTitle();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! script(String!);
+    method public static <O> androidx.test.espresso.web.model.Atom<O!>! script(String!, androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,O!>!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! scriptWithArgs(String!, java.util.List<java.lang.Object!>!);
+    method public static <I, O> androidx.test.espresso.web.model.Atom<O!>! transform(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+  }
+
+  public final class ElementReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+  public final class Evaluation implements androidx.test.espresso.web.model.JSONAble android.os.Parcelable {
+    ctor protected Evaluation(android.os.Parcel!);
+    method public int describeContents();
+    method public String! getMessage();
+    method public int getStatus();
+    method public Object? getValue();
+    method public boolean hasMessage();
+    method public void readFromParcel(android.os.Parcel!);
+    method public String! toJSONString();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.espresso.web.model.Evaluation!>! CREATOR;
+  }
+
+  public interface JSONAble {
+    method public String! toJSONString();
+  }
+
+  public static interface JSONAble.DeJSONFactory {
+    method public Object! attemptDeJSONize(java.util.Map<java.lang.String!,java.lang.Object!>!);
+  }
+
+  public final class ModelCodec {
+    method public static void addDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+    method public static androidx.test.espresso.web.model.Evaluation! decodeEvaluation(String!);
+    method public static String! encode(Object!);
+    method public static void removeDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+  }
+
+  public class SimpleAtom implements androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation> {
+    ctor public SimpleAtom(String!);
+    ctor public SimpleAtom(String!, androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement!);
+    method public final java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method protected java.util.List<java.lang.Object!>! getNonContextualArguments();
+    method public final String! getScript();
+    method protected androidx.test.espresso.web.model.Evaluation! handleBadEvaluation(androidx.test.espresso.web.model.Evaluation!);
+    method protected void handleNoElementReference();
+    method public final androidx.test.espresso.web.model.Evaluation! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public enum SimpleAtom.ElementReferencePlacement {
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement FIRST;
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement LAST;
+  }
+
+  public class TransformingAtom<I, O> implements androidx.test.espresso.web.model.Atom<O> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TransformingAtom(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public O! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public static interface TransformingAtom.Transformer<I, O> {
+    method public O! apply(I!);
+  }
+
+  public final class WindowReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+}
+
+package androidx.test.espresso.web.sugar {
+
+  public final class Web {
+    ctor public Web();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public static class Web.WebInteraction<R> {
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! check(androidx.test.espresso.web.assertion.WebAssertion<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! forceJavascriptEnabled();
+    method public R! get();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.WindowReference!);
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! perform(androidx.test.espresso.web.model.Atom<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! reset();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withContextualElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.ElementReference!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withNoTimeout();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+}
+
+package androidx.test.espresso.web.webdriver {
+
+  public final class DriverAtoms {
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! clearElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! findElement(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.util.List<androidx.test.espresso.web.model.ElementReference!>!>! findMultipleElements(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getText();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! selectActiveElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webClick();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webKeys(String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.Boolean!>! webScrollIntoView();
+  }
+
+  public enum Locator {
+    method public String! getType();
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CLASS_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CSS_SELECTOR;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator ID;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator PARTIAL_LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator TAG_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator XPATH;
+  }
+
+}
+
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.7.0_internal.txt b/espresso/web/java/androidx/test/espresso/web/api/3.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/espresso/web/java/androidx/test/espresso/web/api/3.7.0_public.txt b/espresso/web/java/androidx/test/espresso/web/api/3.7.0_public.txt
new file mode 100644
index 000000000..0e48c0abf
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/3.7.0_public.txt
@@ -0,0 +1,229 @@
+// Signature format: 3.0
+package androidx.test.espresso.web.action {
+
+  public final class AtomAction<E> implements androidx.test.espresso.remote.Bindable androidx.test.espresso.ViewAction {
+    ctor public AtomAction(androidx.test.espresso.web.model.Atom<E!>!, androidx.test.espresso.web.model.WindowReference?, androidx.test.espresso.web.model.ElementReference?);
+    method public E! get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+    method public E! get(long, java.util.concurrent.TimeUnit!) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public java.util.concurrent.Future<E!>! getFuture();
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public class EnableJavascriptAction implements androidx.test.espresso.ViewAction {
+    ctor public EnableJavascriptAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface IAtomActionResultPropagator extends android.os.IInterface {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+    field public static final String DESCRIPTOR = "androidx.test.espresso.web.action.IAtomActionResultPropagator";
+  }
+
+  public static class IAtomActionResultPropagator.Default implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Default();
+    method public android.os.IBinder! asBinder();
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+  public abstract static class IAtomActionResultPropagator.Stub extends android.os.Binder implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.espresso.web.action.IAtomActionResultPropagator! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.web.assertion {
+
+  public final class TagSoupDocumentParser {
+    method public static androidx.test.espresso.web.assertion.TagSoupDocumentParser! newInstance() throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+    method public org.w3c.dom.Document! parse(String!) throws java.io.IOException, org.xml.sax.SAXException;
+  }
+
+  public abstract class WebAssertion<E> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public WebAssertion(androidx.test.espresso.web.model.Atom<E!>!);
+    method protected abstract void checkResult(android.webkit.WebView!, E!);
+    method public final androidx.test.espresso.web.model.Atom<E!>! getAtom();
+    method public final androidx.test.espresso.ViewAssertion! toViewAssertion(E!);
+  }
+
+  public final class WebViewAssertions {
+    method public static androidx.test.espresso.web.assertion.WebAssertion<org.w3c.dom.Document!>! webContent(org.hamcrest.Matcher<org.w3c.dom.Document!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E!>! webMatches(androidx.test.espresso.web.model.Atom<E!>!, org.hamcrest.Matcher<E!>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E!>!);
+  }
+
+  public static interface WebViewAssertions.ResultDescriber<E> {
+    method public String! apply(E!);
+  }
+
+}
+
+package androidx.test.espresso.web.matcher {
+
+  public final class AmbiguousElementMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public AmbiguousElementMatcherException(String!);
+  }
+
+  public final class DomMatchers {
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! containingTextInBody(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementById(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementByXPath(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithId(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithXpath(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! withBody(org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.web.model {
+
+  public interface Atom<R> {
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public R! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public final class Atoms {
+    method public static <E> androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,E!>! castOrDie(Class<E!>!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getCurrentUrl();
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getTitle();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! script(String!);
+    method public static <O> androidx.test.espresso.web.model.Atom<O!>! script(String!, androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,O!>!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! scriptWithArgs(String!, java.util.List<java.lang.Object!>!);
+    method public static <I, O> androidx.test.espresso.web.model.Atom<O!>! transform(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+  }
+
+  public final class ElementReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+  public final class Evaluation implements androidx.test.espresso.web.model.JSONAble android.os.Parcelable {
+    ctor protected Evaluation(android.os.Parcel!);
+    method public int describeContents();
+    method public String! getMessage();
+    method public int getStatus();
+    method public Object? getValue();
+    method public boolean hasMessage();
+    method public void readFromParcel(android.os.Parcel!);
+    method public String! toJSONString();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.espresso.web.model.Evaluation!>! CREATOR;
+  }
+
+  public interface JSONAble {
+    method public String! toJSONString();
+  }
+
+  public static interface JSONAble.DeJSONFactory {
+    method public Object! attemptDeJSONize(java.util.Map<java.lang.String!,java.lang.Object!>!);
+  }
+
+  public final class ModelCodec {
+    method public static void addDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+    method public static androidx.test.espresso.web.model.Evaluation! decodeEvaluation(String!);
+    method public static String! encode(Object!);
+    method public static void removeDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+  }
+
+  public class SimpleAtom implements androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!> {
+    ctor public SimpleAtom(String!);
+    ctor public SimpleAtom(String!, androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement!);
+    method public final java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method protected java.util.List<java.lang.Object!>! getNonContextualArguments();
+    method public final String! getScript();
+    method protected androidx.test.espresso.web.model.Evaluation! handleBadEvaluation(androidx.test.espresso.web.model.Evaluation!);
+    method protected void handleNoElementReference();
+    method public final androidx.test.espresso.web.model.Evaluation! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public enum SimpleAtom.ElementReferencePlacement {
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement FIRST;
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement LAST;
+  }
+
+  public class TransformingAtom<I, O> implements androidx.test.espresso.web.model.Atom<O!> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TransformingAtom(androidx.test.espresso.web.model.Atom<I!>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I!,O!>!);
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public O! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public static interface TransformingAtom.Transformer<I, O> {
+    method public O! apply(I!);
+  }
+
+  public final class WindowReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+}
+
+package androidx.test.espresso.web.sugar {
+
+  public final class Web {
+    ctor public Web();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public static class Web.WebInteraction<R> {
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! check(androidx.test.espresso.web.assertion.WebAssertion<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! forceJavascriptEnabled();
+    method public R! get();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! inWindow(androidx.test.espresso.web.model.WindowReference!);
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E!>! perform(androidx.test.espresso.web.model.Atom<E!>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! reset();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withContextualElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withElement(androidx.test.espresso.web.model.ElementReference!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withNoTimeout();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R!>! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+}
+
+package androidx.test.espresso.web.webdriver {
+
+  public final class DriverAtoms {
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! clearElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! findElement(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.util.List<androidx.test.espresso.web.model.ElementReference!>!>! findMultipleElements(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getText();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! selectActiveElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webClick();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webKeys(String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.Boolean!>! webScrollIntoView();
+  }
+
+  public enum Locator {
+    method public String! getType();
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CLASS_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CSS_SELECTOR;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator ID;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator PARTIAL_LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator TAG_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator XPATH;
+  }
+
+}
+
diff --git a/espresso/web/java/androidx/test/espresso/web/api/current_internal.txt b/espresso/web/java/androidx/test/espresso/web/api/current_internal.txt
new file mode 100644
index 000000000..5b4098746
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/current_internal.txt
@@ -0,0 +1,24 @@
+// Signature format: 5.0
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.espresso.web.util.concurrent {
+
+  public interface AsyncFunction<I, O> {
+    method public com.google.common.util.concurrent.ListenableFuture<O> apply(I?) throws java.lang.Exception;
+  }
+
+  public interface FutureCallback<V> {
+    method public void onFailure(Throwable);
+    method public void onSuccess(V?);
+  }
+
+  public final class Futures {
+    method public static <V> void addCallback(com.google.common.util.concurrent.ListenableFuture<V>, androidx.test.espresso.web.util.concurrent.FutureCallback<? super V>, java.util.concurrent.Executor);
+    method public static <V> V? getDone(java.util.concurrent.Future<V>) throws java.util.concurrent.ExecutionException;
+    method public static <V> V? getUninterruptibly(java.util.concurrent.Future<V>) throws java.util.concurrent.ExecutionException;
+    method public static <V> com.google.common.util.concurrent.ListenableFuture<V> immediateFailedFuture(Throwable);
+    method public static <V> com.google.common.util.concurrent.ListenableFuture<V> immediateFuture(V?);
+    method public static <I, O> com.google.common.util.concurrent.ListenableFuture<O> transform(com.google.common.util.concurrent.ListenableFuture<I>, kotlin.jvm.functions.Function1<? super I,? extends O>, java.util.concurrent.Executor);
+    method public static <I, O> com.google.common.util.concurrent.ListenableFuture<O> transformAsync(com.google.common.util.concurrent.ListenableFuture<I>, androidx.test.espresso.web.util.concurrent.AsyncFunction<? super I,? extends O>, java.util.concurrent.Executor);
+  }
+
+}
+
diff --git a/espresso/web/java/androidx/test/espresso/web/api/current_public.txt b/espresso/web/java/androidx/test/espresso/web/api/current_public.txt
new file mode 100644
index 000000000..3922937a0
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/api/current_public.txt
@@ -0,0 +1,228 @@
+// Signature format: 5.0
+package androidx.test.espresso.web.action {
+
+  public final class AtomAction<E> implements androidx.test.espresso.remote.Bindable androidx.test.espresso.ViewAction {
+    ctor public AtomAction(androidx.test.espresso.web.model.Atom<E>!, androidx.test.espresso.web.model.WindowReference?, androidx.test.espresso.web.model.ElementReference?);
+    method public E get() throws java.util.concurrent.ExecutionException, java.lang.InterruptedException;
+    method public E get(long, java.util.concurrent.TimeUnit!) throws java.util.concurrent.ExecutionException, java.lang.InterruptedException, java.util.concurrent.TimeoutException;
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public java.util.concurrent.Future<E>! getFuture();
+    method public android.os.IBinder! getIBinder();
+    method public String! getId();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+    method public void setIBinder(android.os.IBinder!);
+  }
+
+  public class EnableJavascriptAction implements androidx.test.espresso.ViewAction {
+    ctor public EnableJavascriptAction();
+    method public org.hamcrest.Matcher<android.view.View!>! getConstraints();
+    method public String! getDescription();
+    method public void perform(androidx.test.espresso.UiController!, android.view.View!);
+  }
+
+  public interface IAtomActionResultPropagator extends android.os.IInterface {
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+  public static class IAtomActionResultPropagator.Default implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Default();
+    method public android.os.IBinder! asBinder();
+    method public void setError(android.os.Bundle!) throws android.os.RemoteException;
+    method public void setResult(androidx.test.espresso.web.model.Evaluation!) throws android.os.RemoteException;
+  }
+
+  public abstract static class IAtomActionResultPropagator.Stub extends android.os.Binder implements androidx.test.espresso.web.action.IAtomActionResultPropagator {
+    ctor public IAtomActionResultPropagator.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.espresso.web.action.IAtomActionResultPropagator! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.espresso.web.assertion {
+
+  public final class TagSoupDocumentParser {
+    method public static androidx.test.espresso.web.assertion.TagSoupDocumentParser! newInstance() throws org.xml.sax.SAXNotRecognizedException, org.xml.sax.SAXNotSupportedException;
+    method public org.w3c.dom.Document! parse(String!) throws java.io.IOException, org.xml.sax.SAXException;
+  }
+
+  public abstract class WebAssertion<E> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public WebAssertion(androidx.test.espresso.web.model.Atom<E>!);
+    method protected abstract void checkResult(android.webkit.WebView!, E);
+    method public final androidx.test.espresso.web.model.Atom<E>! getAtom();
+    method public final androidx.test.espresso.ViewAssertion! toViewAssertion(E);
+  }
+
+  public final class WebViewAssertions {
+    method public static androidx.test.espresso.web.assertion.WebAssertion<org.w3c.dom.Document!>! webContent(org.hamcrest.Matcher<org.w3c.dom.Document!>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E>! webMatches(androidx.test.espresso.web.model.Atom<E>!, org.hamcrest.Matcher<E>!);
+    method public static <E> androidx.test.espresso.web.assertion.WebAssertion<E>! webMatches(androidx.test.espresso.web.model.Atom<E>!, org.hamcrest.Matcher<E>!, androidx.test.espresso.web.assertion.WebViewAssertions.ResultDescriber<? super E>!);
+  }
+
+  public static interface WebViewAssertions.ResultDescriber<E> {
+    method public String! apply(E);
+  }
+
+}
+
+package androidx.test.espresso.web.matcher {
+
+  public final class AmbiguousElementMatcherException extends java.lang.RuntimeException implements androidx.test.espresso.EspressoException {
+    ctor public AmbiguousElementMatcherException(String!);
+  }
+
+  public final class DomMatchers {
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! containingTextInBody(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementById(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! elementByXPath(String!, org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithId(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! hasElementWithXpath(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Document!>! withBody(org.hamcrest.Matcher<org.w3c.dom.Element!>!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(String!);
+    method public static org.hamcrest.Matcher<org.w3c.dom.Element!>! withTextContent(org.hamcrest.Matcher<java.lang.String!>!);
+  }
+
+}
+
+package androidx.test.espresso.web.model {
+
+  public interface Atom<R> {
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public R transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public final class Atoms {
+    method public static <E> androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,E>! castOrDie(Class<E>!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getCurrentUrl();
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getTitle();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! script(String!);
+    method public static <O> androidx.test.espresso.web.model.Atom<O>! script(String!, androidx.test.espresso.web.model.TransformingAtom.Transformer<androidx.test.espresso.web.model.Evaluation!,O>!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! scriptWithArgs(String!, java.util.List<java.lang.Object!>!);
+    method public static <I, O> androidx.test.espresso.web.model.Atom<O>! transform(androidx.test.espresso.web.model.Atom<I>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I,O>!);
+  }
+
+  public final class ElementReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+  public final class Evaluation implements androidx.test.espresso.web.model.JSONAble android.os.Parcelable {
+    ctor protected Evaluation(android.os.Parcel!);
+    method public int describeContents();
+    method public String! getMessage();
+    method public int getStatus();
+    method public Object? getValue();
+    method public boolean hasMessage();
+    method public void readFromParcel(android.os.Parcel!);
+    method public String! toJSONString();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.espresso.web.model.Evaluation!>! CREATOR;
+  }
+
+  public interface JSONAble {
+    method public String! toJSONString();
+  }
+
+  public static interface JSONAble.DeJSONFactory {
+    method public Object! attemptDeJSONize(java.util.Map<java.lang.String!,java.lang.Object!>!);
+  }
+
+  public final class ModelCodec {
+    method public static void addDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+    method public static androidx.test.espresso.web.model.Evaluation! decodeEvaluation(String!);
+    method public static String! encode(Object!);
+    method public static void removeDeJSONFactory(androidx.test.espresso.web.model.JSONAble.DeJSONFactory!);
+  }
+
+  public class SimpleAtom implements androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!> {
+    ctor public SimpleAtom(String!);
+    ctor public SimpleAtom(String!, androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement!);
+    method public final java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method protected java.util.List<java.lang.Object!>! getNonContextualArguments();
+    method public final String! getScript();
+    method protected androidx.test.espresso.web.model.Evaluation! handleBadEvaluation(androidx.test.espresso.web.model.Evaluation!);
+    method protected void handleNoElementReference();
+    method public final androidx.test.espresso.web.model.Evaluation! transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public enum SimpleAtom.ElementReferencePlacement {
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement FIRST;
+    enum_constant public static final androidx.test.espresso.web.model.SimpleAtom.ElementReferencePlacement LAST;
+  }
+
+  public class TransformingAtom<I, O> implements androidx.test.espresso.web.model.Atom<O> {
+    ctor @androidx.test.espresso.remote.annotation.RemoteMsgConstructor public TransformingAtom(androidx.test.espresso.web.model.Atom<I>!, androidx.test.espresso.web.model.TransformingAtom.Transformer<I,O>!);
+    method public java.util.List<java.lang.Object!>! getArguments(androidx.test.espresso.web.model.ElementReference?);
+    method public String! getScript();
+    method public O transform(androidx.test.espresso.web.model.Evaluation!);
+  }
+
+  public static interface TransformingAtom.Transformer<I, O> {
+    method public O apply(I);
+  }
+
+  public final class WindowReference implements androidx.test.espresso.web.model.JSONAble {
+    method public String! toJSONString();
+  }
+
+}
+
+package androidx.test.espresso.web.sugar {
+
+  public final class Web {
+    ctor public Web();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView();
+    method public static androidx.test.espresso.web.sugar.Web.WebInteraction<java.lang.Void!>! onWebView(org.hamcrest.Matcher<android.view.View!>!);
+  }
+
+  public static class Web.WebInteraction<R> {
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E>! check(androidx.test.espresso.web.assertion.WebAssertion<E>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! forceJavascriptEnabled();
+    method public R get();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! inWindow(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! inWindow(androidx.test.espresso.web.model.WindowReference!);
+    method public <E> androidx.test.espresso.web.sugar.Web.WebInteraction<E>! perform(androidx.test.espresso.web.model.Atom<E>!);
+    method public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! reset();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! withContextualElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! withElement(androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! withElement(androidx.test.espresso.web.model.ElementReference!);
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! withNoTimeout();
+    method @CheckResult @javax.annotation.CheckReturnValue public androidx.test.espresso.web.sugar.Web.WebInteraction<R>! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+}
+
+package androidx.test.espresso.web.webdriver {
+
+  public final class DriverAtoms {
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! clearElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! findElement(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.util.List<androidx.test.espresso.web.model.ElementReference!>!>! findMultipleElements(androidx.test.espresso.web.webdriver.Locator!, String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.String!>! getText();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.ElementReference!>! selectActiveElement();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIdOrName(String!, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.WindowReference!>! selectFrameByIndex(int, androidx.test.espresso.web.model.WindowReference!);
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webClick();
+    method public static androidx.test.espresso.web.model.Atom<androidx.test.espresso.web.model.Evaluation!>! webKeys(String!);
+    method public static androidx.test.espresso.web.model.Atom<java.lang.Boolean!>! webScrollIntoView();
+  }
+
+  public enum Locator {
+    method public String! getType();
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CLASS_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator CSS_SELECTOR;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator ID;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator PARTIAL_LINK_TEXT;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator TAG_NAME;
+    enum_constant public static final androidx.test.espresso.web.webdriver.Locator XPATH;
+  }
+
+}
+
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/BUILD b/espresso/web/java/androidx/test/espresso/web/assertion/BUILD
new file mode 100644
index 000000000..39a2da0ba
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/assertion/BUILD
@@ -0,0 +1,31 @@
+# Description:
+#   Espresso Web Assertion
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "assertion",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:framework",
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:org_ccil_cowan_tagsoup_tagsoup",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/assertion/BUILD.bazel
deleted file mode 100644
index 87ba7f759..000000000
--- a/espresso/web/java/androidx/test/espresso/web/assertion/BUILD.bazel
+++ /dev/null
@@ -1,56 +0,0 @@
-# Espresso Web Assertion
-
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = ["//visibility:public"])
-
-REMOTE_WEB_ASSERTIONS = [
-    "RemoteWebViewAssertions.java",
-    "CheckResultWebAssertionRemoteMessage.java",
-    "DocumentProtoConverters.java",
-    "DocumentToByteStringConverter.java",
-    "ByteStringToDocumentConverter.java",
-    "DocumentToByteStringConverter.java",
-    "CompressorDecompressor.java",
-]
-
-android_library(
-    name = "assertion",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_WEB_ASSERTIONS,
-    ),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/web/java/androidx/test/espresso/web/action",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_ccil_cowan_tagsoup_tagsoup",
-    ],
-)
-
-android_library(
-    name = "remote_web_assertions",
-    srcs = glob(
-        REMOTE_WEB_ASSERTIONS,
-    ),
-    deps = [
-        ":assertion",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/web/java/androidx/test/espresso/web/proto/assertion:web_assertions_proto_android_pb3",
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-    ],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/TagSoupDocumentParser.java b/espresso/web/java/androidx/test/espresso/web/assertion/TagSoupDocumentParser.java
index b056e712a..20cc6032b 100644
--- a/espresso/web/java/androidx/test/espresso/web/assertion/TagSoupDocumentParser.java
+++ b/espresso/web/java/androidx/test/espresso/web/assertion/TagSoupDocumentParser.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.web.assertion;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import java.io.IOException;
 import java.io.StringBufferInputStream;
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/WebAssertion.java b/espresso/web/java/androidx/test/espresso/web/assertion/WebAssertion.java
index f8146fa76..7311e59a4 100644
--- a/espresso/web/java/androidx/test/espresso/web/assertion/WebAssertion.java
+++ b/espresso/web/java/androidx/test/espresso/web/assertion/WebAssertion.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.web.assertion;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.view.View;
 import android.webkit.WebView;
diff --git a/espresso/web/java/androidx/test/espresso/web/assertion/WebViewAssertions.java b/espresso/web/java/androidx/test/espresso/web/assertion/WebViewAssertions.java
index dcd22ec58..76d4a63e3 100644
--- a/espresso/web/java/androidx/test/espresso/web/assertion/WebViewAssertions.java
+++ b/espresso/web/java/androidx/test/espresso/web/assertion/WebViewAssertions.java
@@ -19,7 +19,7 @@
 import static androidx.test.espresso.matcher.ViewMatchers.assertThat;
 import static androidx.test.espresso.web.model.Atoms.script;
 import static androidx.test.espresso.web.model.Atoms.transform;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.webkit.WebView;
 import androidx.annotation.VisibleForTesting;
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/AndroidManifest.xml b/espresso/web/java/androidx/test/espresso/web/bridge/AndroidManifest.xml
new file mode 100644
index 000000000..c160ad37a
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="androidx.test.espresso.web.bridge" >
+
+</manifest>
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/BUILD b/espresso/web/java/androidx/test/espresso/web/bridge/BUILD
new file mode 100644
index 000000000..339876565
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/BUILD
@@ -0,0 +1,32 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+# Description:
+#   JavaScript to Java bridging
+package_group(
+    name = "internal",
+    packages = [
+        "//espresso/web/...",
+    ],
+)
+
+android_library(
+    name = "bridge",
+    srcs = glob(
+        ["*java"],
+    ),
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    visibility = [":internal"],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:androidx_concurrent_concurrent_futures",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/Conduit.java b/espresso/web/java/androidx/test/espresso/web/bridge/Conduit.java
new file mode 100644
index 000000000..2f5bb6ab1
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/Conduit.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.bridge;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import androidx.concurrent.futures.ResolvableFuture;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+
+/**
+ * A mechanism to get results out of a Javascript context and into a Java context.
+ *
+ * <p>Users can get instances of this class via JavaScriptBridge.makeConduit(). Each conduit can be
+ * used once (and only once) to transmit results. Before evaluating javascript via a loadUrl call
+ * the caller should call wrapScriptInConduit with the script to be evaluated. The script is wrapped
+ * up into an additional handler statement which forwards the result of the script to the
+ * JavaScriptBridge object. After calling loadUrl the caller can use the getResult method to get a
+ * Future which will contain the result of the javascript execution.
+ */
+public final class Conduit {
+  private final String bridgeName;
+  private final String errorMethod;
+  private final String successMethod;
+  private final String token;
+  private final ResolvableFuture<String> jsResult;
+
+  private Conduit(Builder builder) {
+    this.bridgeName = checkNotNull(builder.bridgeName);
+    this.errorMethod = checkNotNull(builder.errorMethod);
+    this.successMethod = checkNotNull(builder.successMethod);
+    this.token = checkNotNull(builder.token);
+    this.jsResult = checkNotNull(builder.jsResult);
+  }
+
+  /**
+   * Takes Javascript code and wraps it within a statement that will pipe the results of
+   * evaluation to the ListenableFuture this conduit holds.
+   */
+  public String wrapScriptInConduit(String script) {
+    checkNotNull(script);
+    return wrapScriptInConduit(new StringBuilder(script)).toString();
+  }
+
+  /**
+   * Wraps a script within additional javascript code that will allow the function to
+   * return its results back thru this conduit.
+   *
+   * @param script the buffer holding the script, it will be modified in place.
+   * @return the StringBuilder passed in.
+   */
+  public StringBuilder wrapScriptInConduit(StringBuilder script) {
+    String preamble = "try{" +
+        "window." + bridgeName + "." + successMethod + "('" + token + "', ";
+    script.insert(0, preamble)
+        .append(");")
+        .append("}catch(e){")
+        .append("window.").append(bridgeName).append(".").append(errorMethod)
+        .append("('").append(token).append("', 'error!');}");
+    return script;
+  }
+
+  /**
+   * The future that will be resolved when the Javascript evaluation completes.
+   */
+  public ListenableFuture<String> getResult() {
+    return jsResult;
+  }
+
+  /** Allows JavascriptBoundBridge to set the result of javascript execution. */
+  ResolvableFuture<String> internalGetResult() {
+    return jsResult;
+  }
+
+  String getToken() {
+    return token;
+  }
+
+  static class Builder {
+    private String bridgeName;
+    private String errorMethod;
+    private String successMethod;
+    private String token;
+    private ResolvableFuture<String> jsResult;
+
+    @CanIgnoreReturnValue
+    public Builder withBridgeName(String bridgeName) {
+      this.bridgeName = checkNotNull(bridgeName);
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public Builder withErrorMethod(String errorMethod) {
+      this.errorMethod = checkNotNull(errorMethod);
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public Builder withSuccessMethod(String successMethod) {
+      this.successMethod = checkNotNull(successMethod);
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public Builder withToken(String token) {
+      this.token = checkNotNull(token);
+      return this;
+    }
+
+    @CanIgnoreReturnValue
+    public Builder withJsResult(ResolvableFuture<String> jsResult) {
+      this.jsResult = checkNotNull(jsResult);
+      return this;
+    }
+
+    public Conduit build() {
+      return new Conduit(this);
+    }
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/JavaScriptBoundBridge.java b/espresso/web/java/androidx/test/espresso/web/bridge/JavaScriptBoundBridge.java
new file mode 100644
index 000000000..3cd52ed21
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/JavaScriptBoundBridge.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.bridge;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import android.util.Log;
+import android.webkit.JavascriptInterface;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The actual class injected as a JavascriptInterface in every web view.
+ */
+final class JavaScriptBoundBridge {
+  private static final String TAG = "JS_BRIDGE";
+  private final List<Conduit> conduits = new ArrayList<>();
+
+  void addConduit(Conduit conduit) {
+    checkNotNull(conduit);
+    synchronized (conduits) {
+      conduits.add(conduit);
+    }
+  }
+
+  /**
+   * Called via javascript with the results of some computation.
+   */
+  @JavascriptInterface
+  public void setResult(String token, String result) {
+    Log.d(TAG, "Token: " + token + " result: " + result);
+    synchronized (conduits) {
+      for (int i = 0; i < conduits.size(); i++) {
+        Conduit conduit = conduits.get(i);
+        if (conduit.getToken().equals(token)) {
+          conduit.internalGetResult().set(result);
+          conduits.remove(i);
+          return;
+        }
+      }
+    }
+    Log.e(TAG, "UFO result received - token: " + token + " message: " + result);
+  }
+
+  @JavascriptInterface
+  public void setError(String token, String error) {
+    Log.d(TAG, "Token: " + token + " result: " + error);
+    synchronized (conduits) {
+      for (int i = 0; i < conduits.size(); i++) {
+        Conduit conduit = conduits.get(i);
+        if (conduit.getToken().equals(token)) {
+          conduit.internalGetResult().setException(new RuntimeException(error));
+          conduits.remove(i);
+          return;
+        }
+      }
+    }
+    Log.e(TAG, "UFO error received - token: " + token + " message: " + error);
+  }
+
+  @JavascriptInterface
+  public void log_i(String tag, String message) {
+    Log.i(tag, message);
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/JavaScriptBridge.java b/espresso/web/java/androidx/test/espresso/web/bridge/JavaScriptBridge.java
new file mode 100644
index 000000000..61f8f01ab
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/JavaScriptBridge.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2015 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.bridge;
+
+import static androidx.test.internal.util.Checks.checkState;
+
+import androidx.concurrent.futures.ResolvableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Provides a gateway for Java and Javascript code to communicate to eachother.
+ */
+public final class JavaScriptBridge {
+  private static final AtomicInteger tokenGenerator = new AtomicInteger(0);
+  static final String TAG = "JS_BRIDGE";
+  static final String JS_BRIDGE_NAME = "__g_wd_jsb";
+
+  private static volatile boolean initialized = false;
+  private static JavaScriptBoundBridge boundBridge;
+
+  /**
+   * Creates a Conduit object which allows Java to wrap Javascript code within a handler that will
+   * forward evaluation results back to the Java process.
+   *
+   * <p>Conduits can be used for only 1 evaluation. Creating new ones is relatively cheap.
+   */
+  public static Conduit makeConduit() {
+    checkState(initialized, "Install bridge not called!");
+    checkState(null != boundBridge, "Bridge not configured; chromium webviews do not need bridge");
+    Conduit conduit =
+        new Conduit.Builder()
+            .withBridgeName(JS_BRIDGE_NAME)
+            .withToken(String.valueOf(tokenGenerator.incrementAndGet()))
+            .withSuccessMethod("setResult")
+            .withErrorMethod("setError")
+            .withJsResult(ResolvableFuture.<String>create())
+            .build();
+    boundBridge.addConduit(conduit);
+    return conduit;
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/bridge/package-info.java b/espresso/web/java/androidx/test/espresso/web/bridge/package-info.java
new file mode 100644
index 000000000..b8ee8c183
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/bridge/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.espresso.web.bridge;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/espresso/web/java/androidx/test/espresso/web/matcher/BUILD b/espresso/web/java/androidx/test/espresso/web/matcher/BUILD
new file mode 100644
index 000000000..392231cbc
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/matcher/BUILD
@@ -0,0 +1,30 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "matcher",
+    srcs = glob(
+        ["*.java"],
+    ),
+    exports = [
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso:interface",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/web/java/androidx/test/espresso/web/bridge",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/matcher/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/matcher/BUILD.bazel
deleted file mode 100644
index 751bd7731..000000000
--- a/espresso/web/java/androidx/test/espresso/web/matcher/BUILD.bazel
+++ /dev/null
@@ -1,40 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache License 2.0
-
-REMOTE_WEB_MATCHERS = [
-    "RemoteWebMatchers.java",
-]
-
-android_library(
-    name = "matcher",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_WEB_MATCHERS,
-    ),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//opensource/java_lib:webbridge",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_library(
-    name = "remote_web_matchers",
-    srcs = glob(
-        REMOTE_WEB_MATCHERS,
-    ),
-    deps = [
-        ":matcher",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/web/java/androidx/test/espresso/web/proto/matcher:remote_web_matchers_proto_android_pb3",
-    ],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/matcher/DomMatchers.java b/espresso/web/java/androidx/test/espresso/web/matcher/DomMatchers.java
index 71caad5f6..fc23ee534 100644
--- a/espresso/web/java/androidx/test/espresso/web/matcher/DomMatchers.java
+++ b/espresso/web/java/androidx/test/espresso/web/matcher/DomMatchers.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.web.matcher;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 
diff --git a/espresso/web/java/androidx/test/espresso/web/model/Atom.java b/espresso/web/java/androidx/test/espresso/web/model/Atom.java
index 9d7cd9ae5..c02a63d35 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/Atom.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/Atom.java
@@ -16,8 +16,8 @@
 
 package androidx.test.espresso.web.model;
 
+import androidx.annotation.Nullable;
 import java.util.List;
-import javax.annotation.Nullable;
 
 /**
  * An Atom is a thin wrapper around javascript.
diff --git a/espresso/web/java/androidx/test/espresso/web/model/Atoms.java b/espresso/web/java/androidx/test/espresso/web/model/Atoms.java
index 4a316a2fb..b5c5b182d 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/Atoms.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/Atoms.java
@@ -16,12 +16,12 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.Collections.emptyList;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
-import com.google.common.collect.Lists;
 import java.util.List;
 
 /** Utility class wrapping simple and more commonly used atoms. */
@@ -53,7 +53,7 @@ public static <E> TransformingAtom.Transformer<Evaluation, E> castOrDie(final Cl
 
   /** Creates an atom that will execute the provided script and return an evaluation object. */
   public static Atom<Evaluation> script(String script) {
-    return new ScriptWithArgsSimpleAtom(script, Lists.newArrayList());
+    return new ScriptWithArgsSimpleAtom(script, emptyList());
   }
 
   /** Returns the value of document.location.href. */
diff --git a/espresso/web/java/androidx/test/espresso/web/model/BUILD b/espresso/web/java/androidx/test/espresso/web/model/BUILD
new file mode 100644
index 000000000..9ca9bf363
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/model/BUILD
@@ -0,0 +1,28 @@
+# Description:
+#   Encoder/Decoders for WebView / JSON.
+#   Atom interface for wrapping javascripts.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "model",
+    srcs = glob(
+        ["*.java"],
+    ),
+    custom_package = "androidx.test.espresso.web.model",
+    idl_import_root = "idls",
+    idl_parcelables = glob(["idls/**"]),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/model/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/model/BUILD.bazel
deleted file mode 100644
index 45fa38a1e..000000000
--- a/espresso/web/java/androidx/test/espresso/web/model/BUILD.bazel
+++ /dev/null
@@ -1,48 +0,0 @@
-# Encoder/Decoders for WebView / JSON.
-# Atom interface for wrapping javascripts.
-
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache License 2.0
-
-REMOTE_WEB_MODEL_ATOMS = [
-    "RemoteWebModelAtoms.java",
-    "ScriptWithArgsSimpleAtomRemoteMessage.java",
-]
-
-android_library(
-    name = "model",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_WEB_MODEL_ATOMS,
-    ),
-    custom_package = "androidx.test.espresso.web.model",
-    idl_import_root = "idls",
-    idl_parcelables = glob(["idls/**"]),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
-)
-
-android_library(
-    name = "remote_web_model_atoms",
-    srcs = glob(
-        REMOTE_WEB_MODEL_ATOMS,
-    ),
-    deps = [
-        ":model",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/web/java/androidx/test/espresso/web/proto/model:remote_web_model_atoms_proto_android_pb3",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-    ],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/model/ElementReference.java b/espresso/web/java/androidx/test/espresso/web/model/ElementReference.java
index aa2c014be..d2ec54c71 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/ElementReference.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/ElementReference.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
diff --git a/espresso/web/java/androidx/test/espresso/web/model/Evaluation.java b/espresso/web/java/androidx/test/espresso/web/model/Evaluation.java
index a01a1d1d1..172533dec 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/Evaluation.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/Evaluation.java
@@ -16,14 +16,15 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkState;
 
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
-import com.google.common.base.Objects;
+import androidx.annotation.Nullable;
+import java.util.Locale;
 import java.util.Map;
-import javax.annotation.Nullable;
+import java.util.Objects;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONStringer;
@@ -53,7 +54,7 @@ protected Evaluation(Parcel in) {
 
   @Override
   public int hashCode() {
-    return Objects.hashCode(status, value, hasMessage, message);
+    return Objects.hash(status, value, hasMessage, message);
   }
 
   @Override
@@ -151,8 +152,12 @@ public Object attemptDeJSONize(Map<String, Object> map) {
   @Override
   public String toString() {
     return String.format(
+        Locale.US,
         "Evaluation: status: %d value: %s hasMessage: %s message: %s",
-        status, value, hasMessage, message);
+        status,
+        value,
+        hasMessage,
+        message);
   }
 
   @Override
diff --git a/espresso/web/java/androidx/test/espresso/web/model/ModelCodec.java b/espresso/web/java/androidx/test/espresso/web/model/ModelCodec.java
index e0d8eff10..9fb221dec 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/ModelCodec.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/ModelCodec.java
@@ -16,21 +16,22 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+import static java.util.Collections.unmodifiableSet;
 
-import android.os.Build;
 import android.util.JsonReader;
 import android.util.Log;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import java.io.IOException;
 import java.io.StringReader;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -39,27 +40,31 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.json.JSONStringer;
-import org.json.JSONTokener;
 
 /** Encodes/Decodes JSON. */
 public final class ModelCodec {
   private static final String TAG = "JS_CODEC";
 
-  private static final ImmutableSet<Class<?>> VALUEABLE_CLASSES =
-      ImmutableSet.of(Boolean.class, Number.class, String.class, JSONObject.class, JSONArray.class);
+  private static final Set<Class<?>> VALUEABLE_CLASSES =
+      unmodifiableSet(
+          new LinkedHashSet<>(
+              Arrays.asList(
+                  Boolean.class, Number.class, String.class, JSONObject.class, JSONArray.class)));
 
-  private static final ImmutableSet<Class<?>> TOP_LEVEL_CLASSES =
-      ImmutableSet.of(
-          JSONObject.class,
-          JSONArray.class,
-          Iterable.class,
-          Object[].class,
-          Map.class,
-          JSONAble.class);
+  private static final Set<Class<?>> TOP_LEVEL_CLASSES =
+      unmodifiableSet(
+          new LinkedHashSet<>(
+              Arrays.asList(
+                  JSONObject.class,
+                  JSONArray.class,
+                  Iterable.class,
+                  Object[].class,
+                  Map.class,
+                  JSONAble.class)));
 
   private static final CopyOnWriteArrayList<JSONAble.DeJSONFactory> DEJSONIZERS =
-      new CopyOnWriteArrayList<JSONAble.DeJSONFactory>(
-          Lists.newArrayList(
+      new CopyOnWriteArrayList<>(
+          Arrays.asList(
               Evaluation.DEJSONIZER, WindowReference.DEJSONIZER, ElementReference.DEJSONIZER));
 
   private ModelCodec() {}
@@ -118,33 +123,14 @@ static Object decode(String json) {
     checkArgument(!"".equals(json), "Empty docs not supported.");
 
     try {
-      if (Build.VERSION.SDK_INT < 13) {
-        // After API 13, there is the JSONReader API - which is nicer to work with.
-        return decodeViaJSONObject(json);
-      } else {
-        return decodeViaJSONReader(json);
-      }
-    } catch (JSONException je) {
-      throw new RuntimeException(String.format("Could not parse: %s", json), je);
+      return decodeViaJSONReader(json);
     } catch (IOException ioe) {
       throw new RuntimeException(String.format("Could not parse: %s", json), ioe);
     }
   }
 
-  private static Object decodeViaJSONObject(String json) throws JSONException {
-    JSONTokener tokener = new JSONTokener(json);
-    Object value = tokener.nextValue();
-    if (value instanceof JSONArray) {
-      return decodeArray((JSONArray) value);
-    } else if (value instanceof JSONObject) {
-      return decodeObject((JSONObject) value);
-    } else {
-      throw new IllegalArgumentException("No top level object or array: " + json);
-    }
-  }
-
   private static List<Object> decodeArray(JSONArray array) throws JSONException {
-    List<Object> data = Lists.newArrayList();
+    List<Object> data = new ArrayList<>();
     for (int i = 0; i < array.length(); i++) {
       if (array.isNull(i)) {
         data.add(null);
@@ -164,8 +150,8 @@ private static List<Object> decodeArray(JSONArray array) throws JSONException {
   }
 
   private static Object decodeObject(JSONObject jsonObject) throws JSONException {
-    List<String> nullKeys = Lists.newArrayList();
-    Map<String, Object> obj = Maps.newHashMap();
+    List<String> nullKeys = new ArrayList<>();
+    Map<String, Object> obj = new LinkedHashMap<>();
     Iterator<String> keys = jsonObject.keys();
     while (keys.hasNext()) {
       String key = keys.next();
@@ -222,7 +208,7 @@ private static Object decodeViaJSONReader(String json) throws IOException {
   }
 
   private static List<Object> decodeArray(JsonReader reader) throws IOException {
-    List<Object> array = Lists.newArrayList();
+    List<Object> array = new ArrayList<>();
     reader.beginArray();
     while (reader.hasNext()) {
       switch (reader.peek()) {
@@ -275,8 +261,8 @@ private static Number decodeNumber(String value) {
   }
 
   private static Object decodeObject(JsonReader reader) throws IOException {
-    Map<String, Object> obj = Maps.newHashMap();
-    List<String> nullKeys = Lists.newArrayList();
+    Map<String, Object> obj = new LinkedHashMap<>();
+    List<String> nullKeys = new ArrayList<>();
     reader.beginObject();
     while (reader.hasNext()) {
       String key = reader.nextName();
diff --git a/espresso/web/java/androidx/test/espresso/web/model/SimpleAtom.java b/espresso/web/java/androidx/test/espresso/web/model/SimpleAtom.java
index cf23701d7..8991957ee 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/SimpleAtom.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/SimpleAtom.java
@@ -16,12 +16,12 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
+import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import javax.annotation.Nullable;
 
 /** A simple implementation of Atom suitable for subclassing. */
 public class SimpleAtom implements Atom<Evaluation> {
diff --git a/espresso/web/java/androidx/test/espresso/web/model/TransformingAtom.java b/espresso/web/java/androidx/test/espresso/web/model/TransformingAtom.java
index a25ec4633..0546789df 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/TransformingAtom.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/TransformingAtom.java
@@ -16,12 +16,12 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
+import androidx.annotation.Nullable;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
 import java.util.List;
-import javax.annotation.Nullable;
 
 /**
  * Decorates another atom and transforms its output to another type.
diff --git a/espresso/web/java/androidx/test/espresso/web/model/WindowReference.java b/espresso/web/java/androidx/test/espresso/web/model/WindowReference.java
index 98bf5ba2d..a5a69babd 100644
--- a/espresso/web/java/androidx/test/espresso/web/model/WindowReference.java
+++ b/espresso/web/java/androidx/test/espresso/web/model/WindowReference.java
@@ -16,7 +16,7 @@
 
 package androidx.test.espresso.web.model;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
 import androidx.test.espresso.remote.annotation.RemoteMsgField;
diff --git a/espresso/web/java/androidx/test/espresso/web/proguard_binary.cfg b/espresso/web/java/androidx/test/espresso/web/proguard_binary.cfg
deleted file mode 100644
index 1560f80da..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proguard_binary.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# JavaScriptBridge#installBridge called via reflection
--keep class com.google.android.apps.common.testing.testrunner.web.** { *; }
-
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/action/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/proto/action/BUILD.bazel
deleted file mode 100644
index a64e9e7ae..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proto/action/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote web actions
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-        "//espresso/web/java/androidx/test/espresso/web/action:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "web_actions_proto",
-    srcs = ["web_actions.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "web_actions_proto_android_pb3",
-    deps = [":web_actions_proto"],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/assertion/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/proto/assertion/BUILD.bazel
deleted file mode 100644
index 504ec24fa..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proto/assertion/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote web assertions
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-        "//espresso/web/java/androidx/test/espresso/web/assertion:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "web_assertions_proto",
-    srcs = ["web_assertions.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "web_assertions_proto_android_pb3",
-    deps = [":web_assertions_proto"],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/matcher/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/proto/matcher/BUILD.bazel
deleted file mode 100644
index 9ebdb198f..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proto/matcher/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote web matchers
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-        "//espresso/web/java/androidx/test/espresso/web/matcher:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "remote_web_matchers_proto",
-    srcs = ["remote_web_matchers.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "remote_web_matchers_proto_android_pb3",
-    deps = [":remote_web_matchers_proto"],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/model/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/proto/model/BUILD.bazel
deleted file mode 100644
index 0011433ae..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proto/model/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote web model atoms
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-        "//espresso/web/java/androidx/test/espresso/web/model:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "remote_web_model_atoms_proto",
-    srcs = ["web_model_atoms.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "remote_web_model_atoms_proto_android_pb3",
-    deps = [":remote_web_model_atoms_proto"],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/sugar/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/proto/sugar/BUILD.bazel
deleted file mode 100644
index 29a7b53ff..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proto/sugar/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote web sugar atoms
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-        "//espresso/web/java/androidx/test/espresso/web/sugar:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "web_sugar_proto",
-    srcs = ["web_sugar.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "web_sugar_proto_android_pb3",
-    deps = [":web_sugar_proto"],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/proto/webdriver/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/proto/webdriver/BUILD.bazel
deleted file mode 100644
index b796c2bde..000000000
--- a/espresso/web/java/androidx/test/espresso/web/proto/webdriver/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Protocol buffer definitions for remote web driver atoms
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-        "//espresso/web/java/androidx/test/espresso/web/webdriver:__pkg__",
-    ],
-)
-
-proto_library(
-    name = "web_driver_atoms_proto",
-    srcs = ["web_webdriver_atoms.proto"],
-    deps = [
-        "@com_google_protobuf//:any_proto",
-    ],
-)
-
-java_lite_proto_library(
-    name = "web_driver_atoms_proto_android_pb3",
-    deps = [":web_driver_atoms_proto"],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/release_jarjar_rules.txt b/espresso/web/java/androidx/test/espresso/web/release_jarjar_rules.txt
deleted file mode 100644
index 78c16cced..000000000
--- a/espresso/web/java/androidx/test/espresso/web/release_jarjar_rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# rename guava classes into espresso.web namespace to avoid conflicts
-rule com.google.common.** androidx.test.espresso.web.internal.deps.guava.@1
-rule com.google.thirdparty.publicsuffix.** androidx.test.espresso.web.internal.deps.publicsuffix.@1
-rule com.google.android.aidl.** androidx.test.espresso.web.internal.deps.aidl.@1
-rule com.google.android.apps.common.testing.testrunner.web.** androidx.test.espresso.web.bridge.@1
diff --git a/espresso/web/java/androidx/test/espresso/web/sugar/BUILD b/espresso/web/java/androidx/test/espresso/web/sugar/BUILD
new file mode 100644
index 000000000..c337f19d1
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/sugar/BUILD
@@ -0,0 +1,29 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+android_library(
+    name = "sugar",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/matcher",
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/sugar/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/sugar/BUILD.bazel
deleted file mode 100644
index d549b4d1b..000000000
--- a/espresso/web/java/androidx/test/espresso/web/sugar/BUILD.bazel
+++ /dev/null
@@ -1,46 +0,0 @@
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = ["//visibility:public"])
-
-REMOTE_SUGAR = [
-    "RemoteWebSugar.java",
-]
-
-android_library(
-    name = "sugar",
-    srcs = glob(
-        ["*.java"],
-        exclude = REMOTE_SUGAR,
-    ),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/web/java/androidx/test/espresso/web/action",
-        "//espresso/web/java/androidx/test/espresso/web/assertion",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_guava_guava",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
-)
-
-android_library(
-    name = "remote_sugar",
-    srcs = glob(
-        REMOTE_SUGAR,
-    ),
-    deps = [
-        ":sugar",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/web/java/androidx/test/espresso/web/proto/sugar:web_sugar_proto_android_pb3",
-        "@maven//:com_google_guava_guava",
-    ],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/sugar/Web.java b/espresso/web/java/androidx/test/espresso/web/sugar/Web.java
index ea1ad8904..e597d40ba 100644
--- a/espresso/web/java/androidx/test/espresso/web/sugar/Web.java
+++ b/espresso/web/java/androidx/test/espresso/web/sugar/Web.java
@@ -18,13 +18,14 @@
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.matcher.ViewMatchers.isJavascriptEnabled;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
+import static androidx.test.internal.util.Checks.checkArgument;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
 import static org.hamcrest.Matchers.any;
 
 import android.view.View;
 import androidx.annotation.CheckResult;
+import androidx.annotation.Nullable;
 import androidx.test.espresso.UiController;
 import androidx.test.espresso.ViewAction;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
@@ -36,7 +37,6 @@
 import androidx.test.espresso.web.model.ElementReference;
 import androidx.test.espresso.web.model.WindowReference;
 import androidx.test.internal.platform.util.TestOutputEmitter;
-import androidx.test.internal.runner.tracker.UsageTrackerRegistry.AxtVersions;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
@@ -44,7 +44,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import javax.annotation.CheckReturnValue;
-import javax.annotation.Nullable;
 import org.hamcrest.Matcher;
 
 /**
@@ -63,7 +62,7 @@ public final class Web {
   static {
     // Also adds the usage data as test output properties. By default it's no-op.
     Map<String, Serializable> usageProperties = new HashMap<>();
-    usageProperties.put("Espresso-Web", AxtVersions.ESPRESSO_VERSION);
+    usageProperties.put("Espresso-Web", "1");
     TestOutputEmitter.addOutputProperties(usageProperties);
   }
 
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/AbstractFuture.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/AbstractFuture.java
new file mode 100644
index 000000000..a7c752042
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/AbstractFuture.java
@@ -0,0 +1,1165 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.concurrent.atomic.AtomicReferenceFieldUpdater.newUpdater;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.test.platform.concurrent.DirectExecutor;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.Locale;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.concurrent.locks.LockSupport;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Forked from androidx.camera package to avoid full Guava dependency.
+ *
+ * <p>An abstract implementation of {@link ListenableFuture}, intended for advanced users only. More
+ * common ways to create a {@code ListenableFuture} include instantiating a {@link SettableFuture},
+ * submitting a task to a {@link ListeningExecutorService}, and deriving a {@code Future} from an
+ * existing one, typically using methods like {@link Futures#transform(ListenableFuture,
+ * com.google.common.base.Function, Executor) Futures.transform} and {@link
+ * Futures#catching(ListenableFuture, Class, com.google.common.base.Function, Executor)
+ * Futures.catching}.
+ *
+ * <p>This class implements all methods in {@code ListenableFuture}. Subclasses should provide a way
+ * to set the result of the computation through the protected methods {@link #set(Object)}, {@link
+ * #setFuture(ListenableFuture)} and {@link #setException(Throwable)}. Subclasses may also override
+ * {@link #afterDone()}, which will be invoked automatically when the future completes. Subclasses
+ * should rarely override other methods.
+ *
+ * @author Sven Mawson
+ * @author Luke Sandberg
+ * @since 1.0
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY)
+@SuppressWarnings("ShortCircuitBoolean") // we use non-short circuiting comparisons intentionally
+public abstract class AbstractFuture<V> implements ListenableFuture<V> {
+
+  // NOTE: Whenever both tests are cheap and functional, it's faster to use &, | instead of &&, ||
+
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  static final boolean GENERATE_CANCELLATION_CAUSES =
+      Boolean.parseBoolean(
+          System.getProperty("guava.concurrent.generate_cancellation_cause", "false"));
+
+  // Logger to log exceptions caught when running listeners.
+  private static final Logger log = Logger.getLogger(AbstractFuture.class.getName());
+
+  // A heuristic for timed gets. If the remaining timeout is less than this, spin instead of
+  // blocking. This value is what AbstractQueuedSynchronizer uses.
+  private static final long SPIN_THRESHOLD_NANOS = 1000L;
+
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  static final AtomicHelper ATOMIC_HELPER;
+
+  static {
+    AtomicHelper helper;
+    Throwable thrownAtomicReferenceFieldUpdaterFailure = null;
+
+    // The access control checks that ARFU does means the caller class has to be
+    // AbstractFuture instead of SafeAtomicHelper, so we annoyingly define these here
+    try {
+      helper =
+          new SafeAtomicHelper(
+              newUpdater(Waiter.class, Thread.class, "thread"),
+              newUpdater(Waiter.class, Waiter.class, "next"),
+              newUpdater(AbstractFuture.class, Waiter.class, "waiters"),
+              newUpdater(AbstractFuture.class, Listener.class, "listeners"),
+              newUpdater(AbstractFuture.class, Object.class, "value"));
+    } catch (Throwable atomicReferenceFieldUpdaterFailure) {
+      // Some Android 5.0.x Samsung devices have bugs in JDK reflection APIs that cause
+      // getDeclaredField to throw a NoSuchFieldException when the field is definitely
+      // there. For these users fallback to a suboptimal implementation,
+      // based on synchronized. This will be a definite performance hit to those users.
+      thrownAtomicReferenceFieldUpdaterFailure = atomicReferenceFieldUpdaterFailure;
+      helper = new SynchronizedHelper();
+    }
+
+    ATOMIC_HELPER = helper;
+
+    // Prevent rare disastrous classloading in first call to LockSupport.park.
+    // See: https://bugs.openjdk.java.net/browse/JDK-8074773
+    @SuppressWarnings("unused")
+    Class<?> ensureLoaded = LockSupport.class;
+
+    // Log after all static init is finished; if an installed logger uses any Futures
+    // methods, it shouldn't break in cases where reflection is missing/broken.
+    if (thrownAtomicReferenceFieldUpdaterFailure != null) {
+      log.log(
+          Level.SEVERE, "SafeAtomicHelper is broken!", thrownAtomicReferenceFieldUpdaterFailure);
+    }
+  }
+
+  /** Waiter links form a Treiber stack, in the {@link #waiters} field. */
+  private static final class Waiter {
+    static final Waiter TOMBSTONE = new Waiter(false /* ignored param */);
+
+    @Nullable volatile Thread thread;
+    @Nullable volatile Waiter next;
+
+    /**
+     * Constructor for the TOMBSTONE, avoids use of ATOMIC_HELPER in case this class is loaded
+     * before the ATOMIC_HELPER. Apparently this is possible on some android platforms.
+     */
+    Waiter(boolean unused) {}
+
+    Waiter() {
+      // avoid volatile write, write is made visible by subsequent CAS on waiters field
+      ATOMIC_HELPER.putThread(this, Thread.currentThread());
+    }
+
+    // non-volatile write to the next field. Should be made visible by subsequent CAS on waiters
+    // field.
+    void setNext(Waiter next) {
+      ATOMIC_HELPER.putNext(this, next);
+    }
+
+    void unpark() {
+      // This is racy with removeWaiter. The consequence of the race is that we may
+      // spuriously call unpark even though the thread has already removed itself
+      // from the list. But even if we did use a CAS, that race would still exist
+      // (it would just be ever so slightly smaller).
+      Thread w = thread;
+      if (w != null) {
+        thread = null;
+        LockSupport.unpark(w);
+      }
+    }
+  }
+
+  /**
+   * Marks the given node as 'deleted' (null waiter) and then scans the list to unlink all deleted
+   * nodes. This is an O(n) operation in the common case (and O(n^2) in the worst), but we are saved
+   * by two things.
+   *
+   * <ul>
+   *   <li>This is only called when a waiting thread times out or is interrupted. Both of which
+   *       should be rare.
+   *   <li>The waiters list should be very short.
+   * </ul>
+   */
+  private void removeWaiter(Waiter node) {
+    node.thread = null; // mark as 'deleted'
+    restart:
+    while (true) {
+      Waiter pred = null;
+      Waiter curr = waiters;
+      if (curr == Waiter.TOMBSTONE) {
+        return; // give up if someone is calling complete
+      }
+      Waiter succ;
+      while (curr != null) {
+        succ = curr.next;
+        if (curr.thread != null) { // we aren't unlinking this node, update pred.
+          pred = curr;
+        } else if (pred != null) { // We are unlinking this node and it has a predecessor.
+          pred.next = succ;
+          if (pred.thread == null) {
+            // We raced with another node that unlinked pred. Restart.
+            continue restart;
+          }
+        } else if (!ATOMIC_HELPER.casWaiters(this, curr, succ)) { // We are unlinking head
+          continue restart; // We raced with an add or complete
+        }
+        curr = succ;
+      }
+      break;
+    }
+  }
+
+  /** Listeners also form a stack through the {@link #listeners} field. */
+  private static final class Listener {
+    static final Listener TOMBSTONE = new Listener(null, null);
+    final Runnable task;
+    final Executor executor;
+
+    // writes to next are made visible by subsequent CAS's on the listeners field
+    @Nullable Listener next;
+
+    Listener(Runnable task, Executor executor) {
+      this.task = task;
+      this.executor = executor;
+    }
+  }
+
+  /** A special value to represent {@code null}. */
+  private static final Object NULL = new Object();
+
+  /** A special value to represent failure, when {@link #setException} is called successfully. */
+  private static final class Failure {
+    static final Failure FALLBACK_INSTANCE =
+        new Failure(
+            new Throwable("Failure occurred while trying to finish a future.") {
+              @Override
+              public synchronized Throwable fillInStackTrace() {
+                return this; // no stack trace
+              }
+            });
+    final Throwable exception;
+
+    Failure(Throwable exception) {
+      this.exception = checkNotNull(exception);
+    }
+  }
+
+  /** A special value to represent cancellation and the 'wasInterrupted' bit. */
+  private static final class Cancellation {
+    // constants to use when GENERATE_CANCELLATION_CAUSES = false
+    static final Cancellation CAUSELESS_INTERRUPTED;
+    static final Cancellation CAUSELESS_CANCELLED;
+
+    static {
+      if (GENERATE_CANCELLATION_CAUSES) {
+        CAUSELESS_CANCELLED = null;
+        CAUSELESS_INTERRUPTED = null;
+      } else {
+        CAUSELESS_CANCELLED = new Cancellation(false, null);
+        CAUSELESS_INTERRUPTED = new Cancellation(true, null);
+      }
+    }
+
+    final boolean wasInterrupted;
+    @Nullable final Throwable cause;
+
+    Cancellation(boolean wasInterrupted, @Nullable Throwable cause) {
+      this.wasInterrupted = wasInterrupted;
+      this.cause = cause;
+    }
+  }
+
+  /** A special value that encodes the 'setFuture' state. */
+  private static final class SetFuture<V> implements Runnable {
+    final AbstractFuture<V> owner;
+    final ListenableFuture<? extends V> future;
+
+    SetFuture(AbstractFuture<V> owner, ListenableFuture<? extends V> future) {
+      this.owner = owner;
+      this.future = future;
+    }
+
+    @Override
+    public void run() {
+      if (owner.value != this) {
+        // nothing to do, we must have been cancelled, don't bother inspecting the future.
+        return;
+      }
+      Object valueToSet = getFutureValue(future);
+      if (ATOMIC_HELPER.casValue(owner, this, valueToSet)) {
+        complete(owner);
+      }
+    }
+  }
+
+  // TODO(lukes): investigate using the @Contended annotation on these fields when jdk8 is
+  // available.
+  /**
+   * This field encodes the current state of the future.
+   *
+   * <p>The valid values are:
+   *
+   * <ul>
+   *   <li>{@code null} initial state, nothing has happened.
+   *   <li>{@link Cancellation} terminal state, {@code cancel} was called.
+   *   <li>{@link Failure} terminal state, {@code setException} was called.
+   *   <li>{@link SetFuture} intermediate state, {@code setFuture} was called.
+   *   <li>{@link #NULL} terminal state, {@code set(null)} was called.
+   *   <li>Any other non-null value, terminal state, {@code set} was called with a non-null
+   *       argument.
+   * </ul>
+   */
+  @Nullable
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  volatile Object value;
+
+  /** All listeners. */
+  @Nullable
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  volatile Listener listeners;
+
+  /** All waiting threads. */
+  @Nullable
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  volatile Waiter waiters;
+
+  /** Constructor for use by subclasses. */
+  protected AbstractFuture() {}
+
+  // Gets and Timed Gets
+  //
+  // * Be responsive to interruption
+  // * Don't create Waiter nodes if you aren't going to park, this helps reduce contention on the
+  //   waiters field.
+  // * Future completion is defined by when #value becomes non-null/non SetFuture
+  // * Future completion can be observed if the waiters field contains a TOMBSTONE
+
+  // Timed Get
+  // There are a few design constraints to consider
+  // * We want to be responsive to small timeouts, unpark() has non trivial latency overheads (I
+  //   have observed 12 micros on 64 bit linux systems to wake up a parked thread). So if the
+  //   timeout is small we shouldn't park(). This needs to be traded off with the cpu overhead of
+  //   spinning, so we use SPIN_THRESHOLD_NANOS which is what AbstractQueuedSynchronizer uses for
+  //   similar purposes.
+  // * We want to behave reasonably for timeouts of 0
+  // * We are more responsive to completion than timeouts. This is because parkNanos depends on
+  //   system scheduling and as such we could either miss our deadline, or unpark() could be
+  //   delayed so that it looks like we timed out even though we didn't. For comparison FutureTask
+  //   respects completion preferably and AQS is non-deterministic (depends on where in the queue
+  //   the waiter is). If we wanted to be strict about it, we could store the unpark() time in
+  //   the Waiter node and we could use that to make a decision about whether or not we timed out
+  //   prior to being unparked.
+
+  /**
+   * {@inheritDoc}
+   *
+   * <p>The default {@link AbstractFuture} implementation throws {@code InterruptedException} if the
+   * current thread is interrupted during the call, even if the value is already available.
+   *
+   * @throws CancellationException {@inheritDoc}
+   */
+  @Override
+  public final V get(long timeout, TimeUnit unit)
+      throws InterruptedException, TimeoutException, ExecutionException {
+    // NOTE: if timeout < 0, remainingNanos will be < 0 and we will fall into the while(true)
+    // loop at the bottom and throw a timeoutexception.
+    // we rely on the implicit null check on unit.
+    final long timeoutNanos = unit.toNanos(timeout);
+    long remainingNanos = timeoutNanos;
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    Object localValue = value;
+    if (localValue != null & !(localValue instanceof SetFuture)) {
+      return getDoneValue(localValue);
+    }
+    // we delay calling nanoTime until we know we will need to either park or spin
+    final long endNanos = remainingNanos > 0 ? System.nanoTime() + remainingNanos : 0;
+    long_wait_loop:
+    if (remainingNanos >= SPIN_THRESHOLD_NANOS) {
+      Waiter oldHead = waiters;
+      if (oldHead != Waiter.TOMBSTONE) {
+        Waiter node = new Waiter();
+        do {
+          node.setNext(oldHead);
+          if (ATOMIC_HELPER.casWaiters(this, oldHead, node)) {
+            while (true) {
+              LockSupport.parkNanos(this, remainingNanos);
+              // Check interruption first, if we woke up due to interruption we
+              // need to honor that.
+              if (Thread.interrupted()) {
+                removeWaiter(node);
+                throw new InterruptedException();
+              }
+
+              // Otherwise re-read and check doneness. If we loop then it must have
+              // been a spurious wakeup
+              localValue = value;
+              if (localValue != null & !(localValue instanceof SetFuture)) {
+                return getDoneValue(localValue);
+              }
+
+              // timed out?
+              remainingNanos = endNanos - System.nanoTime();
+              if (remainingNanos < SPIN_THRESHOLD_NANOS) {
+                // Remove the waiter, one way or another we are done parking this
+                // thread.
+                removeWaiter(node);
+                break long_wait_loop; // jump down to the busy wait loop
+              }
+            }
+          }
+          oldHead = waiters; // re-read and loop.
+        } while (oldHead != Waiter.TOMBSTONE);
+      }
+      // re-read value, if we get here then we must have observed a TOMBSTONE while trying
+      // to add a waiter.
+      return getDoneValue(value);
+    }
+    // If we get here then we have remainingNanos < SPIN_THRESHOLD_NANOS and there is no node
+    // on the waiters list
+    while (remainingNanos > 0) {
+      localValue = value;
+      if (localValue != null & !(localValue instanceof SetFuture)) {
+        return getDoneValue(localValue);
+      }
+      if (Thread.interrupted()) {
+        throw new InterruptedException();
+      }
+      remainingNanos = endNanos - System.nanoTime();
+    }
+
+    String futureToString = toString();
+    final String unitString = unit.toString().toLowerCase(Locale.ROOT);
+    String message = "Waited " + timeout + " " + unit.toString().toLowerCase(Locale.ROOT);
+    // Only report scheduling delay if larger than our spin threshold - otherwise it's just
+    // noise
+    if (remainingNanos + SPIN_THRESHOLD_NANOS < 0) {
+      // We over-waited for our timeout.
+      message += " (plus ";
+      long overWaitNanos = -remainingNanos;
+      long overWaitUnits = unit.convert(overWaitNanos, TimeUnit.NANOSECONDS);
+      long overWaitLeftoverNanos = overWaitNanos - unit.toNanos(overWaitUnits);
+      boolean shouldShowExtraNanos =
+          overWaitUnits == 0 || overWaitLeftoverNanos > SPIN_THRESHOLD_NANOS;
+      if (overWaitUnits > 0) {
+        message += overWaitUnits + " " + unitString;
+        if (shouldShowExtraNanos) {
+          message += ",";
+        }
+        message += " ";
+      }
+      if (shouldShowExtraNanos) {
+        message += overWaitLeftoverNanos + " nanoseconds ";
+      }
+
+      message += "delay)";
+    }
+    // It's confusing to see a completed future in a timeout message; if isDone() returns false,
+    // then we know it must have given a pending toString value earlier. If not, then the future
+    // completed after the timeout expired, and the message might be success.
+    if (isDone()) {
+      throw new TimeoutException(message + " but future completed as timeout expired");
+    }
+    throw new TimeoutException(message + " for " + futureToString);
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * <p>The default {@link AbstractFuture} implementation throws {@code InterruptedException} if the
+   * current thread is interrupted during the call, even if the value is already available.
+   *
+   * @throws CancellationException {@inheritDoc}
+   */
+  @Override
+  public final V get() throws InterruptedException, ExecutionException {
+    if (Thread.interrupted()) {
+      throw new InterruptedException();
+    }
+    Object localValue = value;
+    if (localValue != null & !(localValue instanceof SetFuture)) {
+      return getDoneValue(localValue);
+    }
+    Waiter oldHead = waiters;
+    if (oldHead != Waiter.TOMBSTONE) {
+      Waiter node = new Waiter();
+      do {
+        node.setNext(oldHead);
+        if (ATOMIC_HELPER.casWaiters(this, oldHead, node)) {
+          // we are on the stack, now wait for completion.
+          while (true) {
+            LockSupport.park(this);
+            // Check interruption first, if we woke up due to interruption we need to
+            // honor that.
+            if (Thread.interrupted()) {
+              removeWaiter(node);
+              throw new InterruptedException();
+            }
+            // Otherwise re-read and check doneness. If we loop then it must have
+            // been a spurious
+            // wakeup
+            localValue = value;
+            if (localValue != null & !(localValue instanceof SetFuture)) {
+              return getDoneValue(localValue);
+            }
+          }
+        }
+        oldHead = waiters; // re-read and loop.
+      } while (oldHead != Waiter.TOMBSTONE);
+    }
+    // re-read value, if we get here then we must have observed a TOMBSTONE while trying to
+    // add a waiter.
+    return getDoneValue(value);
+  }
+
+  /** Unboxes {@code obj}. Assumes that obj is not {@code null} or a {@link SetFuture}. */
+  private V getDoneValue(Object obj) throws ExecutionException {
+    // While this seems like it might be too branch-y, simple benchmarking proves it to be
+    // unmeasurable (comparing done AbstractFutures with immediateFuture)
+    if (obj instanceof Cancellation) {
+      throw cancellationExceptionWithCause("Task was cancelled.", ((Cancellation) obj).cause);
+    } else if (obj instanceof Failure) {
+      throw new ExecutionException(((Failure) obj).exception);
+    } else if (obj == NULL) {
+      return null;
+    } else {
+      @SuppressWarnings("unchecked") // this is the only other option
+      V asV = (V) obj;
+      return asV;
+    }
+  }
+
+  @Override
+  public final boolean isDone() {
+    final Object localValue = value;
+    return localValue != null & !(localValue instanceof SetFuture);
+  }
+
+  @Override
+  public final boolean isCancelled() {
+    final Object localValue = value;
+    return localValue instanceof Cancellation;
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * <p>If a cancellation attempt succeeds on a {@code Future} that had previously been {@linkplain
+   * #setFuture set asynchronously}, then the cancellation will also be propagated to the delegate
+   * {@code Future} that was supplied in the {@code setFuture} call.
+   *
+   * <p>Rather than override this method to perform additional cancellation work or cleanup,
+   * subclasses should override {@link #afterDone}, consulting {@link #isCancelled} and {@link
+   * #wasInterrupted} as necessary. This ensures that the work is done even if the future is
+   * cancelled without a call to {@code cancel}, such as by calling {@code
+   * setFuture(cancelledFuture)}.
+   */
+  @Override
+  public final boolean cancel(boolean mayInterruptIfRunning) {
+    Object localValue = value;
+    boolean rValue = false;
+    if (localValue == null | localValue instanceof SetFuture) {
+      // Try to delay allocating the exception. At this point we may still lose the CAS,
+      // but it is certainly less likely.
+      Object valueToSet =
+          GENERATE_CANCELLATION_CAUSES
+              ? new Cancellation(
+                  mayInterruptIfRunning, new CancellationException("Future.cancel() was called."))
+              : (mayInterruptIfRunning
+                  ? Cancellation.CAUSELESS_INTERRUPTED
+                  : Cancellation.CAUSELESS_CANCELLED);
+      AbstractFuture<?> abstractFuture = this;
+      while (true) {
+        if (ATOMIC_HELPER.casValue(abstractFuture, localValue, valueToSet)) {
+          rValue = true;
+          // We call interruptTask before calling complete(), which is consistent with
+          // FutureTask
+          if (mayInterruptIfRunning) {
+            abstractFuture.interruptTask();
+          }
+          complete(abstractFuture);
+          if (localValue instanceof SetFuture) {
+            // propagate cancellation to the future set in setfuture, this is racy,
+            // and we don't
+            // care if we are successful or not.
+            ListenableFuture<?> futureToPropagateTo = ((SetFuture) localValue).future;
+            if (futureToPropagateTo instanceof AbstractFuture) {
+              // If the future is a trusted then we specifically avoid
+              // calling cancel() this has 2 benefits
+              // 1. for long chains of futures strung together with setFuture we
+              // consume less stack
+              // 2. we avoid allocating Cancellation objects at every level of the
+              // cancellation chain
+              // We can only do this for TrustedFuture, because TrustedFuture
+              // .cancel is final and does nothing but delegate to this method.
+              AbstractFuture<?> trusted = (AbstractFuture<?>) futureToPropagateTo;
+              localValue = trusted.value;
+              if (localValue == null | localValue instanceof SetFuture) {
+                abstractFuture = trusted;
+                continue; // loop back up and try to complete the new future
+              }
+            } else {
+              // not a TrustedFuture, call cancel directly.
+              futureToPropagateTo.cancel(mayInterruptIfRunning);
+            }
+          }
+          break;
+        }
+        // obj changed, reread
+        localValue = abstractFuture.value;
+        if (!(localValue instanceof SetFuture)) {
+          // obj cannot be null at this point, because value can only change from null
+          // to non-null. So if value changed (and it did since we lost the CAS),
+          // then it cannot be null and since it isn't a SetFuture, then the future must
+          // be done and we should exit the loop
+          break;
+        }
+      }
+    }
+    return rValue;
+  }
+
+  /**
+   * Subclasses can override this method to implement interruption of the future's computation. The
+   * method is invoked automatically by a successful call to {@link #cancel(boolean) cancel(true)}.
+   *
+   * <p>The default implementation does nothing.
+   *
+   * <p>This method is likely to be deprecated. Prefer to override {@link #afterDone}, checking
+   * {@link #wasInterrupted} to decide whether to interrupt your task.
+   *
+   * @since 10.0
+   */
+  protected void interruptTask() {}
+
+  /**
+   * Returns true if this future was cancelled with {@code mayInterruptIfRunning} set to {@code
+   * true}.
+   *
+   * @since 14.0
+   */
+  protected final boolean wasInterrupted() {
+    final Object localValue = value;
+    return (localValue instanceof Cancellation) && ((Cancellation) localValue).wasInterrupted;
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * @since 10.0
+   */
+  @Override
+  public final void addListener(Runnable listener, Executor executor) {
+    checkNotNull(listener);
+    checkNotNull(executor);
+    Listener oldHead = listeners;
+    if (oldHead != Listener.TOMBSTONE) {
+      Listener newNode = new Listener(listener, executor);
+      do {
+        newNode.next = oldHead;
+        if (ATOMIC_HELPER.casListeners(this, oldHead, newNode)) {
+          return;
+        }
+        oldHead = listeners; // re-read
+      } while (oldHead != Listener.TOMBSTONE);
+    }
+    // If we get here then the Listener TOMBSTONE was set, which means the future is done, call
+    // the listener.
+    executeListener(listener, executor);
+  }
+
+  /**
+   * Sets the result of this {@code Future} unless this {@code Future} has already been cancelled or
+   * set (including {@linkplain #setFuture set asynchronously}). When a call to this method returns,
+   * the {@code Future} is guaranteed to be {@linkplain #isDone done} <b>only if</b> the call was
+   * accepted (in which case it returns {@code true}). If it returns {@code false}, the {@code
+   * Future} may have previously been set asynchronously, in which case its result may not be known
+   * yet. That result, though not yet known, cannot be overridden by a call to a {@code set*}
+   * method, only by a call to {@link #cancel}.
+   *
+   * @param value the value to be used as the result
+   * @return true if the attempt was accepted, completing the {@code Future}
+   */
+  protected boolean set(@Nullable V value) {
+    Object valueToSet = value == null ? NULL : value;
+    if (ATOMIC_HELPER.casValue(this, null, valueToSet)) {
+      complete(this);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Sets the failed result of this {@code Future} unless this {@code Future} has already been
+   * cancelled or set (including {@linkplain #setFuture set asynchronously}). When a call to this
+   * method returns, the {@code Future} is guaranteed to be {@linkplain #isDone done} <b>only if</b>
+   * the call was accepted (in which case it returns {@code true}). If it returns {@code false}, the
+   * {@code Future} may have previously been set asynchronously, in which case its result may not be
+   * known yet. That result, though not yet known, cannot be overridden by a call to a {@code set*}
+   * method, only by a call to {@link #cancel}.
+   *
+   * @param throwable the exception to be used as the failed result
+   * @return true if the attempt was accepted, completing the {@code Future}
+   */
+  protected boolean setException(Throwable throwable) {
+    Object valueToSet = new Failure(checkNotNull(throwable));
+    if (ATOMIC_HELPER.casValue(this, null, valueToSet)) {
+      complete(this);
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Sets the result of this {@code Future} to match the supplied input {@code Future} once the
+   * supplied {@code Future} is done, unless this {@code Future} has already been cancelled or set
+   * (including "set asynchronously," defined below).
+   *
+   * <p>If the supplied future is {@linkplain #isDone done} when this method is called and the call
+   * is accepted, then this future is guaranteed to have been completed with the supplied future by
+   * the time this method returns. If the supplied future is not done and the call is accepted, then
+   * the future will be <i>set asynchronously</i>. Note that such a result, though not yet known,
+   * cannot be overridden by a call to a {@code set*} method, only by a call to {@link #cancel}.
+   *
+   * <p>If the call {@code setFuture(delegate)} is accepted and this {@code Future} is later
+   * cancelled, cancellation will be propagated to {@code delegate}. Additionally, any call to
+   * {@code setFuture} after any cancellation will propagate cancellation to the supplied {@code
+   * Future}.
+   *
+   * <p>Note that, even if the supplied future is cancelled and it causes this future to complete,
+   * it will never trigger interruption behavior. In particular, it will not cause this future to
+   * invoke the {@link #interruptTask} method, and the {@link #wasInterrupted} method will not
+   * return {@code true}.
+   *
+   * @param future the future to delegate to
+   * @return true if the attempt was accepted, indicating that the {@code Future} was not previously
+   *     cancelled or set.
+   * @since 19.0
+   */
+  protected boolean setFuture(ListenableFuture<? extends V> future) {
+    checkNotNull(future);
+    Object localValue = value;
+    if (localValue == null) {
+      if (future.isDone()) {
+        Object value = getFutureValue(future);
+        if (ATOMIC_HELPER.casValue(this, null, value)) {
+          complete(this);
+          return true;
+        }
+        return false;
+      }
+      SetFuture valueToSet = new SetFuture<V>(this, future);
+      if (ATOMIC_HELPER.casValue(this, null, valueToSet)) {
+        // the listener is responsible for calling completeWithFuture, directExecutor is
+        // appropriate since all we are doing is unpacking a completed future
+        // which should be fast.
+        try {
+          future.addListener(valueToSet, DirectExecutor.INSTANCE);
+        } catch (Throwable t) {
+          // addListener has thrown an exception! SetFuture.run can't throw any
+          // exceptions so this must have been caused by addListener itself.
+          // The most likely explanation is a misconfigured mock.
+          // Try to switch to Failure.
+          Failure failure;
+          try {
+            failure = new Failure(t);
+          } catch (Throwable oomMostLikely) {
+            failure = Failure.FALLBACK_INSTANCE;
+          }
+          // Note: The only way this CAS could fail is if cancel() has raced with us.
+          // That is ok.
+          boolean unused = ATOMIC_HELPER.casValue(this, valueToSet, failure);
+        }
+        return true;
+      }
+      localValue = value; // we lost the cas, fall through and maybe cancel
+    }
+    // The future has already been set to something. If it is cancellation we should cancel the
+    // incoming future.
+    if (localValue instanceof Cancellation) {
+      // we don't care if it fails, this is best-effort.
+      future.cancel(((Cancellation) localValue).wasInterrupted);
+    }
+    return false;
+  }
+
+  /**
+   * Returns a value that satisfies the contract of the {@link #value} field based on the state of
+   * given future.
+   *
+   * <p>This is approximately the inverse of {@link #getDoneValue(Object)}
+   */
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  static Object getFutureValue(ListenableFuture<?> future) {
+    if (future instanceof AbstractFuture) {
+      // Break encapsulation for TrustedFuture instances since we know that subclasses cannot
+      // override .get() (since it is final) and therefore this is equivalent to calling
+      // .get() and unpacking the exceptions like we do below (just much faster because it is
+      // a single field read instead of a read, several branches and possibly
+      // creating exceptions).
+      Object v = ((AbstractFuture<?>) future).value;
+      if (v instanceof Cancellation) {
+        // If the other future was interrupted, clear the interrupted bit while
+        // preserving the cause this will make it consistent with how non-trustedfutures
+        // work which cannot propagate the wasInterrupted bit
+        Cancellation c = (Cancellation) v;
+        if (c.wasInterrupted) {
+          v =
+              c.cause != null
+                  ? new Cancellation(/* wasInterrupted= */ false, c.cause)
+                  : Cancellation.CAUSELESS_CANCELLED;
+        }
+      }
+      return v;
+    }
+    boolean wasCancelled = future.isCancelled();
+    // Don't allocate a CancellationException if it's not necessary
+    if (!GENERATE_CANCELLATION_CAUSES & wasCancelled) {
+      return Cancellation.CAUSELESS_CANCELLED;
+    }
+    // Otherwise calculate the value by calling .get()
+    try {
+      Object v = getUninterruptibly(future);
+      return v == null ? NULL : v;
+    } catch (ExecutionException exception) {
+      return new Failure(exception.getCause());
+    } catch (CancellationException cancellation) {
+      if (!wasCancelled) {
+        return new Failure(
+            new IllegalArgumentException(
+                "get() threw CancellationException, despite reporting isCancelled"
+                    + "() == false: "
+                    + future,
+                cancellation));
+      }
+      return new Cancellation(false, cancellation);
+    } catch (Throwable t) {
+      return new Failure(t);
+    }
+  }
+
+  /** internal dependency on other /util/concurrent classes. */
+  private static <V> V getUninterruptibly(Future<V> future) throws ExecutionException {
+    boolean interrupted = false;
+    try {
+      while (true) {
+        try {
+          return future.get();
+        } catch (InterruptedException e) {
+          interrupted = true;
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  /** Unblocks all threads and runs all listeners. */
+  @SuppressWarnings("WeakerAccess") // Avoiding synthetic accessor.
+  static void complete(AbstractFuture<?> future) {
+    Listener next = null;
+    outer:
+    while (true) {
+      future.releaseWaiters();
+      // We call this before the listeners in order to avoid needing to manage a separate
+      // stack data structure for them.  Also, some implementations rely on this running
+      // prior to listeners so that the cleanup work is visible to listeners.
+      // afterDone() should be generally fast and only used for cleanup work... but in
+      // theory can also be recursive and create StackOverflowErrors
+      future.afterDone();
+      // push the current set of listeners onto next
+      next = future.clearListeners(next);
+      future = null;
+      while (next != null) {
+        Listener curr = next;
+        next = next.next;
+        Runnable task = curr.task;
+        if (task instanceof SetFuture) {
+          SetFuture<?> setFuture = (SetFuture<?>) task;
+          // We unwind setFuture specifically to avoid StackOverflowErrors in the case
+          // of long chains of SetFutures
+          // Handling this special case is important because there is no way to pass an
+          // executor to setFuture, so a user couldn't break the chain by doing this
+          // themselves. It is also potentially common if someone writes a recursive
+          // Futures.transformAsync transformer.
+          future = setFuture.owner;
+          if (future.value == setFuture) {
+            Object valueToSet = getFutureValue(setFuture.future);
+            if (ATOMIC_HELPER.casValue(future, setFuture, valueToSet)) {
+              continue outer;
+            }
+          }
+          // other wise the future we were trying to set is already done.
+        } else {
+          executeListener(task, curr.executor);
+        }
+      }
+      break;
+    }
+  }
+
+  /**
+   * Callback method that is called exactly once after the future is completed.
+   *
+   * <p>If {@link #interruptTask} is also run during completion, {@link #afterDone} runs after it.
+   *
+   * <p>The default implementation of this method in {@code AbstractFuture} does nothing. This is
+   * intended for very lightweight cleanup work, for example, timing statistics or clearing fields.
+   * If your task does anything heavier consider, just using a listener with an executor.
+   *
+   * @since 20.0
+   */
+  protected void afterDone() {}
+
+  /**
+   * If this future has been cancelled (and possibly interrupted), cancels (and possibly interrupts)
+   * the given future (if available).
+   */
+  @SuppressWarnings("ParameterNotNullable")
+  final void maybePropagateCancellationTo(@Nullable Future<?> related) {
+    if (related != null & isCancelled()) {
+      related.cancel(wasInterrupted());
+    }
+  }
+
+  /** Releases all threads in the {@link #waiters} list, and clears the list. */
+  private void releaseWaiters() {
+    Waiter head;
+    do {
+      head = waiters;
+    } while (!ATOMIC_HELPER.casWaiters(this, head, Waiter.TOMBSTONE));
+    for (Waiter currentWaiter = head; currentWaiter != null; currentWaiter = currentWaiter.next) {
+      currentWaiter.unpark();
+    }
+  }
+
+  /**
+   * Clears the {@link #listeners} list and prepends its contents to {@code onto}, least recently
+   * added first.
+   */
+  private Listener clearListeners(Listener onto) {
+    // We need to
+    // 1. atomically swap the listeners with TOMBSTONE, this is because addListener uses that to
+    //    to synchronize with us
+    // 2. reverse the linked list, because despite our rather clear contract, people depend
+    //    on us executing listeners in the order they were added
+    // 3. push all the items onto 'onto' and return the new head of the stack
+    Listener head;
+    do {
+      head = listeners;
+    } while (!ATOMIC_HELPER.casListeners(this, head, Listener.TOMBSTONE));
+    Listener reversedList = onto;
+    while (head != null) {
+      Listener tmp = head;
+      head = head.next;
+      tmp.next = reversedList;
+      reversedList = tmp;
+    }
+    return reversedList;
+  }
+
+  // TODO(clm): move parts into a default method on ListenableFuture?
+  @Override
+  public String toString() {
+    StringBuilder builder = new StringBuilder().append(super.toString()).append("[status=");
+    if (isCancelled()) {
+      builder.append("CANCELLED");
+    } else if (isDone()) {
+      addDoneString(builder);
+    } else {
+      String pendingDescription;
+      try {
+        pendingDescription = pendingToString();
+      } catch (RuntimeException e) {
+        // Don't call getMessage or toString() on the exception, in case the exception
+        // thrown by the subclass is implemented with bugs similar to the subclass.
+        pendingDescription = "Exception thrown from implementation: " + e.getClass();
+      }
+      // The future may complete during or before the call to getPendingToString, so we use
+      // null as a signal that we should try checking if the future is done again.
+      if (pendingDescription != null && !pendingDescription.isEmpty()) {
+        builder.append("PENDING, info=[").append(pendingDescription).append("]");
+      } else if (isDone()) {
+        addDoneString(builder);
+      } else {
+        builder.append("PENDING");
+      }
+    }
+    return builder.append("]").toString();
+  }
+
+  /**
+   * Provide a human-readable explanation of why this future has not yet completed.
+   *
+   * @return null if an explanation cannot be provided because the future is done.
+   * @since 23.0
+   */
+  @Nullable
+  protected String pendingToString() {
+    Object localValue = value;
+    if (localValue instanceof SetFuture) {
+      return "setFuture=[" + userObjectToString(((SetFuture) localValue).future) + "]";
+    } else if (this instanceof ScheduledFuture) {
+      return "remaining delay=["
+          + ((ScheduledFuture) this).getDelay(TimeUnit.MILLISECONDS)
+          + " ms]";
+    }
+    return null;
+  }
+
+  private void addDoneString(StringBuilder builder) {
+    try {
+      V value = getUninterruptibly(this);
+      builder.append("SUCCESS, result=[").append(userObjectToString(value)).append("]");
+    } catch (ExecutionException e) {
+      builder.append("FAILURE, cause=[").append(e.getCause()).append("]");
+    } catch (CancellationException e) {
+      builder.append("CANCELLED"); // shouldn't be reachable
+    } catch (RuntimeException e) {
+      builder.append("UNKNOWN, cause=[").append(e.getClass()).append(" thrown from get()]");
+    }
+  }
+
+  /** Helper for printing user supplied objects into our toString method. */
+  private String userObjectToString(Object o) {
+    // This is some basic recursion detection for when people create cycles via set/setFuture
+    // This is however only partial protection though since it only detects self loops.  We
+    // could detect arbitrary cycles using a thread local or possibly by catching
+    // StackOverflowExceptions but this should be a good enough solution
+    // (it is also what jdk collections do in these cases)
+    if (o == this) {
+      return "this future";
+    }
+    return String.valueOf(o);
+  }
+
+  /**
+   * Submits the given runnable to the given {@link Executor} catching and logging all {@linkplain
+   * RuntimeException runtime exceptions} thrown by the executor.
+   */
+  private static void executeListener(Runnable runnable, Executor executor) {
+    try {
+      executor.execute(runnable);
+    } catch (RuntimeException e) {
+      // Log it and keep going -- bad runnable and/or executor. Don't punish the other
+      // runnables if we're given a bad one. We only catch RuntimeException
+      // because we want Errors to propagate up.
+      log.log(
+          Level.SEVERE,
+          "RuntimeException while executing runnable " + runnable + " with executor " + executor,
+          e);
+    }
+  }
+
+  private abstract static class AtomicHelper {
+    /** Non volatile write of the thread to the {@link Waiter#thread} field. */
+    abstract void putThread(Waiter waiter, Thread newValue);
+
+    /** Non volatile write of the waiter to the {@link Waiter#next} field. */
+    abstract void putNext(Waiter waiter, Waiter newValue);
+
+    /** Performs a CAS operation on the {@link #waiters} field. */
+    abstract boolean casWaiters(AbstractFuture<?> future, Waiter expect, Waiter update);
+
+    /** Performs a CAS operation on the {@link #listeners} field. */
+    abstract boolean casListeners(AbstractFuture<?> future, Listener expect, Listener update);
+
+    /** Performs a CAS operation on the {@link #value} field. */
+    abstract boolean casValue(AbstractFuture<?> future, Object expect, Object update);
+  }
+
+  /** {@link AtomicHelper} based on {@link AtomicReferenceFieldUpdater}. */
+  private static final class SafeAtomicHelper extends AtomicHelper {
+    final AtomicReferenceFieldUpdater<Waiter, Thread> waiterThreadUpdater;
+    final AtomicReferenceFieldUpdater<Waiter, Waiter> waiterNextUpdater;
+    final AtomicReferenceFieldUpdater<AbstractFuture, Waiter> waitersUpdater;
+    final AtomicReferenceFieldUpdater<AbstractFuture, Listener> listenersUpdater;
+    final AtomicReferenceFieldUpdater<AbstractFuture, Object> valueUpdater;
+
+    SafeAtomicHelper(
+        AtomicReferenceFieldUpdater<Waiter, Thread> waiterThreadUpdater,
+        AtomicReferenceFieldUpdater<Waiter, Waiter> waiterNextUpdater,
+        AtomicReferenceFieldUpdater<AbstractFuture, Waiter> waitersUpdater,
+        AtomicReferenceFieldUpdater<AbstractFuture, Listener> listenersUpdater,
+        AtomicReferenceFieldUpdater<AbstractFuture, Object> valueUpdater) {
+      this.waiterThreadUpdater = waiterThreadUpdater;
+      this.waiterNextUpdater = waiterNextUpdater;
+      this.waitersUpdater = waitersUpdater;
+      this.listenersUpdater = listenersUpdater;
+      this.valueUpdater = valueUpdater;
+    }
+
+    @Override
+    void putThread(Waiter waiter, Thread newValue) {
+      waiterThreadUpdater.lazySet(waiter, newValue);
+    }
+
+    @Override
+    void putNext(Waiter waiter, Waiter newValue) {
+      waiterNextUpdater.lazySet(waiter, newValue);
+    }
+
+    @Override
+    boolean casWaiters(AbstractFuture<?> future, Waiter expect, Waiter update) {
+      return waitersUpdater.compareAndSet(future, expect, update);
+    }
+
+    @Override
+    boolean casListeners(AbstractFuture<?> future, Listener expect, Listener update) {
+      return listenersUpdater.compareAndSet(future, expect, update);
+    }
+
+    @Override
+    boolean casValue(AbstractFuture<?> future, Object expect, Object update) {
+      return valueUpdater.compareAndSet(future, expect, update);
+    }
+  }
+
+  /**
+   * {@link AtomicHelper} based on {@code synchronized} and volatile writes.
+   *
+   * <p>This is an implementation of last resort for when certain basic VM features are broken (like
+   * AtomicReferenceFieldUpdater).
+   */
+  private static final class SynchronizedHelper extends AtomicHelper {
+    SynchronizedHelper() {}
+
+    @Override
+    void putThread(Waiter waiter, Thread newValue) {
+      waiter.thread = newValue;
+    }
+
+    @Override
+    void putNext(Waiter waiter, Waiter newValue) {
+      waiter.next = newValue;
+    }
+
+    @Override
+    boolean casWaiters(AbstractFuture<?> future, Waiter expect, Waiter update) {
+      synchronized (future) {
+        if (future.waiters == expect) {
+          future.waiters = update;
+          return true;
+        }
+        return false;
+      }
+    }
+
+    @Override
+    boolean casListeners(AbstractFuture<?> future, Listener expect, Listener update) {
+      synchronized (future) {
+        if (future.listeners == expect) {
+          future.listeners = update;
+          return true;
+        }
+        return false;
+      }
+    }
+
+    @Override
+    boolean casValue(AbstractFuture<?> future, Object expect, Object update) {
+      synchronized (future) {
+        if (future.value == expect) {
+          future.value = update;
+          return true;
+        }
+        return false;
+      }
+    }
+  }
+
+  private static CancellationException cancellationExceptionWithCause(
+      @Nullable String message, @Nullable Throwable cause) {
+    CancellationException exception = new CancellationException(message);
+    exception.initCause(cause);
+    return exception;
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/AsyncFunction.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/AsyncFunction.java
new file mode 100644
index 000000000..3bfe232c5
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/AsyncFunction.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+
+/**
+ * Forked from androidx.camera package to avoid full guava dependency.
+ *
+ * <p>Transforms a value, possibly asynchronously. For an example usage and more information, see
+ * {@link Futures#transformAsync(ListenableFuture, AsyncFunction, Executor)}.
+ *
+ * @author Chris Povirk
+ * @since 11.0
+ * @param <I>
+ * @param <O>
+ */
+public interface AsyncFunction<I, O> {
+  /**
+   * Returns an output {@code Future} to use in place of the given {@code input}. The output {@code
+   * Future} need not be {@linkplain Future#isDone done}, making {@code AsyncFunction} suitable for
+   * asynchronous derivations.
+   *
+   * <p>Throwing an exception from this method is equivalent to returning a failing {@code Future}.
+   */
+  @NonNull
+  ListenableFuture<O> apply(@Nullable I input) throws Exception;
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD b/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD
new file mode 100644
index 000000000..0ca60c82c
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/BUILD
@@ -0,0 +1,26 @@
+# Description:
+#   Espresso Web Actions
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//espresso/web:__subpackages__"],
+)
+
+android_library(
+    name = "concurrent",
+    srcs = glob(
+        ["*.java"],
+    ),
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:androidx_concurrent_concurrent_futures",
+        "@maven//:org_jetbrains_kotlin_kotlin_stdlib",
+        "@maven_listenablefuture//:com_google_guava_listenablefuture",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/ChainingListenableFuture.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/ChainingListenableFuture.java
new file mode 100644
index 000000000..fa0714914
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/ChainingListenableFuture.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import static androidx.test.espresso.web.util.concurrent.Futures.getUninterruptibly;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.platform.concurrent.DirectExecutor;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Forked from androidx.camera package to avoid full Guava dependency.
+ *
+ * <p>The Class is based on the ChainingListenableFuture in Guava, the constructor of FutureChain
+ * will use the CallbackToFutureAdapter instead of the AbstractFuture.
+ *
+ * <p>An implementation of {@code ListenableFuture} that also implements {@code Runnable} so that it
+ * can be used to nest ListenableFutures. Once the passed-in {@code ListenableFuture} is complete,
+ * it calls the passed-in {@code Function} to generate the result.
+ *
+ * <p>If the Function throws any checked exceptions, they should be wrapped in a {@code
+ * UndeclaredThrowableException} so that this class can get access to the cause.
+ */
+class ChainingListenableFuture<I, O> extends FutureChain<O> implements Runnable {
+  @Nullable private AsyncFunction<? super I, ? extends O> function;
+  private final BlockingQueue<Boolean> mayInterruptIfRunningChannel = new LinkedBlockingQueue<>(1);
+  private final CountDownLatch outputCreated = new CountDownLatch(1);
+  @Nullable private ListenableFuture<? extends I> inputFuture;
+  @Nullable volatile ListenableFuture<? extends O> outputFuture;
+
+  ChainingListenableFuture(
+      @NonNull AsyncFunction<? super I, ? extends O> function,
+      @NonNull ListenableFuture<? extends I> inputFuture) {
+    super();
+    this.function = checkNotNull(function);
+    this.inputFuture = checkNotNull(inputFuture);
+  }
+
+  /**
+   * Delegate the get() to the input and output mFutures, in case their implementations defer
+   * starting computation until their own get() is invoked.
+   */
+  @Override
+  @Nullable
+  public O get() throws InterruptedException, ExecutionException {
+    if (!isDone()) {
+      // Invoking get on the mInputFuture will ensure our own run()
+      // method below is invoked as a listener when mInputFuture sets
+      // its value.  Therefore when get() returns we should then see
+      // the mOutputFuture be created.
+      ListenableFuture<? extends I> inputFuture = this.inputFuture;
+      if (inputFuture != null) {
+        inputFuture.get();
+      }
+
+      // If our listener was scheduled to run on an executor we may
+      // need to wait for our listener to finish running before the
+      // mOutputFuture has been constructed by the mFunction.
+      outputCreated.await();
+
+      // Like above with the mInputFuture, we have a listener on
+      // the mOutputFuture that will set our own value when its
+      // value is set.  Invoking get will ensure the output can
+      // complete and invoke our listener, so that we can later
+      // get the mResult.
+      ListenableFuture<? extends O> outputFuture = this.outputFuture;
+      if (outputFuture != null) {
+        outputFuture.get();
+      }
+    }
+    return super.get();
+  }
+
+  /**
+   * Delegate the get() to the input and output mFutures, in case their implementations defer
+   * starting computation until their own get() is invoked.
+   */
+  @Override
+  @Nullable
+  public O get(long timeout, @NonNull TimeUnit unit)
+      throws TimeoutException, ExecutionException, InterruptedException {
+    if (!isDone()) {
+      // Use a single time unit so we can decrease mRemaining timeout
+      // as we wait for various phases to complete.
+      if (unit != NANOSECONDS) {
+        timeout = NANOSECONDS.convert(timeout, unit);
+        unit = NANOSECONDS;
+      }
+
+      // Invoking get on the mInputFuture will ensure our own run()
+      // method below is invoked as a listener when mInputFuture sets
+      // its value.  Therefore when get() returns we should then see
+      // the mOutputFuture be created.
+      ListenableFuture<? extends I> inputFuture = this.inputFuture;
+      if (inputFuture != null) {
+        long start = System.nanoTime();
+        inputFuture.get(timeout, unit);
+        timeout -= Math.max(0, System.nanoTime() - start);
+      }
+
+      // If our listener was scheduled to run on an executor we may
+      // need to wait for our listener to finish running before the
+      // mOutputFuture has been constructed by the mFunction.
+      long start = System.nanoTime();
+      if (!outputCreated.await(timeout, unit)) {
+        throw new TimeoutException();
+      }
+      timeout -= Math.max(0, System.nanoTime() - start);
+
+      // Like above with the mInputFuture, we have a listener on
+      // the mOutputFuture that will set our own value when its
+      // value is set.  Invoking get will ensure the output can
+      // complete and invoke our listener, so that we can later
+      // get the mResult.
+      ListenableFuture<? extends O> outputFuture = this.outputFuture;
+      if (outputFuture != null) {
+        outputFuture.get(timeout, unit);
+      }
+    }
+    return super.get(timeout, unit);
+  }
+
+  @Override
+  public boolean cancel(boolean mayInterruptIfRunning) {
+    /*
+     * Our additional cancellation work needs to occur even if
+     * !mayInterruptIfRunning, so we can't move it into interruptTask().
+     */
+    if (super.cancel(mayInterruptIfRunning)) {
+      // This should never block since only one thread is allowed to cancel
+      // this Future.
+      putUninterruptibly(mayInterruptIfRunningChannel, mayInterruptIfRunning);
+      cancel(inputFuture, mayInterruptIfRunning);
+      cancel(outputFuture, mayInterruptIfRunning);
+      return true;
+    }
+    return false;
+  }
+
+  private void cancel(@Nullable Future<?> future, boolean mayInterruptIfRunning) {
+    if (future != null) {
+      future.cancel(mayInterruptIfRunning);
+    }
+  }
+
+  @Override
+  public void run() {
+    try {
+      I sourceResult;
+      try {
+        sourceResult = getUninterruptibly(inputFuture);
+      } catch (CancellationException e) {
+        // Cancel this future and return.
+        // At this point, mInputFuture is cancelled and mOutputFuture doesn't
+        // exist, so the value of mayInterruptIfRunning is irrelevant.
+        cancel(false);
+        return;
+      } catch (ExecutionException e) {
+        // Set the cause of the exception as this future's exception
+        setException(e.getCause());
+        return;
+      }
+
+      final ListenableFuture<? extends O> outputFuture =
+          this.outputFuture = function.apply(sourceResult);
+      if (isCancelled()) {
+        // Handles the case where cancel was called while the mFunction was
+        // being applied.
+        // There is a gap in cancel(boolean) between calling sync.cancel()
+        // and storing the value of mayInterruptIfRunning, so this thread
+        // needs to block, waiting for that value.
+        outputFuture.cancel(takeUninterruptibly(mayInterruptIfRunningChannel));
+        this.outputFuture = null;
+        return;
+      }
+      outputFuture.addListener(
+          new Runnable() {
+            @Override
+            public void run() {
+              try {
+                // Here it would have been nice to have had an
+                // UninterruptibleListenableFuture, but we don't want to start a
+                // combinatorial explosion of interfaces, so we have to make do.
+                set(getUninterruptibly(outputFuture));
+              } catch (CancellationException e) {
+                // Cancel this future and return.
+                // At this point, mInputFuture and mOutputFuture are done, so the
+                // value of mayInterruptIfRunning is irrelevant.
+                cancel(false);
+                return;
+              } catch (ExecutionException e) {
+                // Set the cause of the exception as this future's exception
+                setException(e.getCause());
+              } finally {
+                // Don't pin inputs beyond completion
+                ChainingListenableFuture.this.outputFuture = null;
+              }
+            }
+          },
+          DirectExecutor.INSTANCE);
+    } catch (UndeclaredThrowableException e) {
+      // Set the cause of the exception as this future's exception
+      setException(e.getCause());
+    } catch (Exception e) {
+      // This exception is irrelevant in this thread, but useful for the
+      // client
+      setException(e);
+    } catch (Error e) {
+      // Propagate errors up ASAP - our superclass will rethrow the error
+      setException(e);
+    } finally {
+      // Don't pin inputs beyond completion
+      function = null;
+      inputFuture = null;
+      // Allow our get routines to examine mOutputFuture now.
+      outputCreated.countDown();
+    }
+  }
+
+  /** Invokes {@code queue.}{@link BlockingQueue#take() take()} uninterruptibly. */
+  private <E> E takeUninterruptibly(@NonNull BlockingQueue<E> queue) {
+    boolean interrupted = false;
+    try {
+      while (true) {
+        try {
+          return queue.take();
+        } catch (InterruptedException e) {
+          interrupted = true;
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  /** Invokes {@code queue.}{@link BlockingQueue#put(Object) put(element)} uninterruptibly. */
+  private <E> void putUninterruptibly(@NonNull BlockingQueue<E> queue, @NonNull E element) {
+    boolean interrupted = false;
+    try {
+      while (true) {
+        try {
+          queue.put(element);
+          return;
+        } catch (InterruptedException e) {
+          interrupted = true;
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/FutureCallback.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/FutureCallback.java
new file mode 100644
index 000000000..601a26456
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/FutureCallback.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+/**
+ * Forked from androidx.camera package to avoid full Guava dependency.
+ *
+ * <p>A callback for accepting the results of a {@link java.util.concurrent.Future} computation
+ * asynchronously.
+ *
+ * <p>To attach to a {@link ListenableFuture} use {@link Futures#addCallback}.
+ *
+ * @author Anthony Zana
+ * @since 10.0
+ * @param <V>
+ */
+public interface FutureCallback<V> {
+  /** Invoked with the result of the {@code Future} computation when it is successful. */
+  void onSuccess(@Nullable V result);
+
+  /**
+   * Invoked when a {@code Future} computation fails or is canceled.
+   *
+   * <p>If the future's {@link Future#get() get} method throws an {@link ExecutionException} with a
+   * non-{@code null} cause, then the cause is passed to this method. Any other thrown object is
+   * passed unaltered.
+   */
+  void onFailure(@NonNull Throwable t);
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/FutureChain.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/FutureChain.java
new file mode 100644
index 000000000..ffc49dfe3
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/FutureChain.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
+import androidx.test.internal.util.Checks;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import kotlin.jvm.functions.Function1;
+
+/**
+ * Forked from androidx.camera package to avoid full Guava dependency.
+ *
+ * <p>A {@link ListenableFuture} that supports chains of operations. For example:
+ *
+ * <pre>{@code
+ * ListenableFuture<Boolean> adminIsLoggedIn =
+ *     FutureChain.from(usersDatabase.getAdminUser())
+ *         .transform(User::getId, directExecutor())
+ *         .transform(ActivityService::isLoggedIn, threadPool);
+ *
+ * }</pre>
+ *
+ * @param <V>
+ */
+class FutureChain<V> implements ListenableFuture<V> {
+  @NonNull private final ListenableFuture<V> mDelegate;
+  @Nullable CallbackToFutureAdapter.Completer<V> mCompleter;
+
+  /**
+   * Converts the given {@code ListenableFuture} to an equivalent {@code FutureChain}.
+   *
+   * <p>If the given {@code ListenableFuture} is already a {@code FutureChain}, it is returned
+   * directly. If not, it is wrapped in a {@code FutureChain} that delegates all calls to the
+   * original {@code ListenableFuture}.
+   *
+   * @return directly if input a FutureChain or a ListenableFuture wrapped by FutureChain.
+   */
+  @NonNull
+  public static <V> FutureChain<V> from(@NonNull ListenableFuture<V> future) {
+    return future instanceof FutureChain ? (FutureChain<V>) future : new FutureChain<V>(future);
+  }
+
+  /**
+   * Returns a new {@code Future} whose result is asynchronously derived from the result of this
+   * {@code Future}. If the input {@code Future} fails, the returned {@code Future} fails with the
+   * same exception (and the function is not invoked).
+   *
+   * @param function A function to transform the result of this future to the result of the output
+   *     future
+   * @param executor Executor to run the function in.
+   * @return A future that holds result of the function (if the input succeeded) or the original
+   *     input's failure (if not)
+   */
+  @NonNull
+  public final <T> FutureChain<T> transformAsync(
+      @NonNull AsyncFunction<? super V, T> function, @NonNull Executor executor) {
+    return (FutureChain<T>) Futures.transformAsync(this, function, executor);
+  }
+
+  /**
+   * Returns a new {@code Future} whose result is derived from the result of this {@code Future}. If
+   * this input {@code Future} fails, the returned {@code Future} fails with the same exception (and
+   * the function is not invoked).
+   *
+   * @param function A Function to transform the results of this future to the results of the
+   *     returned future.
+   * @param executor Executor to run the function in.
+   * @return A future that holds result of the transformation.
+   */
+  @NonNull
+  public final <T> FutureChain<T> transform(
+      @NonNull Function1<? super V, T> function, @NonNull Executor executor) {
+    return (FutureChain<T>) Futures.transform(this, function, executor);
+  }
+
+  /**
+   * Registers separate success and failure callbacks to be run when this {@code Future}'s
+   * computation is {@linkplain java.util.concurrent.Future#isDone() complete} or, if the
+   * computation is already complete, immediately.
+   *
+   * @param callback The callback to invoke when this {@code Future} is completed.
+   * @param executor The executor to run {@code callback} when the future completes.
+   */
+  public final void addCallback(
+      @NonNull FutureCallback<? super V> callback, @NonNull Executor executor) {
+    Futures.addCallback(this, callback, executor);
+  }
+
+  FutureChain(@NonNull ListenableFuture<V> delegate) {
+    mDelegate = checkNotNull(delegate);
+  }
+
+  FutureChain() {
+    mDelegate =
+        CallbackToFutureAdapter.getFuture(
+            new CallbackToFutureAdapter.Resolver<V>() {
+              @Override
+              public Object attachCompleter(
+                  @NonNull CallbackToFutureAdapter.Completer<V> completer) {
+                Checks.checkState(mCompleter == null, "The result can only set once!");
+                mCompleter = completer;
+                return "FutureChain[" + FutureChain.this + "]";
+              }
+            });
+  }
+
+  @Override
+  public void addListener(@NonNull Runnable listener, @NonNull Executor executor) {
+    mDelegate.addListener(listener, executor);
+  }
+
+  @Override
+  public boolean cancel(boolean mayInterruptIfRunning) {
+    return mDelegate.cancel(mayInterruptIfRunning);
+  }
+
+  @Override
+  public boolean isCancelled() {
+    return mDelegate.isCancelled();
+  }
+
+  @Override
+  public boolean isDone() {
+    return mDelegate.isDone();
+  }
+
+  @Nullable
+  @Override
+  public V get() throws InterruptedException, ExecutionException {
+    return mDelegate.get();
+  }
+
+  @Nullable
+  @Override
+  public V get(long timeout, @NonNull TimeUnit unit)
+      throws InterruptedException, ExecutionException, TimeoutException {
+    return mDelegate.get(timeout, unit);
+  }
+
+  boolean set(@Nullable V value) {
+    if (mCompleter != null) {
+      return mCompleter.set(value);
+    }
+
+    return false;
+  }
+
+  boolean setException(@NonNull Throwable throwable) {
+    if (mCompleter != null) {
+      return mCompleter.setException(throwable);
+    }
+
+    return false;
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/Futures.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/Futures.java
new file mode 100644
index 000000000..b946a727a
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/Futures.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import kotlin.jvm.functions.Function1;
+
+/**
+ * Forked from androidx.camera package to avoid full Guava dependency.
+ *
+ * <p>Utility class for generating specific implementations of {@link ListenableFuture}.
+ */
+public final class Futures {
+
+  /**
+   * Returns an implementation of {@link ListenableFuture} which immediately contains a result.
+   *
+   * @param value The result that is immediately set on the future.
+   * @param <V> The type of the result.
+   * @return A future which immediately contains the result.
+   */
+  @NonNull
+  public static <V> ListenableFuture<V> immediateFuture(@Nullable V value) {
+    if (value == null) {
+      return ImmediateFuture.nullFuture();
+    }
+
+    return new ImmediateFuture.ImmediateSuccessfulFuture<>(value);
+  }
+
+  /**
+   * Returns an implementation of {@link ListenableFuture} which immediately contains an exception
+   * that will be thrown by {@link Future#get()}.
+   *
+   * @param cause The cause of the {@link ExecutionException} that will be thrown by {@link
+   *     Future#get()}.
+   * @param <V> The type of the result.
+   * @return A future which immediately contains an exception.
+   */
+  @NonNull
+  public static <V> ListenableFuture<V> immediateFailedFuture(@NonNull Throwable cause) {
+    return new ImmediateFuture.ImmediateFailedFuture<>(cause);
+  }
+
+  /**
+   * Returns a new {@code Future} whose result is asynchronously derived from the result of the
+   * given {@code Future}. If the given {@code Future} fails, the returned {@code Future} fails with
+   * the same exception (and the function is not invoked).
+   *
+   * @param input The future to transform
+   * @param function A function to transform the result of the input future to the result of the
+   *     output future
+   * @param executor Executor to run the function in.
+   * @return A future that holds result of the function (if the input succeeded) or the original
+   *     input's failure (if not)
+   */
+  @NonNull
+  public static <I, O> ListenableFuture<O> transformAsync(
+      @NonNull ListenableFuture<I> input,
+      @NonNull AsyncFunction<? super I, ? extends O> function,
+      @NonNull Executor executor) {
+    ChainingListenableFuture<I, O> output = new ChainingListenableFuture<I, O>(function, input);
+    input.addListener(output, executor);
+    return output;
+  }
+
+  /**
+   * Returns a new {@code Future} whose result is derived from the result of the given {@code
+   * Future}. If {@code input} fails, the returned {@code Future} fails with the same exception (and
+   * the function is not invoked)
+   *
+   * @param input The future to transform
+   * @param function A function to transform the results of the provided future to the results of
+   *     the returned future.
+   * @param executor Executor to run the function in.
+   * @return A future that holds result of the transformation.
+   */
+  @NonNull
+  public static <I, O> ListenableFuture<O> transform(
+      @NonNull ListenableFuture<I> input,
+      @NonNull Function1<? super I, ? extends O> function,
+      @NonNull Executor executor) {
+    checkNotNull(function);
+    return transformAsync(
+        input,
+        new AsyncFunction<I, O>() {
+
+          @NonNull
+          @Override
+          public ListenableFuture<O> apply(I input) {
+            return immediateFuture(function.invoke(input));
+          }
+        },
+        executor);
+  }
+
+  /**
+   * Registers separate success and failure callbacks to be run when the {@code Future}'s
+   * computation is {@linkplain java.util.concurrent.Future#isDone() complete} or, if the
+   * computation is already complete, immediately.
+   *
+   * @param future The future attach the callback to.
+   * @param callback The callback to invoke when {@code future} is completed.
+   * @param executor The executor to run {@code callback} when the future completes.
+   */
+  public static <V> void addCallback(
+      @NonNull final ListenableFuture<V> future,
+      @NonNull final FutureCallback<? super V> callback,
+      @NonNull Executor executor) {
+    checkNotNull(callback);
+    future.addListener(new CallbackListener<V>(future, callback), executor);
+  }
+
+  /** See {@link #addCallback(ListenableFuture, FutureCallback, Executor)} for behavioral notes. */
+  private static final class CallbackListener<V> implements Runnable {
+    final Future<V> mFuture;
+    final FutureCallback<? super V> mCallback;
+
+    CallbackListener(Future<V> future, FutureCallback<? super V> callback) {
+      mFuture = future;
+      mCallback = callback;
+    }
+
+    @Override
+    public void run() {
+      final V value;
+      try {
+        value = getDone(mFuture);
+      } catch (ExecutionException e) {
+        Throwable cause = e.getCause();
+        if (cause == null) {
+          mCallback.onFailure(e);
+        } else {
+          mCallback.onFailure(cause);
+        }
+        return;
+      } catch (RuntimeException | Error e) {
+        mCallback.onFailure(e);
+        return;
+      }
+      mCallback.onSuccess(value);
+    }
+
+    @Override
+    public String toString() {
+      return getClass().getSimpleName() + "," + mCallback;
+    }
+  }
+
+  /**
+   * Returns the result of the input {@code Future}, which must have already completed.
+   *
+   * <p>The benefits of this method are twofold. First, the name "getDone" suggests to readers that
+   * the {@code Future} is already done. Second, if buggy code calls {@code getDone} on a {@code
+   * Future} that is still pending, the program will throw instead of block.
+   *
+   * @throws ExecutionException if the {@code Future} failed with an exception
+   * @throws CancellationException if the {@code Future} was cancelled
+   * @throws IllegalStateException if the {@code Future} is not done
+   */
+  @Nullable
+  public static <V> V getDone(@NonNull Future<V> future) throws ExecutionException {
+    /*
+     * We throw IllegalStateException, since the call could succeed later. Perhaps we
+     * "should" throw IllegalArgumentException, since the call could succeed with a different
+     * argument. Those exceptions' docs suggest that either is acceptable. Google's Java
+     * Practices page recommends IllegalArgumentException here, in part to keep its
+     * recommendation simple: Static methods should throw IllegalStateException only when
+     * they use static state.
+     *
+     * Why do we deviate here? The answer: We want for fluentFuture.getDone() to throw the same
+     * exception as Futures.getDone(fluentFuture).
+     */
+    checkState(future.isDone(), "Future was expected to be done, " + future);
+    return getUninterruptibly(future);
+  }
+
+  /**
+   * Invokes {@code Future.}{@link Future#get() get()} uninterruptibly.
+   *
+   * @throws ExecutionException if the computation threw an exception
+   * @throws CancellationException if the computation was cancelled
+   */
+  @Nullable
+  public static <V> V getUninterruptibly(@NonNull Future<V> future) throws ExecutionException {
+    boolean interrupted = false;
+    try {
+      while (true) {
+        try {
+          return future.get();
+        } catch (InterruptedException e) {
+          interrupted = true;
+        }
+      }
+    } finally {
+      if (interrupted) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  /** Should not be instantiated. */
+  private Futures() {}
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/ImmediateFuture.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/ImmediateFuture.java
new file mode 100644
index 000000000..cd0190409
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/ImmediateFuture.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * An implementation of {@link ListenableFuture} which immediately contains a result.
+ *
+ * <p>This implementation is based off of the Guava ImmediateSuccessfulFuture class.
+ *
+ * @param <V> The type of the value stored in the future.
+ */
+abstract class ImmediateFuture<V> implements ListenableFuture<V> {
+
+  private static final String TAG = "ImmediateFuture";
+
+  /**
+   * Returns a future that contains a null value.
+   *
+   * <p>This should be used any time a null value is needed as it uses a static ListenableFuture
+   * that contains null, and thus will not allocate.
+   */
+  public static <V> ListenableFuture<V> nullFuture() {
+    @SuppressWarnings({"unchecked", "rawtypes"}) // Safe since null can be cast to any type
+    ListenableFuture<V> typedNull = (ListenableFuture) ImmediateSuccessfulFuture.NULL_FUTURE;
+    return typedNull;
+  }
+
+  @Override
+  public void addListener(@NonNull Runnable listener, @NonNull Executor executor) {
+    checkNotNull(listener);
+    checkNotNull(executor);
+
+    try {
+      executor.execute(listener);
+    } catch (RuntimeException e) {
+      // ListenableFuture does not throw runtime exceptions, so swallow the exception and
+      // log it here.
+      Log.e(
+          TAG,
+          "Experienced RuntimeException while attempting to notify "
+              + listener
+              + " on Executor "
+              + executor,
+          e);
+    }
+  }
+
+  @Override
+  public boolean cancel(boolean mayInterruptIfRunning) {
+    return false;
+  }
+
+  @Override
+  public boolean isCancelled() {
+    return false;
+  }
+
+  @Override
+  public boolean isDone() {
+    return true;
+  }
+
+  @Override
+  @Nullable
+  public abstract V get() throws ExecutionException;
+
+  @Override
+  @Nullable
+  public V get(long timeout, @NonNull TimeUnit unit) throws ExecutionException {
+    checkNotNull(unit);
+    return get();
+  }
+
+  static final class ImmediateSuccessfulFuture<V> extends ImmediateFuture<V> {
+
+    static final ImmediateFuture<Object> NULL_FUTURE = new ImmediateSuccessfulFuture<>(null);
+
+    @Nullable private final V mValue;
+
+    ImmediateSuccessfulFuture(@Nullable V value) {
+      mValue = value;
+    }
+
+    @Nullable
+    @Override
+    public V get() {
+      return mValue;
+    }
+
+    @Override
+    public String toString() {
+      // Behaviour analogous to AbstractResolvableFuture#toString().
+      return super.toString() + "[status=SUCCESS, result=[" + mValue + "]]";
+    }
+  }
+
+  static class ImmediateFailedFuture<V> extends ImmediateFuture<V> {
+
+    @NonNull private final Throwable mCause;
+
+    ImmediateFailedFuture(@NonNull Throwable cause) {
+      mCause = cause;
+    }
+
+    @Nullable
+    @Override
+    public V get() throws ExecutionException {
+      throw new ExecutionException(mCause);
+    }
+
+    @Override
+    @NonNull
+    public String toString() {
+      // Behaviour analogous to AbstractResolvableFuture#toString().
+      return super.toString() + "[status=FAILURE, cause=[" + mCause + "]]";
+    }
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/ListFuture.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/ListFuture.java
new file mode 100644
index 000000000..bae261ed3
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/ListFuture.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.espresso.web.util.concurrent;
+
+import static androidx.test.espresso.web.util.concurrent.Futures.getUninterruptibly;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.concurrent.futures.CallbackToFutureAdapter;
+import androidx.test.platform.concurrent.DirectExecutor;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * The Class is based on the ListFuture in Guava and to use the CallbackToFutureAdapter instead of
+ * the AbstractFuture.
+ *
+ * <p>Class that implements {@link Futures#allAsList(Collection)} and {@link
+ * Futures#successfulAsList(Collection)}. The idea is to create a (null-filled) List and register a
+ * listener with each component future to fill out the value in the List when that future completes.
+ */
+class ListFuture<V> implements ListenableFuture<List<V>> {
+  @Nullable List<? extends ListenableFuture<? extends V>> futures;
+  @Nullable List<V> values;
+  private final boolean allMustSucceed;
+  @NonNull private final AtomicInteger remaining;
+  @NonNull private final ListenableFuture<List<V>> result;
+  CallbackToFutureAdapter.Completer<List<V>> resultNotifier;
+
+  /**
+   * Constructor.
+   *
+   * @param futures all the futures to build the list from
+   * @param allMustSucceed whether a single failure or cancellation should propagate to this future
+   * @param listenerExecutor used to run listeners on all the passed in futures.
+   */
+  ListFuture(
+      @NonNull List<? extends ListenableFuture<? extends V>> futures,
+      boolean allMustSucceed,
+      @NonNull Executor listenerExecutor) {
+    this.futures = checkNotNull(futures);
+    values = new ArrayList<>(futures.size());
+    this.allMustSucceed = allMustSucceed;
+    remaining = new AtomicInteger(futures.size());
+    result =
+        CallbackToFutureAdapter.getFuture(
+            new CallbackToFutureAdapter.Resolver<List<V>>() {
+              @Override
+              public Object attachCompleter(
+                  @NonNull CallbackToFutureAdapter.Completer<List<V>> completer) {
+                checkState(resultNotifier == null, "The result can only set once!");
+                resultNotifier = completer;
+                return "ListFuture[" + this + "]";
+              }
+            });
+
+    init(listenerExecutor);
+  }
+
+  private void init(@NonNull Executor listenerExecutor) {
+    // First, schedule cleanup to execute when the Future is done.
+    addListener(
+        new Runnable() {
+          @Override
+          public void run() {
+            // By now the mValues array has either been set as the Future's value,
+            // or (in case of failure) is no longer useful.
+            ListFuture.this.values = null;
+
+            // Let go of the memory held by other mFutures
+            ListFuture.this.futures = null;
+          }
+        },
+        DirectExecutor.INSTANCE);
+
+    // Now begin the "real" initialization.
+
+    // Corner case: List is empty.
+    if (futures.isEmpty()) {
+      resultNotifier.set(new ArrayList<>(values));
+      return;
+    }
+
+    // Populate the results list with null initially.
+    for (int i = 0; i < futures.size(); ++i) {
+      values.add(null);
+    }
+
+    // Register a listener on each Future in the list to update
+    // the state of this future.
+    // Note that if all the mFutures on the list are done prior to completing
+    // this loop, the last call to addListener() will callback to
+    // setOneValue(), transitively call our cleanup listener, and set
+    // mFutures to null.
+    // We store a reference to mFutures to avoid the NPE.
+    List<? extends ListenableFuture<? extends V>> localFutures = futures;
+    for (int i = 0; i < localFutures.size(); i++) {
+      final ListenableFuture<? extends V> listenable = localFutures.get(i);
+      final int index = i;
+      listenable.addListener(
+          new Runnable() {
+            @Override
+            public void run() {
+              setOneValue(index, listenable);
+            }
+          },
+          listenerExecutor);
+    }
+  }
+
+  /** Sets the value at the given index to that of the given future. */
+  void setOneValue(int index, @NonNull Future<? extends V> future) {
+    List<V> localValues = values;
+    if (isDone() || localValues == null) {
+      // Some other future failed or has been cancelled, causing this one to
+      // also be cancelled or have an exception set. This should only happen
+      // if mAllMustSucceed is true.
+      checkState(allMustSucceed, "Future was done before all dependencies completed");
+      return;
+    }
+
+    try {
+      checkState(future.isDone(), "Tried to set value from future which is not done");
+      localValues.set(index, getUninterruptibly(future));
+    } catch (CancellationException e) {
+      if (allMustSucceed) {
+        // Set ourselves as cancelled. Let the input futures keep running
+        // as some of them may be used elsewhere.
+        // (Currently we don't override interruptTask, so
+        // mayInterruptIfRunning==false isn't technically necessary.)
+        cancel(false);
+      }
+    } catch (ExecutionException e) {
+      if (allMustSucceed) {
+        // As soon as the first one fails, throw the exception up.
+        // The mResult of all other inputs is then ignored.
+        resultNotifier.setException(e.getCause());
+      }
+    } catch (RuntimeException e) {
+      if (allMustSucceed) {
+        resultNotifier.setException(e);
+      }
+    } catch (Error e) {
+      // Propagate errors up ASAP - our superclass will rethrow the error
+      resultNotifier.setException(e);
+    } finally {
+      int newRemaining = remaining.decrementAndGet();
+      checkState(newRemaining >= 0, "Less than 0 remaining futures");
+      if (newRemaining == 0) {
+        localValues = values;
+        if (localValues != null) {
+          resultNotifier.set(new ArrayList<>(localValues));
+        } else {
+          checkState(isDone());
+        }
+      }
+    }
+  }
+
+  @Override
+  public void addListener(@NonNull Runnable listener, @NonNull Executor executor) {
+    result.addListener(listener, executor);
+  }
+
+  @Override
+  public boolean cancel(boolean mayInterruptIfRunning) {
+    if (futures != null) {
+      for (ListenableFuture<? extends V> f : futures) {
+        f.cancel(mayInterruptIfRunning);
+      }
+    }
+
+    return result.cancel(mayInterruptIfRunning);
+  }
+
+  @Override
+  public boolean isCancelled() {
+    return result.isCancelled();
+  }
+
+  @Override
+  public boolean isDone() {
+    return result.isDone();
+  }
+
+  @Override
+  @Nullable
+  public List<V> get() throws InterruptedException, ExecutionException {
+    callAllGets();
+
+    // This may still block in spite of the calls above, as the listeners may
+    // be scheduled for execution in other threads.
+    return result.get();
+  }
+
+  @Override
+  public List<V> get(long timeout, @NonNull TimeUnit unit)
+      throws InterruptedException, ExecutionException, TimeoutException {
+    return result.get(timeout, unit);
+  }
+
+  /**
+   * Calls the get method of all dependency futures to work around a bug in some ListenableFutures
+   * where the listeners aren't called until get() is called.
+   */
+  private void callAllGets() throws InterruptedException {
+    List<? extends ListenableFuture<? extends V>> oldFutures = futures;
+    if (oldFutures != null && !isDone()) {
+      for (ListenableFuture<? extends V> future : oldFutures) {
+        // We wait for a little while for the future, but if it's not done,
+        // we check that no other futures caused a cancellation or failure.
+        // This can introduce a delay of up to 10ms in reporting an exception.
+        while (!future.isDone()) {
+          try {
+            future.get();
+          } catch (Error e) {
+            throw e;
+          } catch (InterruptedException e) {
+            throw e;
+          } catch (Throwable e) {
+            // ExecutionException / CancellationException / RuntimeException
+            if (allMustSucceed) {
+              return;
+            } else {
+              continue;
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/espresso/web/java/androidx/test/espresso/web/util/concurrent/package-info.java b/espresso/web/java/androidx/test/espresso/web/util/concurrent/package-info.java
new file mode 100644
index 000000000..d5b9a3502
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/util/concurrent/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+package androidx.test.espresso.web.util.concurrent;
+
+import androidx.annotation.RestrictTo;
diff --git a/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD b/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD
new file mode 100644
index 000000000..bf02486b1
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD
@@ -0,0 +1,29 @@
+# Description:
+#   Exposes webdriver automation js fragments as atoms.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+    default_visibility = ["//visibility:public"],
+)
+
+# To generate WebDriverAtomScripts.java.opensource:
+# $ blaze build blaze-genfiles/tools/android/webdriver/atom/WebDriverAtomScripts.java
+# $ cp blaze-genfiles/tools/android/webdriver/atom/WebDriverAtomScripts.java third_party/android/androidx_test/espresso/web/java/androidx/test/espresso/web/webdriver/WebDriverAtomScripts.java.opensource
+
+android_library(
+    name = "webdriver",
+    srcs = glob(
+        ["*java"],
+    ),
+    deps = [
+        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
+        "//espresso/web/java/androidx/test/espresso/web/model",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+    ],
+)
diff --git a/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD.bazel b/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD.bazel
deleted file mode 100644
index f36e2deeb..000000000
--- a/espresso/web/java/androidx/test/espresso/web/webdriver/BUILD.bazel
+++ /dev/null
@@ -1,44 +0,0 @@
-# Description:
-#   Exposes webdriver automation js fragments as atoms.
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = ["//visibility:public"])
-
-REMOTE_WEB_DRIVER_ATOMS = [
-    "RemoteWebDriverAtoms.java",
-    "*RemoteMessage.java",
-]
-
-android_library(
-    name = "webdriver",
-    srcs = glob(
-        ["*java"],
-        exclude = REMOTE_WEB_DRIVER_ATOMS,
-    ),
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote/annotation:remote_msg_annotations",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "//opensource/java_lib:WebDriverScripts",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "remote_webdriver_atoms",
-    srcs = glob(
-        REMOTE_WEB_DRIVER_ATOMS,
-    ),
-    deps = [
-        ":webdriver",
-        "//:androidx_annotation",
-        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:reflectionUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/web/java/androidx/test/espresso/web/proto/webdriver:web_driver_atoms_proto_android_pb3",
-        "@maven//:com_google_guava_guava",
-    ],
-)
diff --git a/espresso/web/java/androidx/test/espresso/web/webdriver/DriverAtoms.java b/espresso/web/java/androidx/test/espresso/web/webdriver/DriverAtoms.java
index d5f39f1c4..9c6f5f3f7 100644
--- a/espresso/web/java/androidx/test/espresso/web/webdriver/DriverAtoms.java
+++ b/espresso/web/java/androidx/test/espresso/web/webdriver/DriverAtoms.java
@@ -17,7 +17,10 @@
 package androidx.test.espresso.web.webdriver;
 
 import static androidx.test.espresso.web.model.Atoms.castOrDie;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.Collections.emptyList;
+import static java.util.Collections.singletonList;
+import static java.util.Collections.singletonMap;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.remote.annotation.RemoteMsgConstructor;
@@ -28,8 +31,8 @@
 import androidx.test.espresso.web.model.SimpleAtom;
 import androidx.test.espresso.web.model.TransformingAtom;
 import androidx.test.espresso.web.model.WindowReference;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -117,9 +120,7 @@ public static Atom<List<ElementReference>> findMultipleElements(
   private static Map<String, String> makeLocatorJSON(Locator locator, String value) {
     checkNotNull(locator);
     checkNotNull(value);
-    Map<String, String> map = Maps.newHashMap();
-    map.put(locator.getType(), value);
-    return map;
+    return singletonMap(locator.getType(), value);
   }
 
   @VisibleForTesting
@@ -140,7 +141,7 @@ static final class FindElementSimpleAtom extends SimpleAtom {
     @Override
     protected List<Object> getNonContextualArguments() {
       final Map<String, String> locatorJson = makeLocatorJSON(Locator.forType(locatorType), value);
-      return Lists.newArrayList((Object) locatorJson);
+      return singletonList(locatorJson);
     }
   }
 
@@ -196,7 +197,7 @@ public void handleNoElementReference() {
 
     @Override
     public List<Object> getNonContextualArguments() {
-      return Lists.newArrayList((Object) text);
+      return singletonList(text);
     }
   }
 
@@ -315,7 +316,7 @@ private FrameByIndexSimpleAtom(int index) {
 
     @Override
     public List<Object> getNonContextualArguments() {
-      return Lists.newArrayList((Object) index);
+      return singletonList(index);
     }
   }
 
@@ -336,9 +337,7 @@ private FrameByIndexWithRootSimpleAtom(int index, WindowReference root) {
 
     @Override
     public List<Object> getNonContextualArguments() {
-      List<Object> args = Lists.newArrayList((Object) index);
-      args.add(root);
-      return args;
+      return Arrays.asList(index, root);
     }
   }
 
@@ -376,7 +375,7 @@ private FrameByIdOrNameSimpleAtom(String idOrName) {
 
     @Override
     public List<Object> getNonContextualArguments() {
-      return Lists.newArrayList((Object) idOrName);
+      return singletonList(idOrName);
     }
   }
 
@@ -399,9 +398,7 @@ private FrameByIdOrNameWithRootSimpleAtom(String idOrName, WindowReference root)
 
     @Override
     public List<Object> getNonContextualArguments() {
-      List<Object> args = Lists.newArrayList((Object) idOrName);
-      args.add(root);
-      return args;
+      return Arrays.asList(idOrName, root);
     }
   }
 
@@ -443,7 +440,7 @@ private FindElementsScriptSimpleAtom(String locatorType, String value) {
 
     @Override
     public List<Object> getNonContextualArguments() {
-      return Lists.newArrayList((Object) makeLocatorJSON(Locator.forType(locatorType), value));
+      return singletonList(makeLocatorJSON(Locator.forType(locatorType), value));
     }
   }
 
@@ -488,10 +485,10 @@ private ElementReferenceListAtom(String locatorType, String value) {
     public List<ElementReference> apply(Evaluation e) {
       Object rawValues = e.getValue();
       if (null == rawValues) {
-        return Lists.newArrayList();
+        return emptyList();
       }
       if (rawValues instanceof Iterable) {
-        List<ElementReference> references = Lists.newArrayList();
+        List<ElementReference> references = new ArrayList<>();
         for (Object rawValue : ((Iterable) rawValues)) {
           if (rawValue instanceof ElementReference) {
             references.add((ElementReference) rawValue);
diff --git a/espresso/web/java/androidx/test/espresso/web/webdriver/WebDriverAtomScripts.java b/espresso/web/java/androidx/test/espresso/web/webdriver/WebDriverAtomScripts.java
new file mode 100755
index 000000000..3db3a3af0
--- /dev/null
+++ b/espresso/web/java/androidx/test/espresso/web/webdriver/WebDriverAtomScripts.java
@@ -0,0 +1,7398 @@
+package androidx.test.espresso.web.webdriver;
+// GENERATED CODE DO NOT EDIT
+final class WebDriverAtomScripts {
+/* field: CLEAR_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String CLEAR_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar h;function aa(a" +
+    "){var b=0;return function(){return b<a.length?{done:!1,value:a[b++" +
+    "]}:{done:!0}}}var ba=\"function\"==typeof Object.defineProperties?Ob" +
+    "ject.defineProperty:function(a,b,c){if(a==Array.prototype||a==Obje" +
+    "ct.prototype)return a;a[b]=c.value;return a};\nfunction ca(a){a=[\"o" +
+    "bject\"==typeof globalThis&&globalThis,a,\"object\"==typeof window&&w" +
+    "indow,\"object\"==typeof self&&self,\"object\"==typeof global&&global]" +
+    ";for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return " +
+    "c}throw Error(\"Cannot find global object\");}var da=ca(this);functi" +
+    "on ea(a,b){if(b)a:{var c=da;a=a.split(\".\");for(var d=0;d<a.length-" +
+    "1;d++){var e=a[d];if(!(e in c))break a;c=c[e]}a=a[a.length-1];d=c[" +
+    "a];b=b(d);b!=d&&null!=b&&ba(c,a,{configurable:!0,writable:!0,value" +
+    ":b})}}\nea(\"Symbol\",function(a){function b(f){if(this instanceof b)" +
+    "throw new TypeError(\"Symbol is not a constructor\");return new c(d+" +
+    "(f||\"\")+\"_\"+e++,f)}function c(f,g){this.g=f;ba(this,\"description\"," +
+    "{configurable:!0,writable:!0,value:g})}if(a)return a;c.prototype.t" +
+    "oString=function(){return this.g};var d=\"jscomp_symbol_\"+(1E9*Math" +
+    ".random()>>>0)+\"_\",e=0;return b});\nea(\"Symbol.iterator\",function(a" +
+    "){if(a)return a;a=Symbol(\"Symbol.iterator\");for(var b=\"Array Int8A" +
+    "rray Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Arra" +
+    "y Uint32Array Float32Array Float64Array\".split(\" \"),c=0;c<b.length" +
+    ";c++){var d=da[b[c]];\"function\"===typeof d&&\"function\"!=typeof d.p" +
+    "rototype[a]&&ba(d.prototype,a,{configurable:!0,writable:!0,value:f" +
+    "unction(){return fa(aa(this))}})}return a});function fa(a){a={next" +
+    ":a};a[Symbol.iterator]=function(){return this};return a}\nvar ha=\"f" +
+    "unction\"==typeof Object.create?Object.create:function(a){function " +
+    "b(){}b.prototype=a;return new b},ia;if(\"function\"==typeof Object.s" +
+    "etPrototypeOf)ia=Object.setPrototypeOf;else{var ja;a:{var ka={a:!0" +
+    "},la={};try{la.__proto__=ka;ja=la.a;break a}catch(a){}ja=!1}ia=ja?" +
+    "function(a,b){a.__proto__=b;if(a.__proto__!==b)throw new TypeError" +
+    "(a+\" is not extensible\");return a}:null}var ma=ia;\nfunction na(a,b" +
+    "){a.prototype=ha(b.prototype);a.prototype.constructor=a;if(ma)ma(a" +
+    ",b);else for(var c in b)if(\"prototype\"!=c)if(Object.defineProperti" +
+    "es){var d=Object.getOwnPropertyDescriptor(b,c);d&&Object.definePro" +
+    "perty(a,c,d)}else a[c]=b[c];a.T=b.prototype}function oa(a,b){a ins" +
+    "tanceof String&&(a+=\"\");var c=0,d=!1,e={next:function(){if(!d&&c<a" +
+    ".length){var f=c++;return{value:b(f,a[f]),done:!1}}d=!0;return{don" +
+    "e:!0,value:void 0}}};e[Symbol.iterator]=function(){return e};retur" +
+    "n e}\nea(\"Array.prototype.keys\",function(a){return a?a:function(){r" +
+    "eturn oa(this,function(b){return b})}});ea(\"Array.from\",function(a" +
+    "){return a?a:function(b,c,d){c=null!=c?c:function(k){return k};var" +
+    " e=[],f=\"undefined\"!=typeof Symbol&&Symbol.iterator&&b[Symbol.iter" +
+    "ator];if(\"function\"==typeof f){b=f.call(b);for(var g=0;!(f=b.next(" +
+    ")).done;)e.push(c.call(d,f.value,g++))}else for(f=b.length,g=0;g<f" +
+    ";g++)e.push(c.call(d,b[g],g));return e}});var l=this||self;\nfuncti" +
+    "on pa(a,b){a=a.split(\".\");var c=l;a[0]in c||\"undefined\"==typeof c." +
+    "execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d=a.shi" +
+    "ft());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]?c=c[d" +
+    "]:c=c[d]={}:c[d]=b}function qa(a,b,c){return a.call.apply(a.bind,a" +
+    "rguments)}\nfunction ra(a,b,c){if(!a)throw Error();if(2<arguments.l" +
+    "ength){var d=Array.prototype.slice.call(arguments,2);return functi" +
+    "on(){var e=Array.prototype.slice.call(arguments);Array.prototype.u" +
+    "nshift.apply(e,d);return a.apply(b,e)}}return function(){return a." +
+    "apply(b,arguments)}}function sa(a,b,c){Function.prototype.bind&&-1" +
+    "!=Function.prototype.bind.toString().indexOf(\"native code\")?sa=qa:" +
+    "sa=ra;return sa.apply(null,arguments)}\nfunction ta(a,b){var c=Arra" +
+    "y.prototype.slice.call(arguments,1);return function(){var d=c.slic" +
+    "e();d.push.apply(d,arguments);return a.apply(this,d)}}function m(a" +
+    ",b){function c(){}c.prototype=b.prototype;a.T=b.prototype;a.protot" +
+    "ype=new c;a.prototype.constructor=a;a.V=function(d,e,f){for(var g=" +
+    "Array(arguments.length-2),k=2;k<arguments.length;k++)g[k-2]=argume" +
+    "nts[k];return b.prototype[e].apply(d,g)}};function ua(a,b){if(Erro" +
+    "r.captureStackTrace)Error.captureStackTrace(this,ua);else{var c=Er" +
+    "ror().stack;c&&(this.stack=c)}a&&(this.message=String(a));void 0!=" +
+    "=b&&(this.cause=b)}m(ua,Error);ua.prototype.name=\"CustomError\";fun" +
+    "ction va(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length-1,e=0;e<d;e+" +
+    "+)c+=a[e]+(e<b.length?b[e]:\"%s\");ua.call(this,c+a[d])}m(va,ua);va." +
+    "prototype.name=\"AssertionError\";function wa(a,b,c){if(!a){var d=\"A" +
+    "ssertion failed\";if(b){d+=\": \"+b;var e=Array.prototype.slice.call(" +
+    "arguments,2)}throw new va(\"\"+d,e||[]);}};function xa(a,b){if(\"stri" +
+    "ng\"===typeof a)return\"string\"!==typeof b||1!=b.length?-1:a.indexOf" +
+    "(b,0);for(var c=0;c<a.length;c++)if(c in a&&a[c]===b)return c;retu" +
+    "rn-1}function n(a,b){for(var c=a.length,d=\"string\"===typeof a?a.sp" +
+    "lit(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[e],e,a)}function q(a" +
+    ",b,c){var d=c;n(a,function(e,f){d=b.call(void 0,d,e,f,a)});return " +
+    "d}function v(a,b){for(var c=a.length,d=\"string\"===typeof a?a.split" +
+    "(\"\"):a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a))return!0;ret" +
+    "urn!1}\nfunction ya(a,b){for(var c=a.length,d=\"string\"===typeof a?a" +
+    ".split(\"\"):a,e=0;e<c;e++)if(e in d&&!b.call(void 0,d[e],e,a))retur" +
+    "n!1;return!0}function za(a){return Array.prototype.concat.apply([]" +
+    ",arguments)}function Aa(a,b,c){wa(null!=a.length);return 2>=argume" +
+    "nts.length?Array.prototype.slice.call(a,b):Array.prototype.slice.c" +
+    "all(a,b,c)};function Ba(a,b){this.x=void 0!==a?a:0;this.y=void 0!=" +
+    "=b?b:0}h=Ba.prototype;h.toString=function(){return\"(\"+this.x+\", \"+" +
+    "this.y+\")\"};h.ceil=function(){this.x=Math.ceil(this.x);this.y=Math" +
+    ".ceil(this.y);return this};h.floor=function(){this.x=Math.floor(th" +
+    "is.x);this.y=Math.floor(this.y);return this};h.round=function(){th" +
+    "is.x=Math.round(this.x);this.y=Math.round(this.y);return this};h.s" +
+    "cale=function(a,b){this.x*=a;this.y*=\"number\"===typeof b?b:a;retur" +
+    "n this};var Ca=String.prototype.trim?function(a){return a.trim()}:" +
+    "function(a){return/^[\\s\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};fun" +
+    "ction Da(a,b){return a<b?-1:a>b?1:0};function Ea(){var a=l.navigat" +
+    "or;return a&&(a=a.userAgent)?a:\"\"};var Fa=-1!=Ea().indexOf(\"Macint" +
+    "osh\"),Ga=-1!=Ea().indexOf(\"Windows\");function Ha(a,b){this.width=a" +
+    ";this.height=b}h=Ha.prototype;h.toString=function(){return\"(\"+this" +
+    ".width+\" x \"+this.height+\")\"};h.aspectRatio=function(){return this" +
+    ".width/this.height};h.ceil=function(){this.width=Math.ceil(this.wi" +
+    "dth);this.height=Math.ceil(this.height);return this};h.floor=funct" +
+    "ion(){this.width=Math.floor(this.width);this.height=Math.floor(thi" +
+    "s.height);return this};h.round=function(){this.width=Math.round(th" +
+    "is.width);this.height=Math.round(this.height);return this};\nh.scal" +
+    "e=function(a,b){this.width*=a;this.height*=\"number\"===typeof b?b:a" +
+    ";return this};function Ia(a){return String(a).replace(/\\-([a-z])/g" +
+    ",function(b,c){return c.toUpperCase()})};function Ja(a){for(;a&&1!" +
+    "=a.nodeType;)a=a.previousSibling;return a}function Ka(a,b){if(!a||" +
+    "!b)return!1;if(a.contains&&1==b.nodeType)return a==b||a.contains(b" +
+    ");if(\"undefined\"!=typeof a.compareDocumentPosition)return a==b||!!" +
+    "(a.compareDocumentPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;ret" +
+    "urn b==a}\nfunction La(a,b){if(a==b)return 0;if(a.compareDocumentPo" +
+    "sition)return a.compareDocumentPosition(b)&2?1:-1;if(\"sourceIndex\"" +
+    "in a||a.parentNode&&\"sourceIndex\"in a.parentNode){var c=1==a.nodeT" +
+    "ype,d=1==b.nodeType;if(c&&d)return a.sourceIndex-b.sourceIndex;var" +
+    " e=a.parentNode,f=b.parentNode;return e==f?Ma(a,b):!c&&Ka(e,b)?-1*" +
+    "Na(a,b):!d&&Ka(f,a)?Na(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.s" +
+    "ourceIndex:f.sourceIndex)}d=x(a);c=d.createRange();c.selectNode(a)" +
+    ";c.collapse(!0);a=d.createRange();a.selectNode(b);\na.collapse(!0);" +
+    "return c.compareBoundaryPoints(l.Range.START_TO_END,a)}function Na" +
+    "(a,b){var c=a.parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=" +
+    "b.parentNode;return Ma(b,a)}function Ma(a,b){for(;b=b.previousSibl" +
+    "ing;)if(b==a)return-1;return 1}function x(a){wa(a,\"Node cannot be " +
+    "null or undefined.\");return 9==a.nodeType?a:a.ownerDocument||a.doc" +
+    "ument}function Oa(a,b,c){a&&!c&&(a=a.parentNode);for(c=0;a;){wa(\"p" +
+    "arentNode\"!=a.name);if(b(a))return a;a=a.parentNode;c++}return nul" +
+    "l}\nfunction Pa(a){try{var b=a&&a.activeElement;return b&&b.nodeNam" +
+    "e?b:null}catch(c){return null}}function Qa(a){this.g=a||l.document" +
+    "||document}Qa.prototype.getElementsByTagName=function(a,b){return(" +
+    "b||this.g).getElementsByTagName(String(a))};function Ra(a,b,c,d){t" +
+    "his.top=a;this.g=b;this.h=c;this.left=d}h=Ra.prototype;h.toString=" +
+    "function(){return\"(\"+this.top+\"t, \"+this.g+\"r, \"+this.h+\"b, \"+this" +
+    ".left+\"l)\"};h.ceil=function(){this.top=Math.ceil(this.top);this.g=" +
+    "Math.ceil(this.g);this.h=Math.ceil(this.h);this.left=Math.ceil(thi" +
+    "s.left);return this};h.floor=function(){this.top=Math.floor(this.t" +
+    "op);this.g=Math.floor(this.g);this.h=Math.floor(this.h);this.left=" +
+    "Math.floor(this.left);return this};\nh.round=function(){this.top=Ma" +
+    "th.round(this.top);this.g=Math.round(this.g);this.h=Math.round(thi" +
+    "s.h);this.left=Math.round(this.left);return this};h.scale=function" +
+    "(a,b){b=\"number\"===typeof b?b:a;this.left*=a;this.g*=a;this.top*=b" +
+    ";this.h*=b;return this};function y(a,b,c,d){this.left=a;this.top=b" +
+    ";this.width=c;this.height=d}h=y.prototype;h.toString=function(){re" +
+    "turn\"(\"+this.left+\", \"+this.top+\" - \"+this.width+\"w x \"+this.heigh" +
+    "t+\"h)\"};h.ceil=function(){this.left=Math.ceil(this.left);this.top=" +
+    "Math.ceil(this.top);this.width=Math.ceil(this.width);this.height=M" +
+    "ath.ceil(this.height);return this};h.floor=function(){this.left=Ma" +
+    "th.floor(this.left);this.top=Math.floor(this.top);this.width=Math." +
+    "floor(this.width);this.height=Math.floor(this.height);return this}" +
+    ";\nh.round=function(){this.left=Math.round(this.left);this.top=Math" +
+    ".round(this.top);this.width=Math.round(this.width);this.height=Mat" +
+    "h.round(this.height);return this};h.scale=function(a,b){b=\"number\"" +
+    "===typeof b?b:a;this.left*=a;this.width*=a;this.top*=b;this.height" +
+    "*=b;return this};/*\n\n Copyright 2014 Software Freedom Conservancy\n" +
+    "\n Licensed under the Apache License, Version 2.0 (the \"License\");\n" +
+    " you may not use this file except in compliance with the License.\n" +
+    " You may obtain a copy of the License at\n\n      http://www.apache." +
+    "org/licenses/LICENSE-2.0\n\n Unless required by applicable law or ag" +
+    "reed to in writing, software\n distributed under the License is dis" +
+    "tributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF" +
+    " ANY KIND, either express or implied.\n See the License for the spe" +
+    "cific language governing permissions and\n limitations under the Li" +
+    "cense.\n*/\nvar Sa=window;function z(a,b){this.code=a;this.g=Ta[a]||" +
+    "\"unknown error\";this.message=b||\"\";a=this.g.replace(/((?:^|\\s+)[a-" +
+    "z])/g,function(c){return c.toUpperCase().replace(/^[\\s\\xa0]+/g,\"\")" +
+    "});b=a.length-5;if(0>b||a.indexOf(\"Error\",b)!=b)a+=\"Error\";this.na" +
+    "me=a;a=Error(this.message);a.name=this.name;this.stack=a.stack||\"\"" +
+    "}m(z,Error);\nvar Ta={15:\"element not selectable\",11:\"element not v" +
+    "isible\",31:\"unknown error\",30:\"unknown error\",24:\"invalid cookie d" +
+    "omain\",29:\"invalid element coordinates\",12:\"invalid element state\"" +
+    ",32:\"invalid selector\",51:\"invalid selector\",52:\"invalid selector\"" +
+    ",17:\"javascript error\",405:\"unsupported operation\",34:\"move target" +
+    " out of bounds\",27:\"no such alert\",7:\"no such element\",8:\"no such " +
+    "frame\",23:\"no such window\",28:\"script timeout\",33:\"session not cre" +
+    "ated\",10:\"stale element reference\",21:\"timeout\",25:\"unable to set " +
+    "cookie\",\n26:\"unexpected alert open\",13:\"unknown error\",9:\"unknown " +
+    "command\"};z.prototype.toString=function(){return this.name+\": \"+th" +
+    "is.message};function Ua(a){return(a=a.exec(Ea()))?a[1]:\"\"}Ua(/Andr" +
+    "oid\\s+([0-9.]+)/)||Ua(/Version\\/([0-9.]+)/);function Va(a){var b=0" +
+    ",c=Ca(String(Wa)).split(\".\");a=Ca(String(a)).split(\".\");for(var d=" +
+    "Math.max(c.length,a.length),e=0;0==b&&e<d;e++){var f=c[e]||\"\",g=a[" +
+    "e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D*)(" +
+    ".*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].length&&0==g[0].length)brea" +
+    "k;b=Da(0==f[1].length?0:parseInt(f[1],10),0==g[1].length?0:parseIn" +
+    "t(g[1],10))||Da(0==f[2].length,0==g[2].length)||Da(f[2],g[2]);f=f[" +
+    "3];g=g[3]}while(0==b)}}var Xa=/Android\\s+([0-9\\.]+)/.exec(Ea()),Wa" +
+    "=Xa?Xa[1]:\"0\";Va(2.3);\nVa(4);/*\n\n The MIT License\n\n Copyright (c) " +
+    "2007 Cybozu Labs, Inc.\n Copyright (c) 2012 Google Inc.\n\n Permissio" +
+    "n is hereby granted, free of charge, to any person obtaining a cop" +
+    "y\n of this software and associated documentation files (the \"Softw" +
+    "are\"), to\n deal in the Software without restriction, including wit" +
+    "hout limitation the\n rights to use, copy, modify, merge, publish, " +
+    "distribute, sublicense, and/or\n sell copies of the Software, and t" +
+    "o permit persons to whom the Software is\n furnished to do so, subj" +
+    "ect to the following conditions:\n\n The above copyright notice and " +
+    "this permission notice shall be included in\n all copies or substan" +
+    "tial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\"," +
+    " WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT " +
+    "NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A P" +
+    "ARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTH" +
+    "ORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER" +
+    "\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, " +
+    "ARISING\n FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE US" +
+    "E OR OTHER DEALINGS\n IN THE SOFTWARE.\n*/\nfunction Ya(a,b,c){this.g" +
+    "=a;this.j=b||1;this.h=c||1};function Za(a){this.h=a;this.g=0}funct" +
+    "ion $a(a){a=a.match(ab);for(var b=0;b<a.length;b++)bb.test(a[b])&&" +
+    "a.splice(b,1);return new Za(a)}var ab=RegExp(\"\\\\$?(?:(?![0-9-])[\\\\" +
+    "w-]+:)?(?![0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\.\\\\d+" +
+    "|\\\"[^\\\"]*\\\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),bb=/^\\s/;function A(a,b){r" +
+    "eturn a.h[a.g+(b||0)]}Za.prototype.next=function(){return this.h[t" +
+    "his.g++]};function cb(a){return a.h.length<=a.g};function C(a){var" +
+    " b=null,c=a.nodeType;1==c&&(b=a.textContent,b=void 0==b||null==b?a" +
+    ".innerText:b,b=void 0==b||null==b?\"\":b);if(\"string\"!=typeof b)if(9" +
+    "==c||1==c){a=9==c?a.documentElement:a.firstChild;c=0;var d=[];for(" +
+    "b=\"\";a;){do 1!=a.nodeType&&(b+=a.nodeValue),d[c++]=a;while(a=a.fir" +
+    "stChild);for(;c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;re" +
+    "turn\"\"+b}\nfunction db(a,b,c){if(null===b)return!0;try{if(!a.getAtt" +
+    "ribute)return!1}catch(d){return!1}return null==c?!!a.getAttribute(" +
+    "b):a.getAttribute(b,2)==c}function eb(a,b,c,d,e){return fb.call(nu" +
+    "ll,a,b,\"string\"===typeof c?c:null,\"string\"===typeof d?d:null,e||ne" +
+    "w D)}\nfunction fb(a,b,c,d,e){b.getElementsByName&&d&&\"name\"==c?(b=" +
+    "b.getElementsByName(d),n(b,function(f){a.g(f)&&e.add(f)})):b.getEl" +
+    "ementsByClassName&&d&&\"class\"==c?(b=b.getElementsByClassName(d),n(" +
+    "b,function(f){f.className==d&&a.g(f)&&e.add(f)})):a instanceof E?h" +
+    "b(a,b,c,d,e):b.getElementsByTagName&&(b=b.getElementsByTagName(a.j" +
+    "()),n(b,function(f){db(f,c,d)&&e.add(f)}));return e}function hb(a," +
+    "b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)db(b,c,d)&&a.g(b)&&e" +
+    ".add(b),hb(a,b,c,d,e)};function D(){this.j=this.g=null;this.h=0}fu" +
+    "nction ib(a){this.h=a;this.next=this.g=null}function jb(a,b){if(!a" +
+    ".g)return b;if(!b.g)return a;var c=a.g;b=b.g;for(var d=null,e,f=0;" +
+    "c&&b;)c.h==b.h?(e=c,c=c.next,b=b.next):0<La(c.h,b.h)?(e=b,b=b.next" +
+    "):(e=c,c=c.next),(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;)e.g=" +
+    "d,d=d.next=e,f++,e=e.next;a.j=d;a.h=f;return a}function kb(a,b){b=" +
+    "new ib(b);b.next=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nD.prototyp" +
+    "e.add=function(a){a=new ib(a);a.g=this.j;this.g?this.j.next=a:this" +
+    ".g=this.j=a;this.j=a;this.h++};function lb(a){return(a=a.g)?a.h:nu" +
+    "ll}function mb(a){return(a=lb(a))?C(a):\"\"}function F(a,b){return n" +
+    "ew nb(a,!!b)}function nb(a,b){this.j=a;this.h=(this.F=b)?a.j:a.g;t" +
+    "his.g=null}nb.prototype.next=function(){var a=this.h;if(null==a)re" +
+    "turn null;var b=this.g=a;this.h=this.F?a.g:a.next;return b.h};func" +
+    "tion ob(a){switch(a.nodeType){case 1:return ta(pb,a);case 9:return" +
+    " ob(a.documentElement);case 11:case 10:case 6:case 12:return qb;de" +
+    "fault:return a.parentNode?ob(a.parentNode):qb}}function qb(){retur" +
+    "n null}function pb(a,b){if(a.prefix==b)return a.namespaceURI||\"htt" +
+    "p://www.w3.org/1999/xhtml\";var c=a.getAttributeNode(\"xmlns:\"+b);re" +
+    "turn c&&c.specified?c.value||null:a.parentNode&&9!=a.parentNode.no" +
+    "deType?pb(a.parentNode,b):null};function G(a){this.u=a;this.h=this" +
+    ".o=!1;this.j=null}function H(a){return\"\\n  \"+a.toString().split(\"\\" +
+    "n\").join(\"\\n  \")}function rb(a,b){a.o=b}function sb(a,b){a.h=b}fun" +
+    "ction I(a,b){a=a.g(b);return a instanceof D?+mb(a):+a}function J(a" +
+    ",b){a=a.g(b);return a instanceof D?mb(a):\"\"+a}function tb(a,b){a=a" +
+    ".g(b);return a instanceof D?!!a.h:!!a};function ub(a,b,c){G.call(t" +
+    "his,a.u);this.i=a;this.s=b;this.C=c;this.o=b.o||c.o;this.h=b.h||c." +
+    "h;this.i==vb&&(c.h||c.o||4==c.u||0==c.u||!b.j?b.h||b.o||4==b.u||0=" +
+    "=b.u||!c.j||(this.j={name:c.j.name,G:b}):this.j={name:b.j.name,G:c" +
+    "})}m(ub,G);\nfunction wb(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;if(b in" +
+    "stanceof D&&c instanceof D){b=F(b);for(d=b.next();d;d=b.next())for" +
+    "(e=F(c),f=e.next();f;f=e.next())if(a(C(d),C(f)))return!0;return!1}" +
+    "if(b instanceof D||c instanceof D){b instanceof D?(e=b,d=c):(e=c,d" +
+    "=b);f=F(e);for(var g=typeof d,k=f.next();k;k=f.next()){switch(g){c" +
+    "ase \"number\":k=+C(k);break;case \"boolean\":k=!!C(k);break;case \"str" +
+    "ing\":k=C(k);break;default:throw Error(\"Illegal primitive type for " +
+    "comparison.\");}if(e==b&&a(k,d)||e==c&&a(d,k))return!0}return!1}ret" +
+    "urn e?\n\"boolean\"==typeof b||\"boolean\"==typeof c?a(!!b,!!c):\"number" +
+    "\"==typeof b||\"number\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}ub.protot" +
+    "ype.g=function(a){return this.i.A(this.s,this.C,a)};ub.prototype.t" +
+    "oString=function(){var a=\"Binary Expression: \"+this.i;a+=H(this.s)" +
+    ";return a+=H(this.C)};function xb(a,b,c,d){this.R=a;this.M=b;this." +
+    "u=c;this.A=d}xb.prototype.toString=function(){return this.R};var y" +
+    "b={};\nfunction K(a,b,c,d){if(yb.hasOwnProperty(a))throw Error(\"Bin" +
+    "ary operator already created: \"+a);a=new xb(a,b,c,d);return yb[a.t" +
+    "oString()]=a}K(\"div\",6,1,function(a,b,c){return I(a,c)/I(b,c)});K(" +
+    "\"mod\",6,1,function(a,b,c){return I(a,c)%I(b,c)});K(\"*\",6,1,functio" +
+    "n(a,b,c){return I(a,c)*I(b,c)});K(\"+\",5,1,function(a,b,c){return I" +
+    "(a,c)+I(b,c)});K(\"-\",5,1,function(a,b,c){return I(a,c)-I(b,c)});K(" +
+    "\"<\",4,2,function(a,b,c){return wb(function(d,e){return d<e},a,b,c)" +
+    "});\nK(\">\",4,2,function(a,b,c){return wb(function(d,e){return d>e}," +
+    "a,b,c)});K(\"<=\",4,2,function(a,b,c){return wb(function(d,e){return" +
+    " d<=e},a,b,c)});K(\">=\",4,2,function(a,b,c){return wb(function(d,e)" +
+    "{return d>=e},a,b,c)});var vb=K(\"=\",3,2,function(a,b,c){return wb(" +
+    "function(d,e){return d==e},a,b,c,!0)});K(\"!=\",3,2,function(a,b,c){" +
+    "return wb(function(d,e){return d!=e},a,b,c,!0)});K(\"and\",2,2,funct" +
+    "ion(a,b,c){return tb(a,c)&&tb(b,c)});K(\"or\",1,2,function(a,b,c){re" +
+    "turn tb(a,c)||tb(b,c)});function zb(a,b){if(b.g.length&&4!=a.u)thr" +
+    "ow Error(\"Primary expression must evaluate to nodeset if filter ha" +
+    "s predicate(s).\");G.call(this,a.u);this.s=a;this.i=b;this.o=a.o;th" +
+    "is.h=a.h}m(zb,G);zb.prototype.g=function(a){a=this.s.g(a);return A" +
+    "b(this.i,a)};zb.prototype.toString=function(){var a=\"Filter:\"+H(th" +
+    "is.s);return a+=H(this.i)};function Bb(a,b){if(b.length<a.L)throw " +
+    "Error(\"Function \"+a.v+\" expects at least\"+a.L+\" arguments, \"+b.len" +
+    "gth+\" given\");if(null!==a.H&&b.length>a.H)throw Error(\"Function \"+" +
+    "a.v+\" expects at most \"+a.H+\" arguments, \"+b.length+\" given\");a.P&" +
+    "&n(b,function(c,d){if(4!=c.u)throw Error(\"Argument \"+d+\" to functi" +
+    "on \"+a.v+\" is not of type Nodeset: \"+c);});G.call(this,a.u);this.B" +
+    "=a;this.i=b;rb(this,a.o||v(b,function(c){return c.o}));sb(this,a.O" +
+    "&&!b.length||a.N&&!!b.length||v(b,function(c){return c.h}))}m(Bb,G" +
+    ");\nBb.prototype.g=function(a){return this.B.A.apply(null,za(a,this" +
+    ".i))};Bb.prototype.toString=function(){var a=\"Function: \"+this.B;i" +
+    "f(this.i.length){var b=q(this.i,function(c,d){return c+H(d)},\"Argu" +
+    "ments:\");a+=H(b)}return a};function Cb(a,b,c,d,e,f,g,k){this.v=a;t" +
+    "his.u=b;this.o=c;this.O=d;this.N=!1;this.A=e;this.L=f;this.H=void " +
+    "0!==g?g:f;this.P=!!k}Cb.prototype.toString=function(){return this." +
+    "v};var Db={};\nfunction L(a,b,c,d,e,f,g,k){if(Db.hasOwnProperty(a))" +
+    "throw Error(\"Function already created: \"+a+\".\");Db[a]=new Cb(a,b,c" +
+    ",d,e,f,g,k)}L(\"boolean\",2,!1,!1,function(a,b){return tb(b,a)},1);L" +
+    "(\"ceiling\",1,!1,!1,function(a,b){return Math.ceil(I(b,a))},1);L(\"c" +
+    "oncat\",3,!1,!1,function(a,b){var c=Aa(arguments,1);return q(c,func" +
+    "tion(d,e){return d+J(e,a)},\"\")},2,null);L(\"contains\",2,!1,!1,funct" +
+    "ion(a,b,c){b=J(b,a);a=J(c,a);return-1!=b.indexOf(a)},2);L(\"count\"," +
+    "1,!1,!1,function(a,b){return b.g(a).h},1,1,!0);\nL(\"false\",2,!1,!1," +
+    "function(){return!1},0);L(\"floor\",1,!1,!1,function(a,b){return Mat" +
+    "h.floor(I(b,a))},1);L(\"id\",4,!1,!1,function(a,b){var c=a.g,d=9==c." +
+    "nodeType?c:c.ownerDocument;a=J(b,a).split(/\\s+/);var e=[];n(a,func" +
+    "tion(g){g=d.getElementById(g);!g||0<=xa(e,g)||e.push(g)});e.sort(L" +
+    "a);var f=new D;n(e,function(g){f.add(g)});return f},1);L(\"lang\",2," +
+    "!1,!1,function(){return!1},1);L(\"last\",1,!0,!1,function(a){if(1!=a" +
+    "rguments.length)throw Error(\"Function last expects ()\");return a.h" +
+    "},0);\nL(\"local-name\",3,!1,!0,function(a,b){return(a=b?lb(b.g(a)):a" +
+    ".g)?a.localName||a.nodeName.toLowerCase():\"\"},0,1,!0);L(\"name\",3,!" +
+    "1,!0,function(a,b){return(a=b?lb(b.g(a)):a.g)?a.nodeName.toLowerCa" +
+    "se():\"\"},0,1,!0);L(\"namespace-uri\",3,!0,!1,function(){return\"\"},0," +
+    "1,!0);L(\"normalize-space\",3,!1,!0,function(a,b){return(b?J(b,a):C(" +
+    "a.g)).replace(/[\\s\\xa0]+/g,\" \").replace(/^\\s+|\\s+$/g,\"\")},0,1);L(\"" +
+    "not\",2,!1,!1,function(a,b){return!tb(b,a)},1);L(\"number\",1,!1,!0,f" +
+    "unction(a,b){return b?I(b,a):+C(a.g)},0,1);\nL(\"position\",1,!0,!1,f" +
+    "unction(a){return a.j},0);L(\"round\",1,!1,!1,function(a,b){return M" +
+    "ath.round(I(b,a))},1);L(\"starts-with\",2,!1,!1,function(a,b,c){b=J(" +
+    "b,a);a=J(c,a);return 0==b.lastIndexOf(a,0)},2);L(\"string\",3,!1,!0," +
+    "function(a,b){return b?J(b,a):C(a.g)},0,1);L(\"string-length\",1,!1," +
+    "!0,function(a,b){return(b?J(b,a):C(a.g)).length},0,1);\nL(\"substrin" +
+    "g\",3,!1,!1,function(a,b,c,d){c=I(c,a);if(isNaN(c)||Infinity==c||-I" +
+    "nfinity==c)return\"\";d=d?I(d,a):Infinity;if(isNaN(d)||-Infinity===d" +
+    ")return\"\";c=Math.round(c)-1;var e=Math.max(c,0);a=J(b,a);return In" +
+    "finity==d?a.substring(e):a.substring(e,c+Math.round(d))},2,3);L(\"s" +
+    "ubstring-after\",3,!1,!1,function(a,b,c){b=J(b,a);a=J(c,a);c=b.inde" +
+    "xOf(a);return-1==c?\"\":b.substring(c+a.length)},2);\nL(\"substring-be" +
+    "fore\",3,!1,!1,function(a,b,c){b=J(b,a);a=J(c,a);a=b.indexOf(a);ret" +
+    "urn-1==a?\"\":b.substring(0,a)},2);L(\"sum\",1,!1,!1,function(a,b){a=F" +
+    "(b.g(a));b=0;for(var c=a.next();c;c=a.next())b+=+C(c);return b},1," +
+    "1,!0);L(\"translate\",3,!1,!1,function(a,b,c,d){b=J(b,a);c=J(c,a);va" +
+    "r e=J(d,a);a={};for(d=0;d<c.length;d++){var f=c.charAt(d);f in a||" +
+    "(a[f]=e.charAt(d))}c=\"\";for(d=0;d<b.length;d++)f=b.charAt(d),c+=f " +
+    "in a?a[f]:f;return c},3);L(\"true\",2,!1,!1,function(){return!0},0);" +
+    "function E(a,b){this.s=a;this.i=void 0!==b?b:null;this.h=null;swit" +
+    "ch(a){case \"comment\":this.h=8;break;case \"text\":this.h=3;break;cas" +
+    "e \"processing-instruction\":this.h=7;break;case \"node\":break;defaul" +
+    "t:throw Error(\"Unexpected argument\");}}function Eb(a){return\"comme" +
+    "nt\"==a||\"text\"==a||\"processing-instruction\"==a||\"node\"==a}E.protot" +
+    "ype.g=function(a){return null===this.h||this.h==a.nodeType};E.prot" +
+    "otype.getType=function(){return this.h};E.prototype.j=function(){r" +
+    "eturn this.s};\nE.prototype.toString=function(){var a=\"Kind Test: \"" +
+    "+this.s;null!==this.i&&(a+=H(this.i));return a};function Fb(a){G.c" +
+    "all(this,3);this.i=a.substring(1,a.length-1)}m(Fb,G);Fb.prototype." +
+    "g=function(){return this.i};Fb.prototype.toString=function(){retur" +
+    "n\"Literal: \"+this.i};function Gb(a,b){this.v=a.toLowerCase();this." +
+    "h=b?b.toLowerCase():\"http://www.w3.org/1999/xhtml\"}Gb.prototype.g=" +
+    "function(a){var b=a.nodeType;return 1!=b&&2!=b?!1:\"*\"!=this.v&&thi" +
+    "s.v!=a.nodeName.toLowerCase()?!1:this.h==(a.namespaceURI?a.namespa" +
+    "ceURI.toLowerCase():\"http://www.w3.org/1999/xhtml\")};Gb.prototype." +
+    "j=function(){return this.v};Gb.prototype.toString=function(){retur" +
+    "n\"Name Test: \"+(\"http://www.w3.org/1999/xhtml\"==this.h?\"\":this.h+\"" +
+    ":\")+this.v};function Hb(a){G.call(this,1);this.i=a}m(Hb,G);Hb.prot" +
+    "otype.g=function(){return this.i};Hb.prototype.toString=function()" +
+    "{return\"Number: \"+this.i};function Ib(a,b){G.call(this,a.u);this.s" +
+    "=a;this.i=b;this.o=a.o;this.h=a.h;1==this.i.length&&(a=this.i[0],a" +
+    ".I||a.i!=Jb||(a=a.C,\"*\"!=a.j()&&(this.j={name:a.j(),G:null})))}m(I" +
+    "b,G);function Kb(){G.call(this,4)}m(Kb,G);Kb.prototype.g=function(" +
+    "a){var b=new D;a=a.g;9==a.nodeType?b.add(a):b.add(a.ownerDocument)" +
+    ";return b};Kb.prototype.toString=function(){return\"Root Helper Exp" +
+    "ression\"};function Lb(){G.call(this,4)}m(Lb,G);Lb.prototype.g=func" +
+    "tion(a){var b=new D;b.add(a.g);return b};Lb.prototype.toString=fun" +
+    "ction(){return\"Context Helper Expression\"};\nfunction Mb(a){return\"" +
+    "/\"==a||\"//\"==a}Ib.prototype.g=function(a){var b=this.s.g(a);if(!(b" +
+    " instanceof D))throw Error(\"Filter expression must evaluate to nod" +
+    "eset.\");a=this.i;for(var c=0,d=a.length;c<d&&b.h;c++){var e=a[c],f" +
+    "=F(b,e.i.F);if(e.o||e.i!=Nb)if(e.o||e.i!=Ob){var g=f.next();for(b=" +
+    "e.g(new Ya(g));null!=(g=f.next());)g=e.g(new Ya(g)),b=jb(b,g)}else" +
+    " g=f.next(),b=e.g(new Ya(g));else{for(g=f.next();(b=f.next())&&(!g" +
+    ".contains||g.contains(b))&&b.compareDocumentPosition(g)&8;g=b);b=e" +
+    ".g(new Ya(g))}}return b};\nIb.prototype.toString=function(){var a=\"" +
+    "Path Expression:\"+H(this.s);if(this.i.length){var b=q(this.i,funct" +
+    "ion(c,d){return c+H(d)},\"Steps:\");a+=H(b)}return a};function Pb(a," +
+    "b){this.g=a;this.F=!!b}\nfunction Ab(a,b,c){for(c=c||0;c<a.g.length" +
+    ";c++)for(var d=a.g[c],e=F(b),f=b.h,g,k=0;g=e.next();k++){var t=a.F" +
+    "?f-k:k+1;g=d.g(new Ya(g,t,f));if(\"number\"==typeof g)t=t==g;else if" +
+    "(\"string\"==typeof g||\"boolean\"==typeof g)t=!!g;else if(g instanceo" +
+    "f D)t=0<g.h;else throw Error(\"Predicate.evaluate returned an unexp" +
+    "ected type.\");if(!t){t=e;g=t.j;var w=t.g;if(!w)throw Error(\"Next m" +
+    "ust be called at least once before remove.\");var r=w.g;w=w.next;r?" +
+    "r.next=w:g.g=w;w?w.g=r:g.j=r;g.h--;t.g=null}}return b}\nPb.prototyp" +
+    "e.toString=function(){return q(this.g,function(a,b){return a+H(b)}" +
+    ",\"Predicates:\")};function N(a,b,c,d){G.call(this,4);this.i=a;this." +
+    "C=b;this.s=c||new Pb([]);this.I=!!d;b=this.s;b=0<b.g.length?b.g[0]" +
+    ".j:null;a.U&&b&&(this.j={name:b.name,G:b.G});a:{a=this.s;for(b=0;b" +
+    "<a.g.length;b++)if(c=a.g[b],c.o||1==c.u||0==c.u){a=!0;break a}a=!1" +
+    "}this.o=a}m(N,G);\nN.prototype.g=function(a){var b=a.g,c=this.j,d=n" +
+    "ull,e=null,f=0;c&&(d=c.name,e=c.G?J(c.G,a):null,f=1);if(this.I)if(" +
+    "this.o||this.i!=Qb)if(b=F((new N(Rb,new E(\"node\"))).g(a)),c=b.next" +
+    "())for(a=this.A(c,d,e,f);null!=(c=b.next());)a=jb(a,this.A(c,d,e,f" +
+    "));else a=new D;else a=eb(this.C,b,d,e),a=Ab(this.s,a,f);else a=th" +
+    "is.A(a.g,d,e,f);return a};N.prototype.A=function(a,b,c,d){a=this.i" +
+    ".B(this.C,a,b,c);return a=Ab(this.s,a,d)};\nN.prototype.toString=fu" +
+    "nction(){var a=\"Step:\"+H(\"Operator: \"+(this.I?\"//\":\"/\"));this.i.v&"
+  )
+      .append(
+    "&(a+=H(\"Axis: \"+this.i));a+=H(this.C);if(this.s.g.length){var b=q(" +
+    "this.s.g,function(c,d){return c+H(d)},\"Predicates:\");a+=H(b)}retur" +
+    "n a};function Sb(a,b,c,d){this.v=a;this.B=b;this.F=c;this.U=d}Sb.p" +
+    "rototype.toString=function(){return this.v};var Tb={};function O(a" +
+    ",b,c,d){if(Tb.hasOwnProperty(a))throw Error(\"Axis already created:" +
+    " \"+a);b=new Sb(a,b,c,!!d);return Tb[a]=b}\nO(\"ancestor\",function(a," +
+    "b){for(var c=new D;b=b.parentNode;)a.g(b)&&kb(c,b);return c},!0);O" +
+    "(\"ancestor-or-self\",function(a,b){var c=new D;do a.g(b)&&kb(c,b);w" +
+    "hile(b=b.parentNode);return c},!0);\nvar Jb=O(\"attribute\",function(" +
+    "a,b){var c=new D,d=a.j();if(b=b.attributes)if(a instanceof E&&null" +
+    "===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);else(d=b.getNam" +
+    "edItem(d))&&c.add(d);return c},!1),Qb=O(\"child\",function(a,b,c,d,e" +
+    "){c=\"string\"===typeof c?c:null;d=\"string\"===typeof d?d:null;e=e||n" +
+    "ew D;for(b=b.firstChild;b;b=b.nextSibling)db(b,c,d)&&a.g(b)&&e.add" +
+    "(b);return e},!1,!0);O(\"descendant\",eb,!1,!0);\nvar Rb=O(\"descendan" +
+    "t-or-self\",function(a,b,c,d){var e=new D;db(b,c,d)&&a.g(b)&&e.add(" +
+    "b);return eb(a,b,c,d,e)},!1,!0),Nb=O(\"following\",function(a,b,c,d)" +
+    "{var e=new D;do for(var f=b;f=f.nextSibling;)db(f,c,d)&&a.g(f)&&e." +
+    "add(f),e=eb(a,f,c,d,e);while(b=b.parentNode);return e},!1,!0);O(\"f" +
+    "ollowing-sibling\",function(a,b){for(var c=new D;b=b.nextSibling;)a" +
+    ".g(b)&&c.add(b);return c},!1);O(\"namespace\",function(){return new " +
+    "D},!1);\nvar Ub=O(\"parent\",function(a,b){var c=new D;if(9==b.nodeTy" +
+    "pe)return c;if(2==b.nodeType)return c.add(b.ownerElement),c;b=b.pa" +
+    "rentNode;a.g(b)&&c.add(b);return c},!1),Ob=O(\"preceding\",function(" +
+    "a,b,c,d){var e=new D,f=[];do f.unshift(b);while(b=b.parentNode);fo" +
+    "r(var g=1,k=f.length;g<k;g++){var t=[];for(b=f[g];b=b.previousSibl" +
+    "ing;)t.unshift(b);for(var w=0,r=t.length;w<r;w++)b=t[w],db(b,c,d)&" +
+    "&a.g(b)&&e.add(b),e=eb(a,b,c,d,e)}return e},!0,!0);\nO(\"preceding-s" +
+    "ibling\",function(a,b){for(var c=new D;b=b.previousSibling;)a.g(b)&" +
+    "&kb(c,b);return c},!0);var Vb=O(\"self\",function(a,b){var c=new D;a" +
+    ".g(b)&&c.add(b);return c},!1);function Wb(a){G.call(this,1);this.i" +
+    "=a;this.o=a.o;this.h=a.h}m(Wb,G);Wb.prototype.g=function(a){return" +
+    "-I(this.i,a)};Wb.prototype.toString=function(){return\"Unary Expres" +
+    "sion: -\"+H(this.i)};function Xb(a){G.call(this,4);this.i=a;rb(this" +
+    ",v(this.i,function(b){return b.o}));sb(this,v(this.i,function(b){r" +
+    "eturn b.h}))}m(Xb,G);Xb.prototype.g=function(a){var b=new D;n(this" +
+    ".i,function(c){c=c.g(a);if(!(c instanceof D))throw Error(\"Path exp" +
+    "ression must evaluate to NodeSet.\");b=jb(b,c)});return b};Xb.proto" +
+    "type.toString=function(){return q(this.i,function(a,b){return a+H(" +
+    "b)},\"Union Expression:\")};function Yb(a,b){this.g=a;this.h=b}funct" +
+    "ion Zb(a){for(var b,c=[];;){P(a,\"Missing right hand side of binary" +
+    " expression.\");b=$b(a);var d=a.g.next();if(!d)break;var e=(d=yb[d]" +
+    "||null)&&d.M;if(!e){a.g.g--;break}for(;c.length&&e<=c[c.length-1]." +
+    "M;)b=new ub(c.pop(),c.pop(),b);c.push(b,d)}for(;c.length;)b=new ub" +
+    "(c.pop(),c.pop(),b);return b}function P(a,b){if(cb(a.g))throw Erro" +
+    "r(b);}function bc(a,b){a=a.g.next();if(a!=b)throw Error(\"Bad token" +
+    ", expected: \"+b+\" got: \"+a);}\nfunction cc(a){a=a.g.next();if(\")\"!=" +
+    "a)throw Error(\"Bad token: \"+a);}function dc(a){a=a.g.next();if(2>a" +
+    ".length)throw Error(\"Unclosed literal string\");return new Fb(a)}fu" +
+    "nction ec(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c)return new" +
+    " Gb(b);var d=b.substring(0,c);a=a.h(d);if(!a)throw Error(\"Namespac" +
+    "e prefix not declared: \"+d);b=b.substr(c+1);return new Gb(b,a)}\nfu" +
+    "nction fc(a){var b=[];if(Mb(A(a.g))){var c=a.g.next();var d=A(a.g)" +
+    ";if(\"/\"==c&&(cb(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&!/(?![0-9])" +
+    "[\\w]/.test(d)))return new Kb;d=new Kb;P(a,\"Missing next location s" +
+    "tep.\");c=gc(a,c);b.push(c)}else{a:{c=A(a.g);d=c.charAt(0);switch(d" +
+    "){case \"$\":throw Error(\"Variable reference not allowed in HTML XPa" +
+    "th\");case \"(\":a.g.next();c=Zb(a);P(a,'unclosed \"(\"');bc(a,\")\");bre" +
+    "ak;case '\"':case \"'\":c=dc(a);break;default:if(isNaN(+c))if(!Eb(c)&" +
+    "&/(?![0-9])[\\w]/.test(d)&&\"(\"==A(a.g,\n1)){c=a.g.next();c=Db[c]||nu" +
+    "ll;a.g.next();for(d=[];\")\"!=A(a.g);){P(a,\"Missing function argumen" +
+    "t list.\");d.push(Zb(a));if(\",\"!=A(a.g))break;a.g.next()}P(a,\"Unclo" +
+    "sed function argument list.\");cc(a);c=new Bb(c,d)}else{c=null;brea" +
+    "k a}else c=new Hb(+a.g.next())}\"[\"==A(a.g)&&(d=new Pb(hc(a)),c=new" +
+    " zb(c,d))}if(c)if(Mb(A(a.g)))d=c;else return c;else c=gc(a,\"/\"),d=" +
+    "new Lb,b.push(c)}for(;Mb(A(a.g));)c=a.g.next(),P(a,\"Missing next l" +
+    "ocation step.\"),c=gc(a,c),b.push(c);return new Ib(d,b)}\nfunction g" +
+    "c(a,b){if(\"/\"!=b&&\"//\"!=b)throw Error('Step op should be \"/\" or \"/" +
+    "/\"');if(\".\"==A(a.g)){var c=new N(Vb,new E(\"node\"));a.g.next();retu" +
+    "rn c}if(\"..\"==A(a.g))return c=new N(Ub,new E(\"node\")),a.g.next(),c" +
+    ";if(\"@\"==A(a.g)){var d=Jb;a.g.next();P(a,\"Missing attribute name\")" +
+    "}else if(\"::\"==A(a.g,1)){if(!/(?![0-9])[\\w]/.test(A(a.g).charAt(0)" +
+    "))throw Error(\"Bad token: \"+a.g.next());var e=a.g.next();d=Tb[e]||" +
+    "null;if(!d)throw Error(\"No axis with name: \"+e);a.g.next();P(a,\"Mi" +
+    "ssing node name\")}else d=Qb;e=\nA(a.g);if(/(?![0-9])[\\w]/.test(e.ch" +
+    "arAt(0)))if(\"(\"==A(a.g,1)){if(!Eb(e))throw Error(\"Invalid node typ" +
+    "e: \"+e);e=a.g.next();if(!Eb(e))throw Error(\"Invalid type name: \"+e" +
+    ");bc(a,\"(\");P(a,\"Bad nodetype\");var f=A(a.g).charAt(0),g=null;if('" +
+    "\"'==f||\"'\"==f)g=dc(a);P(a,\"Bad nodetype\");cc(a);e=new E(e,g)}else " +
+    "e=ec(a);else if(\"*\"==e)e=ec(a);else throw Error(\"Bad token: \"+a.g." +
+    "next());a=new Pb(hc(a),d.F);return c||new N(d,e,a,\"//\"==b)}\nfuncti" +
+    "on hc(a){for(var b=[];\"[\"==A(a.g);){a.g.next();P(a,\"Missing predic" +
+    "ate expression.\");var c=Zb(a);b.push(c);P(a,\"Unclosed predicate ex" +
+    "pression.\");bc(a,\"]\")}return b}function $b(a){if(\"-\"==A(a.g))retur" +
+    "n a.g.next(),new Wb($b(a));var b=fc(a);if(\"|\"!=A(a.g))a=b;else{for" +
+    "(b=[b];\"|\"==a.g.next();)P(a,\"Missing next union location path.\"),b" +
+    ".push(fc(a));a.g.g--;a=new Xb(b)}return a};function ic(a,b){if(!a." +
+    "length)throw Error(\"Empty XPath expression.\");a=$a(a);if(cb(a))thr" +
+    "ow Error(\"Invalid XPath expression.\");b?\"function\"!==typeof b&&(b=" +
+    "sa(b.lookupNamespaceURI,b)):b=function(){return null};var c=Zb(new" +
+    " Yb(a,b));if(!cb(a))throw Error(\"Bad token: \"+a.next());this.evalu" +
+    "ate=function(d,e){d=c.g(new Ya(d));return new Q(d,e)}}\nfunction Q(" +
+    "a,b){if(0==b)if(a instanceof D)b=4;else if(\"string\"==typeof a)b=2;" +
+    "else if(\"number\"==typeof a)b=1;else if(\"boolean\"==typeof a)b=3;els" +
+    "e throw Error(\"Unexpected evaluation result.\");if(2!=b&&1!=b&&3!=b" +
+    "&&!(a instanceof D))throw Error(\"value could not be converted to t" +
+    "he specified type\");this.resultType=b;switch(b){case 2:this.string" +
+    "Value=a instanceof D?mb(a):\"\"+a;break;case 1:this.numberValue=a in" +
+    "stanceof D?+mb(a):+a;break;case 3:this.booleanValue=a instanceof D" +
+    "?0<a.h:!!a;break;case 4:case 5:case 6:case 7:var c=\nF(a);var d=[];" +
+    "for(var e=c.next();e;e=c.next())d.push(e);this.snapshotLength=a.h;" +
+    "this.invalidIteratorState=!1;break;case 8:case 9:this.singleNodeVa" +
+    "lue=lb(a);break;default:throw Error(\"Unknown XPathResult type.\");}" +
+    "var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw Error(\"ite" +
+    "rateNext called with wrong result type\");return f>=d.length?null:d" +
+    "[f++]};this.snapshotItem=function(g){if(6!=b&&7!=b)throw Error(\"sn" +
+    "apshotItem called with wrong result type\");return g>=d.length||0>g" +
+    "?null:d[g]}}Q.ANY_TYPE=0;\nQ.NUMBER_TYPE=1;Q.STRING_TYPE=2;Q.BOOLEA" +
+    "N_TYPE=3;Q.UNORDERED_NODE_ITERATOR_TYPE=4;Q.ORDERED_NODE_ITERATOR_" +
+    "TYPE=5;Q.UNORDERED_NODE_SNAPSHOT_TYPE=6;Q.ORDERED_NODE_SNAPSHOT_TY" +
+    "PE=7;Q.ANY_UNORDERED_NODE_TYPE=8;Q.FIRST_ORDERED_NODE_TYPE=9;funct" +
+    "ion jc(a){this.lookupNamespaceURI=ob(a)}\nfunction kc(a,b){a=a||l;v" +
+    "ar c=a.document;if(!c.evaluate||b)a.XPathResult=Q,c.evaluate=funct" +
+    "ion(d,e,f,g){return(new ic(d,f)).evaluate(e,g)},c.createExpression" +
+    "=function(d,e){return new ic(d,e)},c.createNSResolver=function(d){" +
+    "return new jc(d)}}pa(\"wgxpath.install\",kc);var R={};R.J=function()" +
+    "{var a={X:\"http://www.w3.org/2000/svg\"};return function(b){return " +
+    "a[b]||null}}();\nR.A=function(a,b,c){var d=x(a);if(!d.documentEleme" +
+    "nt)return null;kc(d?d.parentWindow||d.defaultView:window);try{for(" +
+    "var e=d.createNSResolver?d.createNSResolver(d.documentElement):R.J" +
+    ",f={},g=d.getElementsByTagName(\"*\"),k=0;k<g.length;++k){var t=g[k]" +
+    ",w=t.namespaceURI;if(w&&!f[w]){var r=t.lookupPrefix(w);if(!r){var " +
+    "B=w.match(\".*/(\\\\w+)/?$\");r=B?B[1]:\"xhtml\"}f[w]=r}}var M={},S;for(" +
+    "S in f)M[f[S]]=S;e=function(p){return M[p]||null};try{return d.eva" +
+    "luate(b,a,e,c,null)}catch(p){if(\"TypeError\"===p.name)return e=\nd.c" +
+    "reateNSResolver?d.createNSResolver(d.documentElement):R.J,d.evalua" +
+    "te(b,a,e,c,null);throw p;}}catch(p){throw new z(32,\"Unable to loca" +
+    "te an element with the xpath expression \"+b+\" because of the follo" +
+    "wing error:\\n\"+p);}};R.K=function(a,b){if(!a||1!=a.nodeType)throw " +
+    "new z(32,'The result of the xpath expression \"'+b+'\" is: '+a+\". It" +
+    " should be an element.\");};\nR.S=function(a,b){var c=function(){var" +
+    " d=R.A(b,a,9);return d?d.singleNodeValue||null:b.selectSingleNode?" +
+    "(d=x(b),d.setProperty&&d.setProperty(\"SelectionLanguage\",\"XPath\")," +
+    "b.selectSingleNode(a)):null}();null!==c&&R.K(c,a);return c};\nR.W=f" +
+    "unction(a,b){var c=function(){var d=R.A(b,a,7);if(d){for(var e=d.s" +
+    "napshotLength,f=[],g=0;g<e;++g)f.push(d.snapshotItem(g));return f}" +
+    "return b.selectNodes?(d=x(b),d.setProperty&&d.setProperty(\"Selecti" +
+    "onLanguage\",\"XPath\"),b.selectNodes(a)):[]}();n(c,function(d){R.K(d" +
+    ",a)});return c};var lc={aliceblue:\"#f0f8ff\",antiquewhite:\"#faebd7\"" +
+    ",aqua:\"#00ffff\",aquamarine:\"#7fffd4\",azure:\"#f0ffff\",beige:\"#f5f5d" +
+    "c\",bisque:\"#ffe4c4\",black:\"#000000\",blanchedalmond:\"#ffebcd\",blue:" +
+    "\"#0000ff\",blueviolet:\"#8a2be2\",brown:\"#a52a2a\",burlywood:\"#deb887\"" +
+    ",cadetblue:\"#5f9ea0\",chartreuse:\"#7fff00\",chocolate:\"#d2691e\",cora" +
+    "l:\"#ff7f50\",cornflowerblue:\"#6495ed\",cornsilk:\"#fff8dc\",crimson:\"#" +
+    "dc143c\",cyan:\"#00ffff\",darkblue:\"#00008b\",darkcyan:\"#008b8b\",darkg" +
+    "oldenrod:\"#b8860b\",darkgray:\"#a9a9a9\",darkgreen:\"#006400\",\ndarkgre" +
+    "y:\"#a9a9a9\",darkkhaki:\"#bdb76b\",darkmagenta:\"#8b008b\",darkolivegre" +
+    "en:\"#556b2f\",darkorange:\"#ff8c00\",darkorchid:\"#9932cc\",darkred:\"#8" +
+    "b0000\",darksalmon:\"#e9967a\",darkseagreen:\"#8fbc8f\",darkslateblue:\"" +
+    "#483d8b\",darkslategray:\"#2f4f4f\",darkslategrey:\"#2f4f4f\",darkturqu" +
+    "oise:\"#00ced1\",darkviolet:\"#9400d3\",deeppink:\"#ff1493\",deepskyblue" +
+    ":\"#00bfff\",dimgray:\"#696969\",dimgrey:\"#696969\",dodgerblue:\"#1e90ff" +
+    "\",firebrick:\"#b22222\",floralwhite:\"#fffaf0\",forestgreen:\"#228b22\"," +
+    "fuchsia:\"#ff00ff\",gainsboro:\"#dcdcdc\",\nghostwhite:\"#f8f8ff\",gold:\"" +
+    "#ffd700\",goldenrod:\"#daa520\",gray:\"#808080\",green:\"#008000\",greeny" +
+    "ellow:\"#adff2f\",grey:\"#808080\",honeydew:\"#f0fff0\",hotpink:\"#ff69b4" +
+    "\",indianred:\"#cd5c5c\",indigo:\"#4b0082\",ivory:\"#fffff0\",khaki:\"#f0e" +
+    "68c\",lavender:\"#e6e6fa\",lavenderblush:\"#fff0f5\",lawngreen:\"#7cfc00" +
+    "\",lemonchiffon:\"#fffacd\",lightblue:\"#add8e6\",lightcoral:\"#f08080\"," +
+    "lightcyan:\"#e0ffff\",lightgoldenrodyellow:\"#fafad2\",lightgray:\"#d3d" +
+    "3d3\",lightgreen:\"#90ee90\",lightgrey:\"#d3d3d3\",lightpink:\"#ffb6c1\"," +
+    "lightsalmon:\"#ffa07a\",\nlightseagreen:\"#20b2aa\",lightskyblue:\"#87ce" +
+    "fa\",lightslategray:\"#778899\",lightslategrey:\"#778899\",lightsteelbl" +
+    "ue:\"#b0c4de\",lightyellow:\"#ffffe0\",lime:\"#00ff00\",limegreen:\"#32cd" +
+    "32\",linen:\"#faf0e6\",magenta:\"#ff00ff\",maroon:\"#800000\",mediumaquam" +
+    "arine:\"#66cdaa\",mediumblue:\"#0000cd\",mediumorchid:\"#ba55d3\",medium" +
+    "purple:\"#9370db\",mediumseagreen:\"#3cb371\",mediumslateblue:\"#7b68ee" +
+    "\",mediumspringgreen:\"#00fa9a\",mediumturquoise:\"#48d1cc\",mediumviol" +
+    "etred:\"#c71585\",midnightblue:\"#191970\",mintcream:\"#f5fffa\",mistyro" +
+    "se:\"#ffe4e1\",\nmoccasin:\"#ffe4b5\",navajowhite:\"#ffdead\",navy:\"#0000" +
+    "80\",oldlace:\"#fdf5e6\",olive:\"#808000\",olivedrab:\"#6b8e23\",orange:\"" +
+    "#ffa500\",orangered:\"#ff4500\",orchid:\"#da70d6\",palegoldenrod:\"#eee8" +
+    "aa\",palegreen:\"#98fb98\",paleturquoise:\"#afeeee\",palevioletred:\"#db" +
+    "7093\",papayawhip:\"#ffefd5\",peachpuff:\"#ffdab9\",peru:\"#cd853f\",pink" +
+    ":\"#ffc0cb\",plum:\"#dda0dd\",powderblue:\"#b0e0e6\",purple:\"#800080\",re" +
+    "d:\"#ff0000\",rosybrown:\"#bc8f8f\",royalblue:\"#4169e1\",saddlebrown:\"#" +
+    "8b4513\",salmon:\"#fa8072\",sandybrown:\"#f4a460\",seagreen:\"#2e8b57\",\n" +
+    "seashell:\"#fff5ee\",sienna:\"#a0522d\",silver:\"#c0c0c0\",skyblue:\"#87c" +
+    "eeb\",slateblue:\"#6a5acd\",slategray:\"#708090\",slategrey:\"#708090\",s" +
+    "now:\"#fffafa\",springgreen:\"#00ff7f\",steelblue:\"#4682b4\",tan:\"#d2b4" +
+    "8c\",teal:\"#008080\",thistle:\"#d8bfd8\",tomato:\"#ff6347\",turquoise:\"#" +
+    "40e0d0\",violet:\"#ee82ee\",wheat:\"#f5deb3\",white:\"#ffffff\",whitesmok" +
+    "e:\"#f5f5f5\",yellow:\"#ffff00\",yellowgreen:\"#9acd32\"};var mc=\"backgr" +
+    "oundColor borderTopColor borderRightColor borderBottomColor border" +
+    "LeftColor color outlineColor\".split(\" \"),nc=/#([0-9a-fA-F])([0-9a-" +
+    "fA-F])([0-9a-fA-F])/,oc=/^#(?:[0-9a-f]{3}){1,2}$/i,pc=/^(?:rgba)?\\" +
+    "((\\d{1,3}),\\s?(\\d{1,3}),\\s?(\\d{1,3}),\\s?(0|1|0\\.\\d*)\\)$/i,qc=/^(?:" +
+    "rgb)?\\((0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2})\\)$" +
+    "/i;function rc(a){return(a=a.getAttributeNode(\"tabindex\"))&&a.spec" +
+    "ified?a.value:null}var sc=RegExp(\"[;]+(?=(?:(?:[^\\\"]*\\\"){2})*[^\\\"]" +
+    "*$)(?=(?:(?:[^']*'){2})*[^']*$)(?=(?:[^()]*\\\\([^()]*\\\\))*[^()]*$)\"" +
+    ");function tc(a){var b=[];n(a.split(sc),function(c){var d=c.indexO" +
+    "f(\":\");0<d&&(c=[c.slice(0,d),c.slice(d+1)],2==c.length&&b.push(c[0" +
+    "].toLowerCase(),\":\",c[1],\";\"))});b=b.join(\"\");return b=\";\"==b.char" +
+    "At(b.length-1)?b:b+\";\"}\nfunction T(a,b){b&&\"string\"!==typeof b&&(b" +
+    "=b.toString());return!!a&&1==a.nodeType&&(!b||a.tagName.toUpperCas" +
+    "e()==b)};var uc=\"A AREA BUTTON INPUT LABEL SELECT TEXTAREA\".split(" +
+    "\" \");function vc(a){return v(uc,function(b){return T(a,b)})||null!" +
+    "=rc(a)&&0<=Number(a.tabIndex)||wc(a)}var xc=\"BUTTON INPUT OPTGROUP" +
+    " OPTION SELECT TEXTAREA\".split(\" \");\nfunction yc(a){return v(xc,fu" +
+    "nction(b){return T(a,b)})?a.disabled?!1:a.parentNode&&1==a.parentN" +
+    "ode.nodeType&&T(a,\"OPTGROUP\")||T(a,\"OPTION\")?yc(a.parentNode):!Oa(" +
+    "a,function(b){var c=b.parentNode;if(c&&T(c,\"FIELDSET\")&&c.disabled" +
+    "){if(!T(b,\"LEGEND\"))return!0;for(;b=void 0!==b.previousElementSibl" +
+    "ing?b.previousElementSibling:Ja(b.previousSibling);)if(T(b,\"LEGEND" +
+    "\"))return!0}return!1},!0):!0}var zc=\"text search tel url email pas" +
+    "sword number\".split(\" \");\nfunction U(a,b){return T(a,\"INPUT\")?a.ty" +
+    "pe.toLowerCase()==b:!1}function Ac(a){function b(c){return\"inherit" +
+    "\"==c.contentEditable?(c=Bc(c))?b(c):!1:\"true\"==c.contentEditable}r" +
+    "eturn void 0===a.contentEditable?!1:void 0===a.isContentEditable?b" +
+    "(a):a.isContentEditable}\nfunction wc(a){return((T(a,\"TEXTAREA\")?!0" +
+    ":T(a,\"INPUT\")?0<=xa(zc,a.type.toLowerCase()):Ac(a)?!0:!1)||(T(a,\"I" +
+    "NPUT\")?\"file\"==a.type.toLowerCase():!1)||U(a,\"range\")||U(a,\"date\")" +
+    "||U(a,\"month\")||U(a,\"week\")||U(a,\"time\")||U(a,\"datetime-local\")||U" +
+    "(a,\"color\"))&&!a.readOnly}function Bc(a){for(a=a.parentNode;a&&1!=" +
+    "a.nodeType&&9!=a.nodeType&&11!=a.nodeType;)a=a.parentNode;return T" +
+    "(a)?a:null}\nfunction V(a,b){b=Ia(b);if(\"float\"==b||\"cssFloat\"==b||" +
+    "\"styleFloat\"==b)b=\"cssFloat\";a:{var c=b;var d=x(a);if(d.defaultVie" +
+    "w&&d.defaultView.getComputedStyle&&(d=d.defaultView.getComputedSty" +
+    "le(a,null))){c=d[c]||d.getPropertyValue(c)||\"\";break a}c=\"\"}a=c||C" +
+    "c(a,b);if(null===a)a=null;else if(0<=xa(mc,b)){b:{var e=a.match(pc" +
+    ");if(e&&(b=Number(e[1]),c=Number(e[2]),d=Number(e[3]),e=Number(e[4" +
+    "]),0<=b&&255>=b&&0<=c&&255>=c&&0<=d&&255>=d&&0<=e&&1>=e)){b=[b,c,d" +
+    ",e];break b}b=null}if(!b)b:{if(d=a.match(qc))if(b=Number(d[1]),\nc=" +
+    "Number(d[2]),d=Number(d[3]),0<=b&&255>=b&&0<=c&&255>=c&&0<=d&&255>" +
+    "=d){b=[b,c,d,1];break b}b=null}if(!b)b:{b=a.toLowerCase();c=lc[b.t" +
+    "oLowerCase()];if(!c&&(c=\"#\"==b.charAt(0)?b:\"#\"+b,4==c.length&&(c=c" +
+    ".replace(nc,\"#$1$1$2$2$3$3\")),!oc.test(c))){b=null;break b}b=[pars" +
+    "eInt(c.substr(1,2),16),parseInt(c.substr(3,2),16),parseInt(c.subst" +
+    "r(5,2),16),1]}a=b?\"rgba(\"+b.join(\", \")+\")\":a}return a}\nfunction Cc" +
+    "(a,b){var c=a.currentStyle||a.style,d=c[b];void 0===d&&\"function\"=" +
+    "==typeof c.getPropertyValue&&(d=c.getPropertyValue(b));return\"inhe" +
+    "rit\"!=d?void 0!==d?d:null:(a=Bc(a))?Cc(a,b):null}\nfunction Dc(a,b," +
+    "c){function d(g){var k=Ec(g);return 0<k.height&&0<k.width?!0:T(g,\"" +
+    "PATH\")&&(0<k.height||0<k.width)?(g=V(g,\"stroke-width\"),!!g&&0<pars" +
+    "eInt(g,10)):\"hidden\"!=V(g,\"overflow\")&&v(g.childNodes,function(t){" +
+    "return 3==t.nodeType||T(t)&&d(t)})}function e(g){return\"hidden\"==F" +
+    "c(g)&&ya(g.childNodes,function(k){return!T(k)||e(k)||!d(k)})}if(!T" +
+    "(a))throw Error(\"Argument to isShown must be of type Element\");if(" +
+    "T(a,\"BODY\"))return!0;if(T(a,\"OPTION\")||T(a,\"OPTGROUP\"))return a=Oa" +
+    "(a,function(g){return T(g,\n\"SELECT\")}),!!a&&Dc(a,!0,c);var f=Gc(a)" +
+    ";if(f)return!!f.image&&0<f.rect.width&&0<f.rect.height&&Dc(f.image" +
+    ",b,c);if(T(a,\"INPUT\")&&\"hidden\"==a.type.toLowerCase()||T(a,\"NOSCRI" +
+    "PT\"))return!1;f=V(a,\"visibility\");return\"collapse\"!=f&&\"hidden\"!=f" +
+    "&&c(a)&&(b||0!=Hc(a))&&d(a)?!e(a):!1}\nfunction Ic(a){function b(c)" +
+    "{if(T(c)&&\"none\"==V(c,\"display\"))return!1;var d;(d=c.parentNode)&&" +
+    "d.shadowRoot&&void 0!==c.assignedSlot?d=c.assignedSlot?c.assignedS" +
+    "lot.parentNode:null:c.getDestinationInsertionPoints&&(c=c.getDesti" +
+    "nationInsertionPoints(),0<c.length&&(d=c[c.length-1]));return!d||9" +
+    "!=d.nodeType&&11!=d.nodeType?!!d&&b(d):!0}return Dc(a,!0,b)}\nfunct" +
+    "ion Fc(a){function b(p){function u(gb){return gb==g?!0:0==V(gb,\"di" +
+    "splay\").lastIndexOf(\"inline\",0)||\"absolute\"==ac&&\"static\"==V(gb,\"p" +
+    "osition\")?!1:!0}var ac=V(p,\"position\");if(\"fixed\"==ac)return w=!0," +
+    "p==g?null:g;for(p=Bc(p);p&&!u(p);)p=Bc(p);return p}function c(p){v" +
+    "ar u=p;if(\"visible\"==t)if(p==g&&k)u=k;else if(p==k)return{x:\"visib" +
+    "le\",y:\"visible\"};u={x:V(u,\"overflow-x\"),y:V(u,\"overflow-y\")};p==g&" +
+    "&(u.x=\"visible\"==u.x?\"auto\":u.x,u.y=\"visible\"==u.y?\"auto\":u.y);ret" +
+    "urn u}function d(p){if(p==g){var u=\n(new Qa(f)).g;p=u.scrollingEle" +
+    "ment?u.scrollingElement:u.body||u.documentElement;u=u.parentWindow" +
+    "||u.defaultView;p=new Ba(u.pageXOffset||p.scrollLeft,u.pageYOffset" +
+    "||p.scrollTop)}else p=new Ba(p.scrollLeft,p.scrollTop);return p}va" +
+    "r e=Jc(a),f=x(a),g=f.documentElement,k=f.body,t=V(g,\"overflow\"),w;" +
+    "for(a=b(a);a;a=b(a)){var r=c(a);if(\"visible\"!=r.x||\"visible\"!=r.y)" +
+    "{var B=Ec(a);if(0==B.width||0==B.height)return\"hidden\";var M=e.g<B" +
+    ".left,S=e.h<B.top;if(M&&\"hidden\"==r.x||S&&\"hidden\"==r.y)return\"hid" +
+    "den\";if(M&&\n\"visible\"!=r.x||S&&\"visible\"!=r.y){M=d(a);S=e.h<B.top-" +
+    "M.y;if(e.g<B.left-M.x&&\"visible\"!=r.x||S&&\"visible\"!=r.x)return\"hi" +
+    "dden\";e=Fc(a);return\"hidden\"==e?\"hidden\":\"scroll\"}M=e.left>=B.left" +
+    "+B.width;B=e.top>=B.top+B.height;if(M&&\"hidden\"==r.x||B&&\"hidden\"=" +
+    "=r.y)return\"hidden\";if(M&&\"visible\"!=r.x||B&&\"visible\"!=r.y){if(w&" +
+    "&(r=d(a),e.left>=g.scrollWidth-r.x||e.g>=g.scrollHeight-r.y))retur" +
+    "n\"hidden\";e=Fc(a);return\"hidden\"==e?\"hidden\":\"scroll\"}}}return\"non" +
+    "e\"}\nfunction Ec(a){var b=Gc(a);if(b)return b.rect;if(T(a,\"HTML\"))r" +
+    "eturn a=x(a),a=((a?a.parentWindow||a.defaultView:window)||window)." +
+    "document,a=\"CSS1Compat\"==a.compatMode?a.documentElement:a.body,a=n" +
+    "ew Ha(a.clientWidth,a.clientHeight),new y(0,0,a.width,a.height);tr" +
+    "y{var c=a.getBoundingClientRect()}catch(d){return new y(0,0,0,0)}r" +
+    "eturn new y(c.left,c.top,c.right-c.left,c.bottom-c.top)}\nfunction " +
+    "Gc(a){var b=T(a,\"MAP\");if(!b&&!T(a,\"AREA\"))return null;var c=b?a:T" +
+    "(a.parentNode,\"MAP\")?a.parentNode:null,d=null,e=null;c&&c.name&&(d" +
+    "=x(c),d=R.S('/descendant::*[@usemap = \"#'+c.name+'\"]',d))&&(e=Ec(d" +
+    "),b||\"default\"==a.shape.toLowerCase()||(a=Kc(a),b=Math.min(Math.ma" +
+    "x(a.left,0),e.width),c=Math.min(Math.max(a.top,0),e.height),e=new " +
+    "y(b+e.left,c+e.top,Math.min(a.width,e.width-b),Math.min(a.height,e" +
+    ".height-c))));return{image:d,rect:e||new y(0,0,0,0)}}\nfunction Kc(" +
+    "a){var b=a.shape.toLowerCase();a=a.coords.split(\",\");if(\"rect\"==b&" +
+    "&4==a.length){b=a[0];var c=a[1];return new y(b,c,a[2]-b,a[3]-c)}if" +
+    "(\"circle\"==b&&3==a.length)return b=a[2],new y(a[0]-b,a[1]-b,2*b,2*" +
+    "b);if(\"poly\"==b&&2<a.length){b=a[0];c=a[1];for(var d=b,e=c,f=2;f+1" +
+    "<a.length;f+=2)b=Math.min(b,a[f]),d=Math.max(d,a[f]),c=Math.min(c," +
+    "a[f+1]),e=Math.max(e,a[f+1]);return new y(b,c,d-b,e-c)}return new " +
+    "y(0,0,0,0)}function Jc(a){a=Ec(a);return new Ra(a.top,a.left+a.wid" +
+    "th,a.top+a.height,a.left)}\nfunction Hc(a){var b=1,c=V(a,\"opacity\")" +
+    ";c&&(b=Number(c));(a=Bc(a))&&(b*=Hc(a));return b};function Lc(){th" +
+    "is.g=Sa.document.documentElement;var a=Pa(x(this.g));a&&Mc(this,a)" +
+    "}function Mc(a,b){a.g=b;T(b,\"OPTION\")&&Oa(b,function(c){return T(c" +
+    ",\"SELECT\")})}function Nc(a){var b=Oa(a.g,function(c){return!!c&&T(" +
+    "c)&&vc(c)},!0);b=b||a.g;a=Pa(x(b));if(b!=a){if(a&&\"function\"===typ" +
+    "eof a.blur&&!T(a,\"BODY\"))try{a.blur()}catch(c){throw c;}\"function\"" +
+    "===typeof b.focus&&b.focus()}};var Oc=Object.freeze||function(a){r" +
+    "eturn a};Va(4);function Pc(a,b){this.g=a;this.h=b}Pc.prototype.cre" +
+    "ate=function(a){a=x(a).createEvent(\"HTMLEvents\");a.initEvent(this." +
+    "g,this.h,!1);return a};Pc.prototype.toString=function(){return thi" +
+    "s.g};var Qc=new Pc(\"blur\",!1),Rc=new Pc(\"change\",!0);function Sc(a" +
+    ",b){b=b.create(a,void 0);\"isTrusted\"in b||(b.isTrusted=!1);a.dispa" +
+    "tchEvent(b)};function Tc(a,b){this.g=a[l.Symbol.iterator]();this.h" +
+    "=b}Tc.prototype[Symbol.iterator]=function(){return this};Tc.protot" +
+    "ype.next=function(){var a=this.g.next();return{value:a.done?void 0" +
+    ":this.h.call(void 0,a.value),done:a.done}};function Uc(a,b){return" +
+    " new Tc(a,b)};function Vc(){}Vc.prototype.next=function(){return W" +
+    "c};var Wc=Oc({done:!0,value:void 0});Vc.prototype.D=function(){ret" +
+    "urn this};function Xc(a){if(a instanceof W||a instanceof Yc||a ins" +
+    "tanceof X)return a;if(\"function\"==typeof a.next)return new W(funct" +
+    "ion(){return a});if(\"function\"==typeof a[Symbol.iterator])return n" +
+    "ew W(function(){return a[Symbol.iterator]()});if(\"function\"==typeo" +
+    "f a.D)return new W(function(){return a.D()});throw Error(\"Not an i" +
+    "terator or iterable.\");}function W(a){this.B=a}W.prototype.D=funct" +
+    "ion(){return new Yc(this.B())};W.prototype[Symbol.iterator]=functi" +
+    "on(){return new X(this.B())};W.prototype.h=function(){return new X" +
+    "(this.B())};\nfunction Yc(a){this.g=a}na(Yc,Vc);Yc.prototype.next=f" +
+    "unction(){return this.g.next()};Yc.prototype[Symbol.iterator]=func" +
+    "tion(){return new X(this.g)};Yc.prototype.h=function(){return new " +
+    "X(this.g)};function X(a){W.call(this,function(){return a});this.g=" +
+    "a}na(X,W);X.prototype.next=function(){return this.g.next()};functi" +
+    "on Zc(a,b){this.h={};this.g=[];this.j=this.size=0;var c=arguments." +
+    "length;if(1<c){if(c%2)throw Error(\"Uneven number of arguments\");fo" +
+    "r(var d=0;d<c;d+=2)this.set(arguments[d],arguments[d+1])}else if(a" +
+    ")if(a instanceof Zc)for(c=$c(a),d=0;d<c.length;d++)this.set(c[d],a" +
+    ".get(c[d]));else for(d in a)this.set(d,a[d])}function $c(a){ad(a);" +
+    "return a.g.concat()}h=Zc.prototype;h.has=function(a){return Object" +
+    ".prototype.hasOwnProperty.call(this.h,a)};\nfunction ad(a){if(a.siz" +
+    "e!=a.g.length){for(var b=0,c=0;b<a.g.length;){var d=a.g[b];Object." +
+    "prototype.hasOwnProperty.call(a.h,d)&&(a.g[c++]=d);b++}a.g.length=" +
+    "c}if(a.size!=a.g.length){var e={};for(c=b=0;b<a.g.length;)d=a.g[b]" +
+    ",Object.prototype.hasOwnProperty.call(e,d)||(a.g[c++]=d,e[d]=1),b+" +
+    "+;a.g.length=c}}h.get=function(a,b){return Object.prototype.hasOwn" +
+    "Property.call(this.h,a)?this.h[a]:b};\nh.set=function(a,b){Object.p" +
+    "rototype.hasOwnProperty.call(this.h,a)||(this.size+=1,this.g.push(" +
+    "a),this.j++);this.h[a]=b};h.forEach=function(a,b){for(var c=$c(thi" +
+    "s),d=0;d<c.length;d++){var e=c[d],f=this.get(e);a.call(b,f,e,this)" +
+    "}};h.keys=function(){return Xc(this.D(!0)).h()};h.values=function(" +
+    "){return Xc(this.D(!1)).h()};h.entries=function(){var a=this;retur" +
+    "n Uc(this.keys(),function(b){return[b,a.get(b)]})};\nh.D=function(a" +
+    "){ad(this);var b=0,c=this.j,d=this,e=new Vc;e.next=function(){if(c" +
+    "!=d.j)throw Error(\"The map has changed since the iterator was crea" +
+    "ted\");if(b>=d.g.length)return Wc;var f=d.g[b++];return{value:a?f:d" +
+    ".h[f],done:!1}};return e};var bd={};function Y(a,b,c){var d=typeof" +
+    " a;(\"object\"==d&&null!=a||\"function\"==d)&&(a=a.l);a=new cd(a);!b||" +
+    "b in bd&&!c||(bd[b]={key:a,shift:!1},c&&(bd[c]={key:a,shift:!0}));" +
+    "return a}function cd(a){this.code=a}Y(8);Y(9);Y(13);var dd=Y(16),e" +
+    "d=Y(17),fd=Y(18);Y(19);Y(20);Y(27);Y(32,\" \");Y(33);Y(34);Y(35);Y(3" +
+    "6);Y(37);Y(38);Y(39);Y(40);Y(44);Y(45);Y(46);Y(48,\"0\",\")\");Y(49,\"1" +
+    "\",\"!\");Y(50,\"2\",\"@\");Y(51,\"3\",\"#\");Y(52,\"4\",\"$\");Y(53,\"5\",\"%\");Y(5" +
+    "4,\"6\",\"^\");Y(55,\"7\",\"&\");Y(56,\"8\",\"*\");Y(57,\"9\",\"(\");Y(65,\"a\",\"A\")" +
+    ";\nY(66,\"b\",\"B\");Y(67,\"c\",\"C\");Y(68,\"d\",\"D\");Y(69,\"e\",\"E\");Y(70,\"f\"" +
+    ",\"F\");Y(71,\"g\",\"G\");Y(72,\"h\",\"H\");Y(73,\"i\",\"I\");Y(74,\"j\",\"J\");Y(75" +
+    ",\"k\",\"K\");Y(76,\"l\",\"L\");Y(77,\"m\",\"M\");Y(78,\"n\",\"N\");Y(79,\"o\",\"O\");" +
+    "Y(80,\"p\",\"P\");Y(81,\"q\",\"Q\");Y(82,\"r\",\"R\");Y(83,\"s\",\"S\");Y(84,\"t\",\"" +
+    "T\");Y(85,\"u\",\"U\");Y(86,\"v\",\"V\");Y(87,\"w\",\"W\");Y(88,\"x\",\"X\");Y(89,\"" +
+    "y\",\"Y\");Y(90,\"z\",\"Z\");var gd=Y(Ga?{m:91,l:91}:Fa?{m:224,l:91}:{m:0" +
+    ",l:91});Y(Ga?{m:92,l:92}:Fa?{m:224,l:93}:{m:0,l:92});Y(Ga?{m:93,l:" +
+    "93}:Fa?{m:0,l:0}:{m:93,l:null});\nY({m:96,l:96},\"0\");Y({m:97,l:97}," +
+    "\"1\");Y({m:98,l:98},\"2\");Y({m:99,l:99},\"3\");Y({m:100,l:100},\"4\");Y(" +
+    "{m:101,l:101},\"5\");Y({m:102,l:102},\"6\");Y({m:103,l:103},\"7\");Y({m:" +
+    "104,l:104},\"8\");Y({m:105,l:105},\"9\");Y({m:106,l:106},\"*\");Y({m:107" +
+    ",l:107},\"+\");Y({m:109,l:109},\"-\");Y({m:110,l:110},\".\");Y({m:111,l:" +
+    "111},\"/\");Y(144);Y(112);Y(113);Y(114);Y(115);Y(116);Y(117);Y(118);" +
+    "Y(119);Y(120);Y(121);Y(122);Y(123);Y({m:107,l:187},\"=\",\"+\");Y(108," +
+    "\",\");Y({m:109,l:189},\"-\",\"_\");Y(188,\",\",\"<\");Y(190,\".\",\">\");Y(191," +
+    "\"/\",\"?\");\nY(192,\"`\",\"~\");Y(219,\"[\",\"{\");Y(220,\"\\\\\",\"|\");Y(221,\"]\"," +
+    "\"}\");Y({m:59,l:186},\";\",\":\");Y(222,\"'\",'\"');var hd=new Zc;hd.set(1" +
+    ",dd);hd.set(2,ed);hd.set(4,fd);hd.set(8,gd);(function(a){var b=new" +
+    " Zc;n(Array.from(a.keys()),function(c){b.set(a.get(c).code,c)});re" +
+    "turn b})(hd);function Z(){Lc.call(this)}m(Z,Lc);Z.g=void 0;Z.h=fun" +
+    "ction(){return Z.g?Z.g:Z.g=new Z};function id(a){var b=Z.h();Mc(b," +
+    "a);Nc(b)};pa(\"_\",function(a){if(!Ic(a)||!yc(a)||\"none\"==V(a,\"point" +
+    "er-events\"))throw new z(12,\"Element is not currently interactable " +
+    "and may not be manipulated\");if(!wc(a))throw new z(12,\"Element mus" +
+    "t be user-editable in order to clear it.\");if(a.value){id(a);a.val" +
+    "ue=\"\";Sc(a,Rc);Sc(a,Qc);var b=Sa.document.body;if(b)id(b);else thr" +
+    "ow new z(13,\"Cannot unfocus element after clearing.\");}else T(a,\"I" +
+    "NPUT\")&&a.getAttribute(\"type\")&&\"number\"==a.getAttribute(\"type\").t" +
+    "oLowerCase()&&(id(a),a.value=\"\");Ac(a)&&(id(a),a.innerHTML=\n\" \")})" +
+    ";;return this._.apply(null,arguments);}).apply({navigator:typeof w" +
+    "indow!=\"undefined\"?window.navigator:null},arguments);}\n"
+  )
+  .toString();
+  static final String CLEAR_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String CLEAR_ANDROID_original() {
+    return CLEAR_ANDROID.replaceAll("xxx_rpl_lic", CLEAR_ANDROID_license);
+  }
+
+/* field: CLICK_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String CLICK_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar h;function aa(a" +
+    "){var b=0;return function(){return b<a.length?{done:!1,value:a[b++" +
+    "]}:{done:!0}}}var ba=\"function\"==typeof Object.defineProperties?Ob" +
+    "ject.defineProperty:function(a,b,c){if(a==Array.prototype||a==Obje" +
+    "ct.prototype)return a;a[b]=c.value;return a};\nfunction ca(a){a=[\"o" +
+    "bject\"==typeof globalThis&&globalThis,a,\"object\"==typeof window&&w" +
+    "indow,\"object\"==typeof self&&self,\"object\"==typeof global&&global]" +
+    ";for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return " +
+    "c}throw Error(\"Cannot find global object\");}var da=ca(this);functi" +
+    "on ea(a,b){if(b)a:{var c=da;a=a.split(\".\");for(var d=0;d<a.length-" +
+    "1;d++){var e=a[d];if(!(e in c))break a;c=c[e]}a=a[a.length-1];d=c[" +
+    "a];b=b(d);b!=d&&null!=b&&ba(c,a,{configurable:!0,writable:!0,value" +
+    ":b})}}\nea(\"Symbol\",function(a){function b(f){if(this instanceof b)" +
+    "throw new TypeError(\"Symbol is not a constructor\");return new c(d+" +
+    "(f||\"\")+\"_\"+e++,f)}function c(f,g){this.g=f;ba(this,\"description\"," +
+    "{configurable:!0,writable:!0,value:g})}if(a)return a;c.prototype.t" +
+    "oString=function(){return this.g};var d=\"jscomp_symbol_\"+(1E9*Math" +
+    ".random()>>>0)+\"_\",e=0;return b});\nea(\"Symbol.iterator\",function(a" +
+    "){if(a)return a;a=Symbol(\"Symbol.iterator\");for(var b=\"Array Int8A" +
+    "rray Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Arra" +
+    "y Uint32Array Float32Array Float64Array\".split(\" \"),c=0;c<b.length" +
+    ";c++){var d=da[b[c]];\"function\"===typeof d&&\"function\"!=typeof d.p" +
+    "rototype[a]&&ba(d.prototype,a,{configurable:!0,writable:!0,value:f" +
+    "unction(){return fa(aa(this))}})}return a});function fa(a){a={next" +
+    ":a};a[Symbol.iterator]=function(){return this};return a}\nvar ha=\"f" +
+    "unction\"==typeof Object.create?Object.create:function(a){function " +
+    "b(){}b.prototype=a;return new b},ia;if(\"function\"==typeof Object.s" +
+    "etPrototypeOf)ia=Object.setPrototypeOf;else{var ja;a:{var ka={a:!0" +
+    "},la={};try{la.__proto__=ka;ja=la.a;break a}catch(a){}ja=!1}ia=ja?" +
+    "function(a,b){a.__proto__=b;if(a.__proto__!==b)throw new TypeError" +
+    "(a+\" is not extensible\");return a}:null}var ma=ia;\nfunction na(a,b" +
+    "){a.prototype=ha(b.prototype);a.prototype.constructor=a;if(ma)ma(a" +
+    ",b);else for(var c in b)if(\"prototype\"!=c)if(Object.defineProperti" +
+    "es){var d=Object.getOwnPropertyDescriptor(b,c);d&&Object.definePro" +
+    "perty(a,c,d)}else a[c]=b[c];a.T=b.prototype}function oa(a,b){a ins" +
+    "tanceof String&&(a+=\"\");var c=0,d=!1,e={next:function(){if(!d&&c<a" +
+    ".length){var f=c++;return{value:b(f,a[f]),done:!1}}d=!0;return{don" +
+    "e:!0,value:void 0}}};e[Symbol.iterator]=function(){return e};retur" +
+    "n e}\nea(\"Array.prototype.keys\",function(a){return a?a:function(){r" +
+    "eturn oa(this,function(b){return b})}});ea(\"Array.from\",function(a" +
+    "){return a?a:function(b,c,d){c=null!=c?c:function(k){return k};var" +
+    " e=[],f=\"undefined\"!=typeof Symbol&&Symbol.iterator&&b[Symbol.iter" +
+    "ator];if(\"function\"==typeof f){b=f.call(b);for(var g=0;!(f=b.next(" +
+    ")).done;)e.push(c.call(d,f.value,g++))}else for(f=b.length,g=0;g<f" +
+    ";g++)e.push(c.call(d,b[g],g));return e}});var pa=this||self;\nfunct" +
+    "ion qa(a,b){a=a.split(\".\");var c=pa;a[0]in c||\"undefined\"==typeof " +
+    "c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d=a.s" +
+    "hift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]?c=c" +
+    "[d]:c=c[d]={}:c[d]=b}function ra(a,b,c){return a.call.apply(a.bind" +
+    ",arguments)}\nfunction sa(a,b,c){if(!a)throw Error();if(2<arguments" +
+    ".length){var d=Array.prototype.slice.call(arguments,2);return func" +
+    "tion(){var e=Array.prototype.slice.call(arguments);Array.prototype" +
+    ".unshift.apply(e,d);return a.apply(b,e)}}return function(){return " +
+    "a.apply(b,arguments)}}function ta(a,b,c){Function.prototype.bind&&" +
+    "-1!=Function.prototype.bind.toString().indexOf(\"native code\")?ta=r" +
+    "a:ta=sa;return ta.apply(null,arguments)}\nfunction ua(a,b){var c=Ar" +
+    "ray.prototype.slice.call(arguments,1);return function(){var d=c.sl" +
+    "ice();d.push.apply(d,arguments);return a.apply(this,d)}}function l" +
+    "(a,b){function c(){}c.prototype=b.prototype;a.T=b.prototype;a.prot" +
+    "otype=new c;a.prototype.constructor=a;a.V=function(d,e,f){for(var " +
+    "g=Array(arguments.length-2),k=2;k<arguments.length;k++)g[k-2]=argu" +
+    "ments[k];return b.prototype[e].apply(d,g)}};function va(a,b){if(Er" +
+    "ror.captureStackTrace)Error.captureStackTrace(this,va);else{var c=" +
+    "Error().stack;c&&(this.stack=c)}a&&(this.message=String(a));void 0" +
+    "!==b&&(this.cause=b)}l(va,Error);va.prototype.name=\"CustomError\";f" +
+    "unction wa(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length-1,e=0;e<d;" +
+    "e++)c+=a[e]+(e<b.length?b[e]:\"%s\");va.call(this,c+a[d])}l(wa,va);w" +
+    "a.prototype.name=\"AssertionError\";function xa(a,b,c){if(!a){var d=" +
+    "\"Assertion failed\";if(b){d+=\": \"+b;var e=Array.prototype.slice.cal" +
+    "l(arguments,2)}throw new wa(\"\"+d,e||[]);}};function ya(a,b){if(\"st" +
+    "ring\"===typeof a)return\"string\"!==typeof b||1!=b.length?-1:a.index" +
+    "Of(b,0);for(var c=0;c<a.length;c++)if(c in a&&a[c]===b)return c;re" +
+    "turn-1}function m(a,b){for(var c=a.length,d=\"string\"===typeof a?a." +
+    "split(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[e],e,a)}function z" +
+    "a(a,b,c){var d=c;m(a,function(e,f){d=b.call(void 0,d,e,f,a)});retu" +
+    "rn d}function n(a,b){for(var c=a.length,d=\"string\"===typeof a?a.sp" +
+    "lit(\"\"):a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a))return!0;" +
+    "return!1}\nfunction Aa(a,b){for(var c=a.length,d=\"string\"===typeof " +
+    "a?a.split(\"\"):a,e=0;e<c;e++)if(e in d&&!b.call(void 0,d[e],e,a))re" +
+    "turn!1;return!0}function Ba(a){return Array.prototype.concat.apply" +
+    "([],arguments)}function Ca(a,b,c){xa(null!=a.length);return 2>=arg" +
+    "uments.length?Array.prototype.slice.call(a,b):Array.prototype.slic" +
+    "e.call(a,b,c)};function u(a,b){this.x=void 0!==a?a:0;this.y=void 0" +
+    "!==b?b:0}h=u.prototype;h.toString=function(){return\"(\"+this.x+\", \"" +
+    "+this.y+\")\"};h.ceil=function(){this.x=Math.ceil(this.x);this.y=Mat" +
+    "h.ceil(this.y);return this};h.floor=function(){this.x=Math.floor(t" +
+    "his.x);this.y=Math.floor(this.y);return this};h.round=function(){t" +
+    "his.x=Math.round(this.x);this.y=Math.round(this.y);return this};h." +
+    "scale=function(a,b){this.x*=a;this.y*=\"number\"===typeof b?b:a;retu" +
+    "rn this};function Da(a,b){this.x=a;this.y=b}l(Da,u);Da.prototype.s" +
+    "cale=u.prototype.scale;Da.prototype.add=function(a){this.x+=a.x;th" +
+    "is.y+=a.y;return this};var Ea=String.prototype.trim?function(a){re" +
+    "turn a.trim()}:function(a){return/^[\\s\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/." +
+    "exec(a)[1]};function Fa(a,b){return a<b?-1:a>b?1:0};function Ga(){" +
+    "var a=pa.navigator;return a&&(a=a.userAgent)?a:\"\"};var Ha=-1!=Ga()" +
+    ".indexOf(\"Macintosh\"),Ia=-1!=Ga().indexOf(\"Windows\");function Ja(a" +
+    ",b){this.width=a;this.height=b}h=Ja.prototype;h.toString=function(" +
+    "){return\"(\"+this.width+\" x \"+this.height+\")\"};h.aspectRatio=functi" +
+    "on(){return this.width/this.height};h.ceil=function(){this.width=M" +
+    "ath.ceil(this.width);this.height=Math.ceil(this.height);return thi" +
+    "s};h.floor=function(){this.width=Math.floor(this.width);this.heigh" +
+    "t=Math.floor(this.height);return this};h.round=function(){this.wid" +
+    "th=Math.round(this.width);this.height=Math.round(this.height);retu" +
+    "rn this};\nh.scale=function(a,b){this.width*=a;this.height*=\"number" +
+    "\"===typeof b?b:a;return this};function Ka(a){return String(a).repl" +
+    "ace(/\\-([a-z])/g,function(b,c){return c.toUpperCase()})};function " +
+    "La(a){return a?a.parentWindow||a.defaultView:window}function Ma(a)" +
+    "{for(;a&&1!=a.nodeType;)a=a.previousSibling;return a}function Na(a" +
+    ",b){if(!a||!b)return!1;if(a.contains&&1==b.nodeType)return a==b||a" +
+    ".contains(b);if(\"undefined\"!=typeof a.compareDocumentPosition)retu" +
+    "rn a==b||!!(a.compareDocumentPosition(b)&16);for(;b&&a!=b;)b=b.par" +
+    "entNode;return b==a}\nfunction Oa(a,b){if(a==b)return 0;if(a.compar" +
+    "eDocumentPosition)return a.compareDocumentPosition(b)&2?1:-1;if(\"s" +
+    "ourceIndex\"in a||a.parentNode&&\"sourceIndex\"in a.parentNode){var c" +
+    "=1==a.nodeType,d=1==b.nodeType;if(c&&d)return a.sourceIndex-b.sour" +
+    "ceIndex;var e=a.parentNode,f=b.parentNode;return e==f?Pa(a,b):!c&&" +
+    "Na(e,b)?-1*Qa(a,b):!d&&Na(f,a)?Qa(b,a):(c?a.sourceIndex:e.sourceIn" +
+    "dex)-(d?b.sourceIndex:f.sourceIndex)}d=x(a);c=d.createRange();c.se" +
+    "lectNode(a);c.collapse(!0);a=d.createRange();a.selectNode(b);\na.co" +
+    "llapse(!0);return c.compareBoundaryPoints(pa.Range.START_TO_END,a)" +
+    "}function Qa(a,b){var c=a.parentNode;if(c==b)return-1;for(;b.paren" +
+    "tNode!=c;)b=b.parentNode;return Pa(b,a)}function Pa(a,b){for(;b=b." +
+    "previousSibling;)if(b==a)return-1;return 1}function x(a){xa(a,\"Nod" +
+    "e cannot be null or undefined.\");return 9==a.nodeType?a:a.ownerDoc" +
+    "ument||a.document}function Ra(a,b,c){a&&!c&&(a=a.parentNode);for(c" +
+    "=0;a;){xa(\"parentNode\"!=a.name);if(b(a))return a;a=a.parentNode;c+" +
+    "+}return null}\nfunction Sa(a){try{var b=a&&a.activeElement;return " +
+    "b&&b.nodeName?b:null}catch(c){return null}}function Ta(a){this.g=a" +
+    "||pa.document||document}Ta.prototype.getElementsByTagName=function" +
+    "(a,b){return(b||this.g).getElementsByTagName(String(a))};function " +
+    "Ua(a,b,c,d){this.top=a;this.right=b;this.bottom=c;this.left=d}h=Ua" +
+    ".prototype;h.toString=function(){return\"(\"+this.top+\"t, \"+this.rig" +
+    "ht+\"r, \"+this.bottom+\"b, \"+this.left+\"l)\"};h.ceil=function(){this." +
+    "top=Math.ceil(this.top);this.right=Math.ceil(this.right);this.bott" +
+    "om=Math.ceil(this.bottom);this.left=Math.ceil(this.left);return th" +
+    "is};h.floor=function(){this.top=Math.floor(this.top);this.right=Ma" +
+    "th.floor(this.right);this.bottom=Math.floor(this.bottom);this.left" +
+    "=Math.floor(this.left);return this};\nh.round=function(){this.top=M" +
+    "ath.round(this.top);this.right=Math.round(this.right);this.bottom=" +
+    "Math.round(this.bottom);this.left=Math.round(this.left);return thi" +
+    "s};h.scale=function(a,b){b=\"number\"===typeof b?b:a;this.left*=a;th" +
+    "is.right*=a;this.top*=b;this.bottom*=b;return this};function y(a,b" +
+    ",c,d){this.left=a;this.top=b;this.width=c;this.height=d}h=y.protot" +
+    "ype;h.toString=function(){return\"(\"+this.left+\", \"+this.top+\" - \"+" +
+    "this.width+\"w x \"+this.height+\"h)\"};h.ceil=function(){this.left=Ma" +
+    "th.ceil(this.left);this.top=Math.ceil(this.top);this.width=Math.ce" +
+    "il(this.width);this.height=Math.ceil(this.height);return this};h.f" +
+    "loor=function(){this.left=Math.floor(this.left);this.top=Math.floo" +
+    "r(this.top);this.width=Math.floor(this.width);this.height=Math.flo" +
+    "or(this.height);return this};\nh.round=function(){this.left=Math.ro" +
+    "und(this.left);this.top=Math.round(this.top);this.width=Math.round" +
+    "(this.width);this.height=Math.round(this.height);return this};h.sc" +
+    "ale=function(a,b){b=\"number\"===typeof b?b:a;this.left*=a;this.widt" +
+    "h*=a;this.top*=b;this.height*=b;return this};function Va(a,b){var " +
+    "c=x(a);return c.defaultView&&c.defaultView.getComputedStyle&&(a=c." +
+    "defaultView.getComputedStyle(a,null))?a[b]||a.getPropertyValue(b)|" +
+    "|\"\":\"\"}function Wa(a){var b=a.offsetWidth,c=a.offsetHeight;if((voi" +
+    "d 0===b||!b&&!c)&&a.getBoundingClientRect){try{var d=a.getBounding" +
+    "ClientRect()}catch(e){d={left:0,top:0,right:0,bottom:0}}return new" +
+    " Ja(d.right-d.left,d.bottom-d.top)}return new Ja(b,c)};/*\n\n Copyri" +
+    "ght 2014 Software Freedom Conservancy\n\n Licensed under the Apache " +
+    "License, Version 2.0 (the \"License\");\n you may not use this file e" +
+    "xcept in compliance with the License.\n You may obtain a copy of th" +
+    "e License at\n\n      http://www.apache.org/licenses/LICENSE-2.0\n\n U" +
+    "nless required by applicable law or agreed to in writing, software" +
+    "\n distributed under the License is distributed on an \"AS IS\" BASIS" +
+    ",\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or" +
+    " implied.\n See the License for the specific language governing per" +
+    "missions and\n limitations under the License.\n*/\nvar Xa=window;func" +
+    "tion z(a,b){this.code=a;this.g=Ya[a]||\"unknown error\";this.message" +
+    "=b||\"\";a=this.g.replace(/((?:^|\\s+)[a-z])/g,function(c){return c.t" +
+    "oUpperCase().replace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5;if(0>b||a.in" +
+    "dexOf(\"Error\",b)!=b)a+=\"Error\";this.name=a;a=Error(this.message);a" +
+    ".name=this.name;this.stack=a.stack||\"\"}l(z,Error);\nvar Ya={15:\"ele" +
+    "ment not selectable\",11:\"element not visible\",31:\"unknown error\",3" +
+    "0:\"unknown error\",24:\"invalid cookie domain\",29:\"invalid element c" +
+    "oordinates\",12:\"invalid element state\",32:\"invalid selector\",51:\"i" +
+    "nvalid selector\",52:\"invalid selector\",17:\"javascript error\",405:\"" +
+    "unsupported operation\",34:\"move target out of bounds\",27:\"no such " +
+    "alert\",7:\"no such element\",8:\"no such frame\",23:\"no such window\",2" +
+    "8:\"script timeout\",33:\"session not created\",10:\"stale element refe" +
+    "rence\",21:\"timeout\",25:\"unable to set cookie\",\n26:\"unexpected aler" +
+    "t open\",13:\"unknown error\",9:\"unknown command\"};z.prototype.toStri" +
+    "ng=function(){return this.name+\": \"+this.message};function Za(a){r" +
+    "eturn(a=a.exec(Ga()))?a[1]:\"\"}Za(/Android\\s+([0-9.]+)/)||Za(/Versi" +
+    "on\\/([0-9.]+)/);function $a(a){var b=0,c=Ea(String(ab)).split(\".\")" +
+    ";a=Ea(String(a)).split(\".\");for(var d=Math.max(c.length,a.length)," +
+    "e=0;0==b&&e<d;e++){var f=c[e]||\"\",g=a[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/" +
+    ".exec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];" +
+    "if(0==f[0].length&&0==g[0].length)break;b=Fa(0==f[1].length?0:pars" +
+    "eInt(f[1],10),0==g[1].length?0:parseInt(g[1],10))||Fa(0==f[2].leng" +
+    "th,0==g[2].length)||Fa(f[2],g[2]);f=f[3];g=g[3]}while(0==b)}return" +
+    " 0<=b}\nvar bb=/Android\\s+([0-9\\.]+)/.exec(Ga()),ab=bb?bb[1]:\"0\",cb" +
+    "=10<=Number(void 0);$a(2.3);$a(4);/*\n\n The MIT License\n\n Copyright" +
+    " (c) 2007 Cybozu Labs, Inc.\n Copyright (c) 2012 Google Inc.\n\n Perm" +
+    "ission is hereby granted, free of charge, to any person obtaining " +
+    "a copy\n of this software and associated documentation files (the \"" +
+    "Software\"), to\n deal in the Software without restriction, includin" +
+    "g without limitation the\n rights to use, copy, modify, merge, publ" +
+    "ish, distribute, sublicense, and/or\n sell copies of the Software, " +
+    "and to permit persons to whom the Software is\n furnished to do so," +
+    " subject to the following conditions:\n\n The above copyright notice" +
+    " and this permission notice shall be included in\n all copies or su" +
+    "bstantial portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS" +
+    " IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING" +
+    " BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FO" +
+    "R A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n" +
+    " AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR " +
+    "OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERW" +
+    "ISE, ARISING\n FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR T" +
+    "HE USE OR OTHER DEALINGS\n IN THE SOFTWARE.\n*/\nfunction db(a,b,c){t" +
+    "his.g=a;this.j=b||1;this.h=c||1};function eb(a){this.h=a;this.g=0}" +
+    "function fb(a){a=a.match(gb);for(var b=0;b<a.length;b++)hb.test(a[" +
+    "b])&&a.splice(b,1);return new eb(a)}var gb=RegExp(\"\\\\$?(?:(?![0-9-" +
+    "])[\\\\w-]+:)?(?![0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\" +
+    ".\\\\d+|\\\"[^\\\"]*\\\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),hb=/^\\s/;function A(a" +
+    ",b){return a.h[a.g+(b||0)]}eb.prototype.next=function(){return thi" +
+    "s.h[this.g++]};function ib(a){return a.h.length<=a.g};function B(a" +
+    "){var b=null,c=a.nodeType;1==c&&(b=a.textContent,b=void 0==b||null" +
+    "==b?a.innerText:b,b=void 0==b||null==b?\"\":b);if(\"string\"!=typeof b" +
+    ")if(9==c||1==c){a=9==c?a.documentElement:a.firstChild;c=0;var d=[]" +
+    ";for(b=\"\";a;){do 1!=a.nodeType&&(b+=a.nodeValue),d[c++]=a;while(a=" +
+    "a.firstChild);for(;c&&!(a=d[--c].nextSibling););}}else b=a.nodeVal" +
+    "ue;return\"\"+b}\nfunction jb(a,b,c){if(null===b)return!0;try{if(!a.g" +
+    "etAttribute)return!1}catch(d){return!1}return null==c?!!a.getAttri" +
+    "bute(b):a.getAttribute(b,2)==c}function kb(a,b,c,d,e){return lb.ca" +
+    "ll(null,a,b,\"string\"===typeof c?c:null,\"string\"===typeof d?d:null," +
+    "e||new C)}\nfunction lb(a,b,c,d,e){b.getElementsByName&&d&&\"name\"==" +
+    "c?(b=b.getElementsByName(d),m(b,function(f){a.g(f)&&e.add(f)})):b." +
+    "getElementsByClassName&&d&&\"class\"==c?(b=b.getElementsByClassName(" +
+    "d),m(b,function(f){f.className==d&&a.g(f)&&e.add(f)})):a instanceo" +
+    "f D?mb(a,b,c,d,e):b.getElementsByTagName&&(b=b.getElementsByTagNam" +
+    "e(a.j()),m(b,function(f){jb(f,c,d)&&e.add(f)}));return e}function " +
+    "mb(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)jb(b,c,d)&&a.g(" +
+    "b)&&e.add(b),mb(a,b,c,d,e)};function C(){this.j=this.g=null;this.h" +
+    "=0}function nb(a){this.h=a;this.next=this.g=null}function ob(a,b){" +
+    "if(!a.g)return b;if(!b.g)return a;var c=a.g;b=b.g;for(var d=null,e" +
+    ",f=0;c&&b;)c.h==b.h?(e=c,c=c.next,b=b.next):0<Oa(c.h,b.h)?(e=b,b=b" +
+    ".next):(e=c,c=c.next),(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;" +
+    ")e.g=d,d=d.next=e,f++,e=e.next;a.j=d;a.h=f;return a}function pb(a," +
+    "b){b=new nb(b);b.next=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nC.pro" +
+    "totype.add=function(a){a=new nb(a);a.g=this.j;this.g?this.j.next=a" +
+    ":this.g=this.j=a;this.j=a;this.h++};function qb(a){return(a=a.g)?a" +
+    ".h:null}function rb(a){return(a=qb(a))?B(a):\"\"}function E(a,b){ret" +
+    "urn new sb(a,!!b)}function sb(a,b){this.j=a;this.h=(this.G=b)?a.j:" +
+    "a.g;this.g=null}sb.prototype.next=function(){var a=this.h;if(null=" +
+    "=a)return null;var b=this.g=a;this.h=this.G?a.g:a.next;return b.h}" +
+    ";function tb(a){switch(a.nodeType){case 1:return ua(ub,a);case 9:r" +
+    "eturn tb(a.documentElement);case 11:case 10:case 6:case 12:return " +
+    "vb;default:return a.parentNode?tb(a.parentNode):vb}}function vb(){" +
+    "return null}function ub(a,b){if(a.prefix==b)return a.namespaceURI|" +
+    "|\"http://www.w3.org/1999/xhtml\";var c=a.getAttributeNode(\"xmlns:\"+" +
+    "b);return c&&c.specified?c.value||null:a.parentNode&&9!=a.parentNo" +
+    "de.nodeType?ub(a.parentNode,b):null};function F(a){this.u=a;this.h" +
+    "=this.s=!1;this.j=null}function G(a){return\"\\n  \"+a.toString().spl" +
+    "it(\"\\n\").join(\"\\n  \")}function wb(a,b){a.s=b}function xb(a,b){a.h=" +
+    "b}function H(a,b){a=a.g(b);return a instanceof C?+rb(a):+a}functio" +
+    "n I(a,b){a=a.g(b);return a instanceof C?rb(a):\"\"+a}function zb(a,b" +
+    "){a=a.g(b);return a instanceof C?!!a.h:!!a};function Ab(a,b,c){F.c" +
+    "all(this,a.u);this.i=a;this.o=b;this.v=c;this.s=b.s||c.s;this.h=b." +
+    "h||c.h;this.i==Bb&&(c.h||c.s||4==c.u||0==c.u||!b.j?b.h||b.s||4==b." +
+    "u||0==b.u||!c.j||(this.j={name:c.j.name,H:b}):this.j={name:b.j.nam" +
+    "e,H:c})}l(Ab,F);\nfunction Cb(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;if" +
+    "(b instanceof C&&c instanceof C){b=E(b);for(d=b.next();d;d=b.next(" +
+    "))for(e=E(c),f=e.next();f;f=e.next())if(a(B(d),B(f)))return!0;retu" +
+    "rn!1}if(b instanceof C||c instanceof C){b instanceof C?(e=b,d=c):(" +
+    "e=c,d=b);f=E(e);for(var g=typeof d,k=f.next();k;k=f.next()){switch" +
+    "(g){case \"number\":k=+B(k);break;case \"boolean\":k=!!B(k);break;case" +
+    " \"string\":k=B(k);break;default:throw Error(\"Illegal primitive type" +
+    " for comparison.\");}if(e==b&&a(k,d)||e==c&&a(d,k))return!0}return!" +
+    "1}return e?\n\"boolean\"==typeof b||\"boolean\"==typeof c?a(!!b,!!c):\"n" +
+    "umber\"==typeof b||\"number\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}Ab.p" +
+    "rototype.g=function(a){return this.i.B(this.o,this.v,a)};Ab.protot" +
+    "ype.toString=function(){var a=\"Binary Expression: \"+this.i;a+=G(th" +
+    "is.o);return a+=G(this.v)};function Db(a,b,c,d){this.R=a;this.M=b;" +
+    "this.u=c;this.B=d}Db.prototype.toString=function(){return this.R};" +
+    "var Eb={};\nfunction K(a,b,c,d){if(Eb.hasOwnProperty(a))throw Error" +
+    "(\"Binary operator already created: \"+a);a=new Db(a,b,c,d);return E" +
+    "b[a.toString()]=a}K(\"div\",6,1,function(a,b,c){return H(a,c)/H(b,c)" +
+    "});K(\"mod\",6,1,function(a,b,c){return H(a,c)%H(b,c)});K(\"*\",6,1,fu" +
+    "nction(a,b,c){return H(a,c)*H(b,c)});K(\"+\",5,1,function(a,b,c){ret" +
+    "urn H(a,c)+H(b,c)});K(\"-\",5,1,function(a,b,c){return H(a,c)-H(b,c)" +
+    "});K(\"<\",4,2,function(a,b,c){return Cb(function(d,e){return d<e},a" +
+    ",b,c)});\nK(\">\",4,2,function(a,b,c){return Cb(function(d,e){return " +
+    "d>e},a,b,c)});K(\"<=\",4,2,function(a,b,c){return Cb(function(d,e){r" +
+    "eturn d<=e},a,b,c)});K(\">=\",4,2,function(a,b,c){return Cb(function" +
+    "(d,e){return d>=e},a,b,c)});var Bb=K(\"=\",3,2,function(a,b,c){retur" +
+    "n Cb(function(d,e){return d==e},a,b,c,!0)});K(\"!=\",3,2,function(a," +
+    "b,c){return Cb(function(d,e){return d!=e},a,b,c,!0)});K(\"and\",2,2," +
+    "function(a,b,c){return zb(a,c)&&zb(b,c)});K(\"or\",1,2,function(a,b," +
+    "c){return zb(a,c)||zb(b,c)});function Fb(a,b){if(b.g.length&&4!=a." +
+    "u)throw Error(\"Primary expression must evaluate to nodeset if filt" +
+    "er has predicate(s).\");F.call(this,a.u);this.o=a;this.i=b;this.s=a" +
+    ".s;this.h=a.h}l(Fb,F);Fb.prototype.g=function(a){a=this.o.g(a);ret" +
+    "urn Gb(this.i,a)};Fb.prototype.toString=function(){var a=\"Filter:\"" +
+    "+G(this.o);return a+=G(this.i)};function Hb(a,b){if(b.length<a.L)t" +
+    "hrow Error(\"Function \"+a.A+\" expects at least\"+a.L+\" arguments, \"+" +
+    "b.length+\" given\");if(null!==a.I&&b.length>a.I)throw Error(\"Functi" +
+    "on \"+a.A+\" expects at most \"+a.I+\" arguments, \"+b.length+\" given\")" +
+    ";a.P&&m(b,function(c,d){if(4!=c.u)throw Error(\"Argument \"+d+\" to f" +
+    "unction \"+a.A+\" is not of type Nodeset: \"+c);});F.call(this,a.u);t" +
+    "his.C=a;this.i=b;wb(this,a.s||n(b,function(c){return c.s}));xb(thi" +
+    "s,a.O&&!b.length||a.N&&!!b.length||n(b,function(c){return c.h}))}l" +
+    "(Hb,F);\nHb.prototype.g=function(a){return this.C.B.apply(null,Ba(a" +
+    ",this.i))};Hb.prototype.toString=function(){var a=\"Function: \"+thi" +
+    "s.C;if(this.i.length){var b=za(this.i,function(c,d){return c+G(d)}" +
+    ",\"Arguments:\");a+=G(b)}return a};function Ib(a,b,c,d,e,f,g,k){this" +
+    ".A=a;this.u=b;this.s=c;this.O=d;this.N=!1;this.B=e;this.L=f;this.I" +
+    "=void 0!==g?g:f;this.P=!!k}Ib.prototype.toString=function(){return" +
+    " this.A};var Jb={};\nfunction L(a,b,c,d,e,f,g,k){if(Jb.hasOwnProper" +
+    "ty(a))throw Error(\"Function already created: \"+a+\".\");Jb[a]=new Ib" +
+    "(a,b,c,d,e,f,g,k)}L(\"boolean\",2,!1,!1,function(a,b){return zb(b,a)" +
+    "},1);L(\"ceiling\",1,!1,!1,function(a,b){return Math.ceil(H(b,a))},1" +
+    ");L(\"concat\",3,!1,!1,function(a,b){var c=Ca(arguments,1);return za" +
+    "(c,function(d,e){return d+I(e,a)},\"\")},2,null);L(\"contains\",2,!1,!" +
+    "1,function(a,b,c){b=I(b,a);a=I(c,a);return-1!=b.indexOf(a)},2);L(\"" +
+    "count\",1,!1,!1,function(a,b){return b.g(a).h},1,1,!0);\nL(\"false\",2" +
+    ",!1,!1,function(){return!1},0);L(\"floor\",1,!1,!1,function(a,b){ret" +
+    "urn Math.floor(H(b,a))},1);L(\"id\",4,!1,!1,function(a,b){var c=a.g," +
+    "d=9==c.nodeType?c:c.ownerDocument;a=I(b,a).split(/\\s+/);var e=[];m" +
+    "(a,function(g){g=d.getElementById(g);!g||0<=ya(e,g)||e.push(g)});e" +
+    ".sort(Oa);var f=new C;m(e,function(g){f.add(g)});return f},1);L(\"l" +
+    "ang\",2,!1,!1,function(){return!1},1);L(\"last\",1,!0,!1,function(a){" +
+    "if(1!=arguments.length)throw Error(\"Function last expects ()\");ret" +
+    "urn a.h},0);\nL(\"local-name\",3,!1,!0,function(a,b){return(a=b?qb(b." +
+    "g(a)):a.g)?a.localName||a.nodeName.toLowerCase():\"\"},0,1,!0);L(\"na" +
+    "me\",3,!1,!0,function(a,b){return(a=b?qb(b.g(a)):a.g)?a.nodeName.to" +
+    "LowerCase():\"\"},0,1,!0);L(\"namespace-uri\",3,!0,!1,function(){retur" +
+    "n\"\"},0,1,!0);L(\"normalize-space\",3,!1,!0,function(a,b){return(b?I(" +
+    "b,a):B(a.g)).replace(/[\\s\\xa0]+/g,\" \").replace(/^\\s+|\\s+$/g,\"\")},0" +
+    ",1);L(\"not\",2,!1,!1,function(a,b){return!zb(b,a)},1);L(\"number\",1," +
+    "!1,!0,function(a,b){return b?H(b,a):+B(a.g)},0,1);\nL(\"position\",1," +
+    "!0,!1,function(a){return a.j},0);L(\"round\",1,!1,!1,function(a,b){r" +
+    "eturn Math.round(H(b,a))},1);L(\"starts-with\",2,!1,!1,function(a,b," +
+    "c){b=I(b,a);a=I(c,a);return 0==b.lastIndexOf(a,0)},2);L(\"string\",3" +
+    ",!1,!0,function(a,b){return b?I(b,a):B(a.g)},0,1);L(\"string-length" +
+    "\",1,!1,!0,function(a,b){return(b?I(b,a):B(a.g)).length},0,1);\nL(\"s" +
+    "ubstring\",3,!1,!1,function(a,b,c,d){c=H(c,a);if(isNaN(c)||Infinity" +
+    "==c||-Infinity==c)return\"\";d=d?H(d,a):Infinity;if(isNaN(d)||-Infin" +
+    "ity===d)return\"\";c=Math.round(c)-1;var e=Math.max(c,0);a=I(b,a);re" +
+    "turn Infinity==d?a.substring(e):a.substring(e,c+Math.round(d))},2," +
+    "3);L(\"substring-after\",3,!1,!1,function(a,b,c){b=I(b,a);a=I(c,a);c" +
+    "=b.indexOf(a);return-1==c?\"\":b.substring(c+a.length)},2);\nL(\"subst" +
+    "ring-before\",3,!1,!1,function(a,b,c){b=I(b,a);a=I(c,a);a=b.indexOf" +
+    "(a);return-1==a?\"\":b.substring(0,a)},2);L(\"sum\",1,!1,!1,function(a" +
+    ",b){a=E(b.g(a));b=0;for(var c=a.next();c;c=a.next())b+=+B(c);retur" +
+    "n b},1,1,!0);L(\"translate\",3,!1,!1,function(a,b,c,d){b=I(b,a);c=I(" +
+    "c,a);var e=I(d,a);a={};for(d=0;d<c.length;d++){var f=c.charAt(d);f" +
+    " in a||(a[f]=e.charAt(d))}c=\"\";for(d=0;d<b.length;d++)f=b.charAt(d" +
+    "),c+=f in a?a[f]:f;return c},3);L(\"true\",2,!1,!1,function(){return" +
+    "!0},0);function D(a,b){this.o=a;this.i=void 0!==b?b:null;this.h=nu" +
+    "ll;switch(a){case \"comment\":this.h=8;break;case \"text\":this.h=3;br" +
+    "eak;case \"processing-instruction\":this.h=7;break;case \"node\":break" +
+    ";default:throw Error(\"Unexpected argument\");}}function Kb(a){retur" +
+    "n\"comment\"==a||\"text\"==a||\"processing-instruction\"==a||\"node\"==a}D" +
+    ".prototype.g=function(a){return null===this.h||this.h==a.nodeType}" +
+    ";D.prototype.getType=function(){return this.h};D.prototype.j=funct" +
+    "ion(){return this.o};\nD.prototype.toString=function(){var a=\"Kind " +
+    "Test: \"+this.o;null!==this.i&&(a+=G(this.i));return a};function Lb" +
+    "(a){F.call(this,3);this.i=a.substring(1,a.length-1)}l(Lb,F);Lb.pro" +
+    "totype.g=function(){return this.i};Lb.prototype.toString=function(" +
+    "){return\"Literal: \"+this.i};function Mb(a,b){this.A=a.toLowerCase(" +
+    ");this.h=b?b.toLowerCase():\"http://www.w3.org/1999/xhtml\"}Mb.proto" +
+    "type.g=function(a){var b=a.nodeType;return 1!=b&&2!=b?!1:\"*\"!=this" +
+    ".A&&this.A!=a.nodeName.toLowerCase()?!1:this.h==(a.namespaceURI?a." +
+    "namespaceURI.toLowerCase():\"http://www.w3.org/1999/xhtml\")};Mb.pro" +
+    "totype.j=function(){return this.A};Mb.prototype.toString=function(" +
+    "){return\"Name Test: \"+(\"http://www.w3.org/1999/xhtml\"==this.h?\"\":t" +
+    "his.h+\":\")+this.A};function Nb(a){F.call(this,1);this.i=a}l(Nb,F);" +
+    "Nb.prototype.g=function(){return this.i};Nb.prototype.toString=fun" +
+    "ction(){return\"Number: \"+this.i};function Ob(a,b){F.call(this,a.u)" +
+    ";this.o=a;this.i=b;this.s=a.s;this.h=a.h;1==this.i.length&&(a=this" +
+    ".i[0],a.D||a.i!=Pb||(a=a.v,\"*\"!=a.j()&&(this.j={name:a.j(),H:null}" +
+    ")))}l(Ob,F);function Qb(){F.call(this,4)}l(Qb,F);Qb.prototype.g=fu" +
+    "nction(a){var b=new C;a=a.g;9==a.nodeType?b.add(a):b.add(a.ownerDo" +
+    "cument);return b};Qb.prototype.toString=function(){return\"Root Hel" +
+    "per Expression\"};function Rb(){F.call(this,4)}l(Rb,F);Rb.prototype" +
+    ".g=function(a){var b=new C;b.add(a.g);return b};Rb.prototype.toStr" +
+    "ing=function(){return\"Context Helper Expression\"};\nfunction Sb(a){" +
+    "return\"/\"==a||\"//\"==a}Ob.prototype.g=function(a){var b=this.o.g(a)" +
+    ";if(!(b instanceof C))throw Error(\"Filter expression must evaluate" +
+    " to nodeset.\");a=this.i;for(var c=0,d=a.length;c<d&&b.h;c++){var e" +
+    "=a[c],f=E(b,e.i.G);if(e.s||e.i!=Tb)if(e.s||e.i!=Ub){var g=f.next()" +
+    ";for(b=e.g(new db(g));null!=(g=f.next());)g=e.g(new db(g)),b=ob(b," +
+    "g)}else g=f.next(),b=e.g(new db(g));else{for(g=f.next();(b=f.next(" +
+    "))&&(!g.contains||g.contains(b))&&b.compareDocumentPosition(g)&8;g" +
+    "=b);b=e.g(new db(g))}}return b};\nOb.prototype.toString=function(){" +
+    "var a=\"Path Expression:\"+G(this.o);if(this.i.length){var b=za(this" +
+    ".i,function(c,d){return c+G(d)},\"Steps:\");a+=G(b)}return a};functi" +
+    "on Vb(a,b){this.g=a;this.G=!!b}\nfunction Gb(a,b,c){for(c=c||0;c<a." +
+    "g.length;c++)for(var d=a.g[c],e=E(b),f=b.h,g,k=0;g=e.next();k++){v" +
+    "ar q=a.G?f-k:k+1;g=d.g(new db(g,q,f));if(\"number\"==typeof g)q=q==g" +
+    ";else if(\"string\"==typeof g||\"boolean\"==typeof g)q=!!g;else if(g i" +
+    "nstanceof C)q=0<g.h;else throw Error(\"Predicate.evaluate returned " +
+    "an unexpected type.\");if(!q){q=e;g=q.j;var t=q.g;if(!t)throw Error" +
+    "(\"Next must be called at least once before remove.\");var r=t.g;t=t" +
+    ".next;r?r.next=t:g.g=t;t?t.g=r:g.j=r;g.h--;q.g=null}}return b}\nVb." +
+    "prototype.toString=function(){return za(this.g,function(a,b){retur" +
+    "n a+G(b)},\"Predicates:\")};function M(a,b,c,d){F.call(this,4);this."
+  )
+      .append(
+    "i=a;this.v=b;this.o=c||new Vb([]);this.D=!!d;b=this.o;b=0<b.g.leng" +
+    "th?b.g[0].j:null;a.U&&b&&(this.j={name:b.name,H:b.H});a:{a=this.o;" +
+    "for(b=0;b<a.g.length;b++)if(c=a.g[b],c.s||1==c.u||0==c.u){a=!0;bre" +
+    "ak a}a=!1}this.s=a}l(M,F);\nM.prototype.g=function(a){var b=a.g,c=t" +
+    "his.j,d=null,e=null,f=0;c&&(d=c.name,e=c.H?I(c.H,a):null,f=1);if(t" +
+    "his.D)if(this.s||this.i!=Wb)if(b=E((new M(Xb,new D(\"node\"))).g(a))" +
+    ",c=b.next())for(a=this.B(c,d,e,f);null!=(c=b.next());)a=ob(a,this." +
+    "B(c,d,e,f));else a=new C;else a=kb(this.v,b,d,e),a=Gb(this.o,a,f);" +
+    "else a=this.B(a.g,d,e,f);return a};M.prototype.B=function(a,b,c,d)" +
+    "{a=this.i.C(this.v,a,b,c);return a=Gb(this.o,a,d)};\nM.prototype.to" +
+    "String=function(){var a=\"Step:\"+G(\"Operator: \"+(this.D?\"//\":\"/\"));" +
+    "this.i.A&&(a+=G(\"Axis: \"+this.i));a+=G(this.v);if(this.o.g.length)" +
+    "{var b=za(this.o.g,function(c,d){return c+G(d)},\"Predicates:\");a+=" +
+    "G(b)}return a};function Yb(a,b,c,d){this.A=a;this.C=b;this.G=c;thi" +
+    "s.U=d}Yb.prototype.toString=function(){return this.A};var Zb={};fu" +
+    "nction N(a,b,c,d){if(Zb.hasOwnProperty(a))throw Error(\"Axis alread" +
+    "y created: \"+a);b=new Yb(a,b,c,!!d);return Zb[a]=b}\nN(\"ancestor\",f" +
+    "unction(a,b){for(var c=new C;b=b.parentNode;)a.g(b)&&pb(c,b);retur" +
+    "n c},!0);N(\"ancestor-or-self\",function(a,b){var c=new C;do a.g(b)&" +
+    "&pb(c,b);while(b=b.parentNode);return c},!0);\nvar Pb=N(\"attribute\"" +
+    ",function(a,b){var c=new C,d=a.j();if(b=b.attributes)if(a instance" +
+    "of D&&null===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);else(" +
+    "d=b.getNamedItem(d))&&c.add(d);return c},!1),Wb=N(\"child\",function" +
+    "(a,b,c,d,e){c=\"string\"===typeof c?c:null;d=\"string\"===typeof d?d:n" +
+    "ull;e=e||new C;for(b=b.firstChild;b;b=b.nextSibling)jb(b,c,d)&&a.g" +
+    "(b)&&e.add(b);return e},!1,!0);N(\"descendant\",kb,!1,!0);\nvar Xb=N(" +
+    "\"descendant-or-self\",function(a,b,c,d){var e=new C;jb(b,c,d)&&a.g(" +
+    "b)&&e.add(b);return kb(a,b,c,d,e)},!1,!0),Tb=N(\"following\",functio" +
+    "n(a,b,c,d){var e=new C;do for(var f=b;f=f.nextSibling;)jb(f,c,d)&&" +
+    "a.g(f)&&e.add(f),e=kb(a,f,c,d,e);while(b=b.parentNode);return e},!" +
+    "1,!0);N(\"following-sibling\",function(a,b){for(var c=new C;b=b.next" +
+    "Sibling;)a.g(b)&&c.add(b);return c},!1);N(\"namespace\",function(){r" +
+    "eturn new C},!1);\nvar $b=N(\"parent\",function(a,b){var c=new C;if(9" +
+    "==b.nodeType)return c;if(2==b.nodeType)return c.add(b.ownerElement" +
+    "),c;b=b.parentNode;a.g(b)&&c.add(b);return c},!1),Ub=N(\"preceding\"" +
+    ",function(a,b,c,d){var e=new C,f=[];do f.unshift(b);while(b=b.pare" +
+    "ntNode);for(var g=1,k=f.length;g<k;g++){var q=[];for(b=f[g];b=b.pr" +
+    "eviousSibling;)q.unshift(b);for(var t=0,r=q.length;t<r;t++)b=q[t]," +
+    "jb(b,c,d)&&a.g(b)&&e.add(b),e=kb(a,b,c,d,e)}return e},!0,!0);\nN(\"p" +
+    "receding-sibling\",function(a,b){for(var c=new C;b=b.previousSiblin" +
+    "g;)a.g(b)&&pb(c,b);return c},!0);var ac=N(\"self\",function(a,b){var" +
+    " c=new C;a.g(b)&&c.add(b);return c},!1);function bc(a){F.call(this" +
+    ",1);this.i=a;this.s=a.s;this.h=a.h}l(bc,F);bc.prototype.g=function" +
+    "(a){return-H(this.i,a)};bc.prototype.toString=function(){return\"Un" +
+    "ary Expression: -\"+G(this.i)};function cc(a){F.call(this,4);this.i" +
+    "=a;wb(this,n(this.i,function(b){return b.s}));xb(this,n(this.i,fun" +
+    "ction(b){return b.h}))}l(cc,F);cc.prototype.g=function(a){var b=ne" +
+    "w C;m(this.i,function(c){c=c.g(a);if(!(c instanceof C))throw Error" +
+    "(\"Path expression must evaluate to NodeSet.\");b=ob(b,c)});return b" +
+    "};cc.prototype.toString=function(){return za(this.i,function(a,b){" +
+    "return a+G(b)},\"Union Expression:\")};function dc(a,b){this.g=a;thi" +
+    "s.h=b}function ec(a){for(var b,c=[];;){O(a,\"Missing right hand sid" +
+    "e of binary expression.\");b=fc(a);var d=a.g.next();if(!d)break;var" +
+    " e=(d=Eb[d]||null)&&d.M;if(!e){a.g.g--;break}for(;c.length&&e<=c[c" +
+    ".length-1].M;)b=new Ab(c.pop(),c.pop(),b);c.push(b,d)}for(;c.lengt" +
+    "h;)b=new Ab(c.pop(),c.pop(),b);return b}function O(a,b){if(ib(a.g)" +
+    ")throw Error(b);}function gc(a,b){a=a.g.next();if(a!=b)throw Error" +
+    "(\"Bad token, expected: \"+b+\" got: \"+a);}\nfunction hc(a){a=a.g.next" +
+    "();if(\")\"!=a)throw Error(\"Bad token: \"+a);}function ic(a){a=a.g.ne" +
+    "xt();if(2>a.length)throw Error(\"Unclosed literal string\");return n" +
+    "ew Lb(a)}function jc(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c" +
+    ")return new Mb(b);var d=b.substring(0,c);a=a.h(d);if(!a)throw Erro" +
+    "r(\"Namespace prefix not declared: \"+d);b=b.substr(c+1);return new " +
+    "Mb(b,a)}\nfunction kc(a){var b=[];if(Sb(A(a.g))){var c=a.g.next();v" +
+    "ar d=A(a.g);if(\"/\"==c&&(ib(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&" +
+    "!/(?![0-9])[\\w]/.test(d)))return new Qb;d=new Qb;O(a,\"Missing next" +
+    " location step.\");c=lc(a,c);b.push(c)}else{a:{c=A(a.g);d=c.charAt(" +
+    "0);switch(d){case \"$\":throw Error(\"Variable reference not allowed " +
+    "in HTML XPath\");case \"(\":a.g.next();c=ec(a);O(a,'unclosed \"(\"');gc" +
+    "(a,\")\");break;case '\"':case \"'\":c=ic(a);break;default:if(isNaN(+c)" +
+    ")if(!Kb(c)&&/(?![0-9])[\\w]/.test(d)&&\"(\"==A(a.g,\n1)){c=a.g.next();" +
+    "c=Jb[c]||null;a.g.next();for(d=[];\")\"!=A(a.g);){O(a,\"Missing funct" +
+    "ion argument list.\");d.push(ec(a));if(\",\"!=A(a.g))break;a.g.next()" +
+    "}O(a,\"Unclosed function argument list.\");hc(a);c=new Hb(c,d)}else{" +
+    "c=null;break a}else c=new Nb(+a.g.next())}\"[\"==A(a.g)&&(d=new Vb(m" +
+    "c(a)),c=new Fb(c,d))}if(c)if(Sb(A(a.g)))d=c;else return c;else c=l" +
+    "c(a,\"/\"),d=new Rb,b.push(c)}for(;Sb(A(a.g));)c=a.g.next(),O(a,\"Mis" +
+    "sing next location step.\"),c=lc(a,c),b.push(c);return new Ob(d,b)}" +
+    "\nfunction lc(a,b){if(\"/\"!=b&&\"//\"!=b)throw Error('Step op should b" +
+    "e \"/\" or \"//\"');if(\".\"==A(a.g)){var c=new M(ac,new D(\"node\"));a.g." +
+    "next();return c}if(\"..\"==A(a.g))return c=new M($b,new D(\"node\")),a" +
+    ".g.next(),c;if(\"@\"==A(a.g)){var d=Pb;a.g.next();O(a,\"Missing attri" +
+    "bute name\")}else if(\"::\"==A(a.g,1)){if(!/(?![0-9])[\\w]/.test(A(a.g" +
+    ").charAt(0)))throw Error(\"Bad token: \"+a.g.next());var e=a.g.next(" +
+    ");d=Zb[e]||null;if(!d)throw Error(\"No axis with name: \"+e);a.g.nex" +
+    "t();O(a,\"Missing node name\")}else d=Wb;e=\nA(a.g);if(/(?![0-9])[\\w]" +
+    "/.test(e.charAt(0)))if(\"(\"==A(a.g,1)){if(!Kb(e))throw Error(\"Inval" +
+    "id node type: \"+e);e=a.g.next();if(!Kb(e))throw Error(\"Invalid typ" +
+    "e name: \"+e);gc(a,\"(\");O(a,\"Bad nodetype\");var f=A(a.g).charAt(0)," +
+    "g=null;if('\"'==f||\"'\"==f)g=ic(a);O(a,\"Bad nodetype\");hc(a);e=new D" +
+    "(e,g)}else e=jc(a);else if(\"*\"==e)e=jc(a);else throw Error(\"Bad to" +
+    "ken: \"+a.g.next());a=new Vb(mc(a),d.G);return c||new M(d,e,a,\"//\"=" +
+    "=b)}\nfunction mc(a){for(var b=[];\"[\"==A(a.g);){a.g.next();O(a,\"Mis" +
+    "sing predicate expression.\");var c=ec(a);b.push(c);O(a,\"Unclosed p" +
+    "redicate expression.\");gc(a,\"]\")}return b}function fc(a){if(\"-\"==A" +
+    "(a.g))return a.g.next(),new bc(fc(a));var b=kc(a);if(\"|\"!=A(a.g))a" +
+    "=b;else{for(b=[b];\"|\"==a.g.next();)O(a,\"Missing next union locatio" +
+    "n path.\"),b.push(kc(a));a.g.g--;a=new cc(b)}return a};function nc(" +
+    "a,b){if(!a.length)throw Error(\"Empty XPath expression.\");a=fb(a);i" +
+    "f(ib(a))throw Error(\"Invalid XPath expression.\");b?\"function\"!==ty" +
+    "peof b&&(b=ta(b.lookupNamespaceURI,b)):b=function(){return null};v" +
+    "ar c=ec(new dc(a,b));if(!ib(a))throw Error(\"Bad token: \"+a.next())" +
+    ";this.evaluate=function(d,e){d=c.g(new db(d));return new P(d,e)}}\n" +
+    "function P(a,b){if(0==b)if(a instanceof C)b=4;else if(\"string\"==ty" +
+    "peof a)b=2;else if(\"number\"==typeof a)b=1;else if(\"boolean\"==typeo" +
+    "f a)b=3;else throw Error(\"Unexpected evaluation result.\");if(2!=b&" +
+    "&1!=b&&3!=b&&!(a instanceof C))throw Error(\"value could not be con" +
+    "verted to the specified type\");this.resultType=b;switch(b){case 2:" +
+    "this.stringValue=a instanceof C?rb(a):\"\"+a;break;case 1:this.numbe" +
+    "rValue=a instanceof C?+rb(a):+a;break;case 3:this.booleanValue=a i" +
+    "nstanceof C?0<a.h:!!a;break;case 4:case 5:case 6:case 7:var c=\nE(a" +
+    ");var d=[];for(var e=c.next();e;e=c.next())d.push(e);this.snapshot" +
+    "Length=a.h;this.invalidIteratorState=!1;break;case 8:case 9:this.s" +
+    "ingleNodeValue=qb(a);break;default:throw Error(\"Unknown XPathResul" +
+    "t type.\");}var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw" +
+    " Error(\"iterateNext called with wrong result type\");return f>=d.le" +
+    "ngth?null:d[f++]};this.snapshotItem=function(g){if(6!=b&&7!=b)thro" +
+    "w Error(\"snapshotItem called with wrong result type\");return g>=d." +
+    "length||0>g?null:d[g]}}P.ANY_TYPE=0;\nP.NUMBER_TYPE=1;P.STRING_TYPE" +
+    "=2;P.BOOLEAN_TYPE=3;P.UNORDERED_NODE_ITERATOR_TYPE=4;P.ORDERED_NOD" +
+    "E_ITERATOR_TYPE=5;P.UNORDERED_NODE_SNAPSHOT_TYPE=6;P.ORDERED_NODE_" +
+    "SNAPSHOT_TYPE=7;P.ANY_UNORDERED_NODE_TYPE=8;P.FIRST_ORDERED_NODE_T" +
+    "YPE=9;function oc(a){this.lookupNamespaceURI=tb(a)}\nfunction pc(a," +
+    "b){a=a||pa;var c=a.document;if(!c.evaluate||b)a.XPathResult=P,c.ev" +
+    "aluate=function(d,e,f,g){return(new nc(d,f)).evaluate(e,g)},c.crea" +
+    "teExpression=function(d,e){return new nc(d,e)},c.createNSResolver=" +
+    "function(d){return new oc(d)}}qa(\"wgxpath.install\",pc);var Q={};Q." +
+    "J=function(){var a={X:\"http://www.w3.org/2000/svg\"};return functio" +
+    "n(b){return a[b]||null}}();\nQ.B=function(a,b,c){var d=x(a);if(!d.d" +
+    "ocumentElement)return null;pc(La(d));try{for(var e=d.createNSResol" +
+    "ver?d.createNSResolver(d.documentElement):Q.J,f={},g=d.getElements" +
+    "ByTagName(\"*\"),k=0;k<g.length;++k){var q=g[k],t=q.namespaceURI;if(" +
+    "t&&!f[t]){var r=q.lookupPrefix(t);if(!r){var w=t.match(\".*/(\\\\w+)/" +
+    "?$\");r=w?w[1]:\"xhtml\"}f[t]=r}}var J={},S;for(S in f)J[f[S]]=S;e=fu" +
+    "nction(p){return J[p]||null};try{return d.evaluate(b,a,e,c,null)}c" +
+    "atch(p){if(\"TypeError\"===p.name)return e=d.createNSResolver?d.crea" +
+    "teNSResolver(d.documentElement):\nQ.J,d.evaluate(b,a,e,c,null);thro" +
+    "w p;}}catch(p){throw new z(32,\"Unable to locate an element with th" +
+    "e xpath expression \"+b+\" because of the following error:\\n\"+p);}};" +
+    "Q.K=function(a,b){if(!a||1!=a.nodeType)throw new z(32,'The result " +
+    "of the xpath expression \"'+b+'\" is: '+a+\". It should be an element" +
+    ".\");};\nQ.S=function(a,b){var c=function(){var d=Q.B(b,a,9);return " +
+    "d?d.singleNodeValue||null:b.selectSingleNode?(d=x(b),d.setProperty" +
+    "&&d.setProperty(\"SelectionLanguage\",\"XPath\"),b.selectSingleNode(a)" +
+    "):null}();null!==c&&Q.K(c,a);return c};\nQ.W=function(a,b){var c=fu" +
+    "nction(){var d=Q.B(b,a,7);if(d){for(var e=d.snapshotLength,f=[],g=" +
+    "0;g<e;++g)f.push(d.snapshotItem(g));return f}return b.selectNodes?" +
+    "(d=x(b),d.setProperty&&d.setProperty(\"SelectionLanguage\",\"XPath\")," +
+    "b.selectNodes(a)):[]}();m(c,function(d){Q.K(d,a)});return c};var q" +
+    "c={aliceblue:\"#f0f8ff\",antiquewhite:\"#faebd7\",aqua:\"#00ffff\",aquam" +
+    "arine:\"#7fffd4\",azure:\"#f0ffff\",beige:\"#f5f5dc\",bisque:\"#ffe4c4\",b" +
+    "lack:\"#000000\",blanchedalmond:\"#ffebcd\",blue:\"#0000ff\",blueviolet:" +
+    "\"#8a2be2\",brown:\"#a52a2a\",burlywood:\"#deb887\",cadetblue:\"#5f9ea0\"," +
+    "chartreuse:\"#7fff00\",chocolate:\"#d2691e\",coral:\"#ff7f50\",cornflowe" +
+    "rblue:\"#6495ed\",cornsilk:\"#fff8dc\",crimson:\"#dc143c\",cyan:\"#00ffff" +
+    "\",darkblue:\"#00008b\",darkcyan:\"#008b8b\",darkgoldenrod:\"#b8860b\",da" +
+    "rkgray:\"#a9a9a9\",darkgreen:\"#006400\",\ndarkgrey:\"#a9a9a9\",darkkhaki" +
+    ":\"#bdb76b\",darkmagenta:\"#8b008b\",darkolivegreen:\"#556b2f\",darkoran" +
+    "ge:\"#ff8c00\",darkorchid:\"#9932cc\",darkred:\"#8b0000\",darksalmon:\"#e" +
+    "9967a\",darkseagreen:\"#8fbc8f\",darkslateblue:\"#483d8b\",darkslategra" +
+    "y:\"#2f4f4f\",darkslategrey:\"#2f4f4f\",darkturquoise:\"#00ced1\",darkvi" +
+    "olet:\"#9400d3\",deeppink:\"#ff1493\",deepskyblue:\"#00bfff\",dimgray:\"#" +
+    "696969\",dimgrey:\"#696969\",dodgerblue:\"#1e90ff\",firebrick:\"#b22222\"" +
+    ",floralwhite:\"#fffaf0\",forestgreen:\"#228b22\",fuchsia:\"#ff00ff\",gai" +
+    "nsboro:\"#dcdcdc\",\nghostwhite:\"#f8f8ff\",gold:\"#ffd700\",goldenrod:\"#" +
+    "daa520\",gray:\"#808080\",green:\"#008000\",greenyellow:\"#adff2f\",grey:" +
+    "\"#808080\",honeydew:\"#f0fff0\",hotpink:\"#ff69b4\",indianred:\"#cd5c5c\"" +
+    ",indigo:\"#4b0082\",ivory:\"#fffff0\",khaki:\"#f0e68c\",lavender:\"#e6e6f" +
+    "a\",lavenderblush:\"#fff0f5\",lawngreen:\"#7cfc00\",lemonchiffon:\"#fffa" +
+    "cd\",lightblue:\"#add8e6\",lightcoral:\"#f08080\",lightcyan:\"#e0ffff\",l" +
+    "ightgoldenrodyellow:\"#fafad2\",lightgray:\"#d3d3d3\",lightgreen:\"#90e" +
+    "e90\",lightgrey:\"#d3d3d3\",lightpink:\"#ffb6c1\",lightsalmon:\"#ffa07a\"" +
+    ",\nlightseagreen:\"#20b2aa\",lightskyblue:\"#87cefa\",lightslategray:\"#" +
+    "778899\",lightslategrey:\"#778899\",lightsteelblue:\"#b0c4de\",lightyel" +
+    "low:\"#ffffe0\",lime:\"#00ff00\",limegreen:\"#32cd32\",linen:\"#faf0e6\",m" +
+    "agenta:\"#ff00ff\",maroon:\"#800000\",mediumaquamarine:\"#66cdaa\",mediu" +
+    "mblue:\"#0000cd\",mediumorchid:\"#ba55d3\",mediumpurple:\"#9370db\",medi" +
+    "umseagreen:\"#3cb371\",mediumslateblue:\"#7b68ee\",mediumspringgreen:\"" +
+    "#00fa9a\",mediumturquoise:\"#48d1cc\",mediumvioletred:\"#c71585\",midni" +
+    "ghtblue:\"#191970\",mintcream:\"#f5fffa\",mistyrose:\"#ffe4e1\",\nmoccasi" +
+    "n:\"#ffe4b5\",navajowhite:\"#ffdead\",navy:\"#000080\",oldlace:\"#fdf5e6\"" +
+    ",olive:\"#808000\",olivedrab:\"#6b8e23\",orange:\"#ffa500\",orangered:\"#" +
+    "ff4500\",orchid:\"#da70d6\",palegoldenrod:\"#eee8aa\",palegreen:\"#98fb9" +
+    "8\",paleturquoise:\"#afeeee\",palevioletred:\"#db7093\",papayawhip:\"#ff" +
+    "efd5\",peachpuff:\"#ffdab9\",peru:\"#cd853f\",pink:\"#ffc0cb\",plum:\"#dda" +
+    "0dd\",powderblue:\"#b0e0e6\",purple:\"#800080\",red:\"#ff0000\",rosybrown" +
+    ":\"#bc8f8f\",royalblue:\"#4169e1\",saddlebrown:\"#8b4513\",salmon:\"#fa80" +
+    "72\",sandybrown:\"#f4a460\",seagreen:\"#2e8b57\",\nseashell:\"#fff5ee\",si" +
+    "enna:\"#a0522d\",silver:\"#c0c0c0\",skyblue:\"#87ceeb\",slateblue:\"#6a5a" +
+    "cd\",slategray:\"#708090\",slategrey:\"#708090\",snow:\"#fffafa\",springg" +
+    "reen:\"#00ff7f\",steelblue:\"#4682b4\",tan:\"#d2b48c\",teal:\"#008080\",th" +
+    "istle:\"#d8bfd8\",tomato:\"#ff6347\",turquoise:\"#40e0d0\",violet:\"#ee82" +
+    "ee\",wheat:\"#f5deb3\",white:\"#ffffff\",whitesmoke:\"#f5f5f5\",yellow:\"#" +
+    "ffff00\",yellowgreen:\"#9acd32\"};var rc=\"backgroundColor borderTopCo" +
+    "lor borderRightColor borderBottomColor borderLeftColor color outli" +
+    "neColor\".split(\" \"),sc=/#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])/," +
+    "tc=/^#(?:[0-9a-f]{3}){1,2}$/i,uc=/^(?:rgba)?\\((\\d{1,3}),\\s?(\\d{1,3" +
+    "}),\\s?(\\d{1,3}),\\s?(0|1|0\\.\\d*)\\)$/i,vc=/^(?:rgb)?\\((0|[1-9]\\d{0,2" +
+    "}),\\s?(0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2})\\)$/i;function wc(a){ret" +
+    "urn(a=a.getAttributeNode(\"tabindex\"))&&a.specified?a.value:null}va" +
+    "r xc=RegExp(\"[;]+(?=(?:(?:[^\\\"]*\\\"){2})*[^\\\"]*$)(?=(?:(?:[^']*'){2" +
+    "})*[^']*$)(?=(?:[^()]*\\\\([^()]*\\\\))*[^()]*$)\");function yc(a){var " +
+    "b=[];m(a.split(xc),function(c){var d=c.indexOf(\":\");0<d&&(c=[c.sli" +
+    "ce(0,d),c.slice(d+1)],2==c.length&&b.push(c[0].toLowerCase(),\":\",c" +
+    "[1],\";\"))});b=b.join(\"\");return b=\";\"==b.charAt(b.length-1)?b:b+\";" +
+    "\"}\nfunction R(a,b){b&&\"string\"!==typeof b&&(b=b.toString());return" +
+    "!!a&&1==a.nodeType&&(!b||a.tagName.toUpperCase()==b)}function Ac(a" +
+    "){return R(a,\"OPTION\")?!0:R(a,\"INPUT\")?(a=a.type.toLowerCase(),\"ch" +
+    "eckbox\"==a||\"radio\"==a):!1}function Bc(a){if(!Ac(a))throw new z(15" +
+    ",\"Element is not selectable\");var b=\"selected\",c=a.type&&a.type.to" +
+    "LowerCase();if(\"checkbox\"==c||\"radio\"==c)b=\"checked\";return!!a[b]}" +
+    ";function Cc(a){return Dc(a)&&Ec(a)&&\"none\"!=T(a,\"pointer-events\")" +
+    "}var Fc=\"A AREA BUTTON INPUT LABEL SELECT TEXTAREA\".split(\" \");fun" +
+    "ction Gc(a){return n(Fc,function(b){return R(a,b)})||null!=wc(a)&&" +
+    "0<=Number(a.tabIndex)||Hc(a)}var Ic=\"BUTTON INPUT OPTGROUP OPTION " +
+    "SELECT TEXTAREA\".split(\" \");\nfunction Ec(a){return n(Ic,function(b" +
+    "){return R(a,b)})?a.disabled?!1:a.parentNode&&1==a.parentNode.node" +
+    "Type&&R(a,\"OPTGROUP\")||R(a,\"OPTION\")?Ec(a.parentNode):!Ra(a,functi" +
+    "on(b){var c=b.parentNode;if(c&&R(c,\"FIELDSET\")&&c.disabled){if(!R(" +
+    "b,\"LEGEND\"))return!0;for(;b=void 0!==b.previousElementSibling?b.pr" +
+    "eviousElementSibling:Ma(b.previousSibling);)if(R(b,\"LEGEND\"))retur" +
+    "n!0}return!1},!0):!0}var Jc=\"text search tel url email password nu" +
+    "mber\".split(\" \");\nfunction U(a,b){return R(a,\"INPUT\")?a.type.toLow" +
+    "erCase()==b:!1}function Kc(a){function b(c){return\"inherit\"==c.con" +
+    "tentEditable?(c=Lc(c))?b(c):!1:\"true\"==c.contentEditable}return vo" +
+    "id 0===a.contentEditable?!1:void 0===a.isContentEditable?b(a):a.is" +
+    "ContentEditable}\nfunction Hc(a){return((R(a,\"TEXTAREA\")?!0:R(a,\"IN" +
+    "PUT\")?0<=ya(Jc,a.type.toLowerCase()):Kc(a)?!0:!1)||(R(a,\"INPUT\")?\"" +
+    "file\"==a.type.toLowerCase():!1)||U(a,\"range\")||U(a,\"date\")||U(a,\"m" +
+    "onth\")||U(a,\"week\")||U(a,\"time\")||U(a,\"datetime-local\")||U(a,\"colo" +
+    "r\"))&&!a.readOnly}function Lc(a){for(a=a.parentNode;a&&1!=a.nodeTy" +
+    "pe&&9!=a.nodeType&&11!=a.nodeType;)a=a.parentNode;return R(a)?a:nu" +
+    "ll}\nfunction T(a,b){b=Ka(b);if(\"float\"==b||\"cssFloat\"==b||\"styleFl" +
+    "oat\"==b)b=\"cssFloat\";a=Va(a,b)||Mc(a,b);if(null===a)a=null;else if" +
+    "(0<=ya(rc,b)){b:{var c=a.match(uc);if(c){b=Number(c[1]);var d=Numb" +
+    "er(c[2]),e=Number(c[3]);c=Number(c[4]);if(0<=b&&255>=b&&0<=d&&255>" +
+    "=d&&0<=e&&255>=e&&0<=c&&1>=c){b=[b,d,e,c];break b}}b=null}if(!b)b:" +
+    "{if(e=a.match(vc))if(b=Number(e[1]),d=Number(e[2]),e=Number(e[3])," +
+    "0<=b&&255>=b&&0<=d&&255>=d&&0<=e&&255>=e){b=[b,d,e,1];break b}b=nu" +
+    "ll}if(!b)b:{b=a.toLowerCase();d=qc[b.toLowerCase()];\nif(!d&&(d=\"#\"" +
+    "==b.charAt(0)?b:\"#\"+b,4==d.length&&(d=d.replace(sc,\"#$1$1$2$2$3$3\"" +
+    ")),!tc.test(d))){b=null;break b}b=[parseInt(d.substr(1,2),16),pars" +
+    "eInt(d.substr(3,2),16),parseInt(d.substr(5,2),16),1]}a=b?\"rgba(\"+b" +
+    ".join(\", \")+\")\":a}return a}function Mc(a,b){var c=a.currentStyle||" +
+    "a.style,d=c[b];void 0===d&&\"function\"===typeof c.getPropertyValue&" +
+    "&(d=c.getPropertyValue(b));return\"inherit\"!=d?void 0!==d?d:null:(a" +
+    "=Lc(a))?Mc(a,b):null}\nfunction Nc(a,b,c){function d(g){var k=Oc(g)" +
+    ";return 0<k.height&&0<k.width?!0:R(g,\"PATH\")&&(0<k.height||0<k.wid" +
+    "th)?(g=T(g,\"stroke-width\"),!!g&&0<parseInt(g,10)):\"hidden\"!=T(g,\"o" +
+    "verflow\")&&n(g.childNodes,function(q){return 3==q.nodeType||R(q)&&" +
+    "d(q)})}function e(g){return\"hidden\"==Pc(g)&&Aa(g.childNodes,functi" +
+    "on(k){return!R(k)||e(k)||!d(k)})}if(!R(a))throw Error(\"Argument to" +
+    " isShown must be of type Element\");if(R(a,\"BODY\"))return!0;if(R(a," +
+    "\"OPTION\")||R(a,\"OPTGROUP\"))return a=Ra(a,function(g){return R(g,\n\"" +
+    "SELECT\")}),!!a&&Nc(a,!0,c);var f=Qc(a);if(f)return!!f.image&&0<f.r" +
+    "ect.width&&0<f.rect.height&&Nc(f.image,b,c);if(R(a,\"INPUT\")&&\"hidd" +
+    "en\"==a.type.toLowerCase()||R(a,\"NOSCRIPT\"))return!1;f=T(a,\"visibil" +
+    "ity\");return\"collapse\"!=f&&\"hidden\"!=f&&c(a)&&(b||0!=Rc(a))&&d(a)?" +
+    "!e(a):!1}\nfunction Dc(a){function b(c){if(R(c)&&\"none\"==T(c,\"displ" +
+    "ay\"))return!1;var d;(d=c.parentNode)&&d.shadowRoot&&void 0!==c.ass" +
+    "ignedSlot?d=c.assignedSlot?c.assignedSlot.parentNode:null:c.getDes" +
+    "tinationInsertionPoints&&(c=c.getDestinationInsertionPoints(),0<c." +
+    "length&&(d=c[c.length-1]));return!d||9!=d.nodeType&&11!=d.nodeType" +
+    "?!!d&&b(d):!0}return Nc(a,!0,b)}\nfunction Pc(a,b){function c(p){fu" +
+    "nction v(yb){return yb==g?!0:0==T(yb,\"display\").lastIndexOf(\"inlin" +
+    "e\",0)||\"absolute\"==zc&&\"static\"==T(yb,\"position\")?!1:!0}var zc=T(p" +
+    ",\"position\");if(\"fixed\"==zc)return t=!0,p==g?null:g;for(p=Lc(p);p&" +
+    "&!v(p);)p=Lc(p);return p}function d(p){var v=p;if(\"visible\"==q)if(" +
+    "p==g&&k)v=k;else if(p==k)return{x:\"visible\",y:\"visible\"};v={x:T(v," +
+    "\"overflow-x\"),y:T(v,\"overflow-y\")};p==g&&(v.x=\"visible\"==v.x?\"auto" +
+    "\":v.x,v.y=\"visible\"==v.y?\"auto\":v.y);return v}function e(p){if(p==" +
+    "g){var v=\n(new Ta(f)).g;p=v.scrollingElement?v.scrollingElement:v." +
+    "body||v.documentElement;v=v.parentWindow||v.defaultView;p=new u(v." +
+    "pageXOffset||p.scrollLeft,v.pageYOffset||p.scrollTop)}else p=new u" +
+    "(p.scrollLeft,p.scrollTop);return p}b=Sc(a,b);var f=x(a),g=f.docum" +
+    "entElement,k=f.body,q=T(g,\"overflow\"),t;for(a=c(a);a;a=c(a)){var r" +
+    "=d(a);if(\"visible\"!=r.x||\"visible\"!=r.y){var w=Oc(a);if(0==w.width" +
+    "||0==w.height)return\"hidden\";var J=b.right<w.left,S=b.bottom<w.top" +
+    ";if(J&&\"hidden\"==r.x||S&&\"hidden\"==r.y)return\"hidden\";\nif(J&&\"visi" +
+    "ble\"!=r.x||S&&\"visible\"!=r.y){J=e(a);S=b.bottom<w.top-J.y;if(b.rig" +
+    "ht<w.left-J.x&&\"visible\"!=r.x||S&&\"visible\"!=r.x)return\"hidden\";b=" +
+    "Pc(a);return\"hidden\"==b?\"hidden\":\"scroll\"}J=b.left>=w.left+w.width" +
+    ";w=b.top>=w.top+w.height;if(J&&\"hidden\"==r.x||w&&\"hidden\"==r.y)ret" +
+    "urn\"hidden\";if(J&&\"visible\"!=r.x||w&&\"visible\"!=r.y){if(t&&(r=e(a)" +
+    ",b.left>=g.scrollWidth-r.x||b.right>=g.scrollHeight-r.y))return\"hi" +
+    "dden\";b=Pc(a);return\"hidden\"==b?\"hidden\":\"scroll\"}}}return\"none\"}\n" +
+    "function Oc(a){var b=Qc(a);if(b)return b.rect;if(R(a,\"HTML\"))retur" +
+    "n a=x(a),a=(La(a)||window).document,a=\"CSS1Compat\"==a.compatMode?a" +
+    ".documentElement:a.body,a=new Ja(a.clientWidth,a.clientHeight),new" +
+    " y(0,0,a.width,a.height);try{var c=a.getBoundingClientRect()}catch" +
+    "(d){return new y(0,0,0,0)}return new y(c.left,c.top,c.right-c.left" +
+    ",c.bottom-c.top)}\nfunction Qc(a){var b=R(a,\"MAP\");if(!b&&!R(a,\"ARE" +
+    "A\"))return null;var c=b?a:R(a.parentNode,\"MAP\")?a.parentNode:null," +
+    "d=null,e=null;c&&c.name&&(d=x(c),d=Q.S('/descendant::*[@usemap = \"" +
+    "#'+c.name+'\"]',d))&&(e=Oc(d),b||\"default\"==a.shape.toLowerCase()||" +
+    "(a=Tc(a),b=Math.min(Math.max(a.left,0),e.width),c=Math.min(Math.ma" +
+    "x(a.top,0),e.height),e=new y(b+e.left,c+e.top,Math.min(a.width,e.w" +
+    "idth-b),Math.min(a.height,e.height-c))));return{image:d,rect:e||ne" +
+    "w y(0,0,0,0)}}\nfunction Tc(a){var b=a.shape.toLowerCase();a=a.coor" +
+    "ds.split(\",\");if(\"rect\"==b&&4==a.length){b=a[0];var c=a[1];return " +
+    "new y(b,c,a[2]-b,a[3]-c)}if(\"circle\"==b&&3==a.length)return b=a[2]" +
+    ",new y(a[0]-b,a[1]-b,2*b,2*b);if(\"poly\"==b&&2<a.length){b=a[0];c=a" +
+    "[1];for(var d=b,e=c,f=2;f+1<a.length;f+=2)b=Math.min(b,a[f]),d=Mat" +
+    "h.max(d,a[f]),c=Math.min(c,a[f+1]),e=Math.max(e,a[f+1]);return new" +
+    " y(b,c,d-b,e-c)}return new y(0,0,0,0)}\nfunction Sc(a,b){a=Oc(a);a=" +
+    "new Ua(a.top,a.left+a.width,a.top+a.height,a.left);b&&(b=b instanc" +
+    "eof y?b:new y(b.x,b.y,1,1),a.left=Math.min(Math.max(a.left+b.left," +
+    "a.left),a.right),a.top=Math.min(Math.max(a.top+b.top,a.top),a.bott" +
+    "om),a.right=Math.min(Math.max(a.left+b.width,a.left),a.right),a.bo" +
+    "ttom=Math.min(Math.max(a.top+b.height,a.top),a.bottom));return a}f" +
+    "unction Rc(a){var b=1,c=T(a,\"opacity\");c&&(b=Number(c));(a=Lc(a))&" +
+    "&(b*=Rc(a));return b};function Uc(){this.g=Xa.document.documentEle" +
+    "ment;this.j=null;var a=Sa(x(this.g));a&&Vc(this,a)}function Vc(a,b" +
+    "){a.g=b;R(b,\"OPTION\")?a.j=Ra(b,function(c){return R(c,\"SELECT\")}):" +
+    "a.j=null}\nfunction Wc(a,b,c,d,e,f,g,k){if(!g&&!Cc(a.g))return!1;if" +
+    "(e&&Xc!=b&&Yc!=b)throw new z(12,\"Event type does not allow related" +
+    " target: \"+b);c={clientX:c.x,clientY:c.y,button:d,altKey:!1,ctrlKe" +
+    "y:!1,shiftKey:!1,metaKey:!1,wheelDelta:f||0,relatedTarget:e||null," +
+    "count:1};k=k||1;d=a.g;b!=Zc&&b!=$c&&k in ad?d=ad[k]:a.j&&(d=bd(a,b" +
+    "));return d?cd(d,b,c):!0}\nfunction dd(a,b,c,d,e,f,g){var k=MSPoint" +
+    "erEvent.MSPOINTER_TYPE_MOUSE;if(!g&&!Cc(a.g))return!1;if(f&&ed!=b&" +
+    "&fd!=b)throw new z(12,\"Event type does not allow related target: \"" +
+    "+b);c={clientX:c.x,clientY:c.y,button:d,altKey:!1,ctrlKey:!1,shift" +
+    "Key:!1,metaKey:!1,relatedTarget:f||null,width:0,height:0,pressure:" +
+    "0,rotation:0,pointerId:1,tiltX:0,tiltY:0,pointerType:k,isPrimary:e" +
+    "};d=a.j?bd(a,b):a.g;ad[1]&&(d=ad[1]);a=La(x(a.g));if(a&&b==gd){var" +
+    " q=a.Element.prototype.msSetPointerCapture;a.Element.prototype.msS" +
+    "etPointerCapture=\nfunction(t){ad[t]=this}}b=d?cd(d,b,c):!0;q&&(a.E" +
+    "lement.prototype.msSetPointerCapture=q);return b}function bd(a,b){" +
+    "switch(b){case Zc:case hd:return a.j.multiple?a.g:a.j;default:retu" +
+    "rn a.j.multiple?a.g:null}}function id(a){var b=Ra(a.g,function(c){" +
+    "return!!c&&R(c)&&Gc(c)},!0);b=b||a.g;a=Sa(x(b));if(b!=a){if(a&&\"fu" +
+    "nction\"===typeof a.blur&&!R(a,\"BODY\"))try{a.blur()}catch(c){throw " +
+    "c;}\"function\"===typeof b.focus&&b.focus()}}var ad={};var jd=Object" +
+    ".freeze||function(a){return a};$a(4);function kd(a,b,c){this.g=a;t" +
+    "his.h=b;this.j=c}kd.prototype.create=function(a){a=x(a).createEven" +
+    "t(\"HTMLEvents\");a.initEvent(this.g,this.h,this.j);return a};kd.pro" +
+    "totype.toString=function(){return this.g};function V(a,b,c){kd.cal" +
+    "l(this,a,b,c)}l(V,kd);\nV.prototype.create=function(a,b){if(this==l" +
+    "d)throw new z(9,\"Browser does not support a mouse pixel scroll eve" +
+    "nt.\");var c=x(a);a=La(c);c=c.createEvent(\"MouseEvents\");this==md&&" +
+    "(c.wheelDelta=b.wheelDelta);c.initMouseEvent(this.g,this.h,this.j," +
+    "a,1,b.clientX,b.clientY,b.clientX,b.clientY,b.ctrlKey,b.altKey,b.s" +
+    "hiftKey,b.metaKey,b.button,b.relatedTarget);return c};function W(a" +
+    ",b,c){kd.call(this,a,b,c)}l(W,kd);W.prototype.create=function(){th" +
+    "row new z(9,\"Browser does not support MSPointer events.\");};\nvar n" +
+    "d=new kd(\"change\",!0,!1),Zc=new V(\"click\",!0,!0),od=new V(\"context" +
+    "menu\",!0,!0),pd=new V(\"dblclick\",!0,!0),$c=new V(\"mousedown\",!0,!0" +
+    "),qd=new V(\"mousemove\",!0,!1),Yc=new V(\"mouseout\",!0,!0),Xc=new V(" +
+    "\"mouseover\",!0,!0),hd=new V(\"mouseup\",!0,!0),md=new V(\"mousewheel\"" +
+    ",!0,!0),ld=new V(\"MozMousePixelScroll\",!0,!0),rd=new W(\"MSGotPoint" +
+    "erCapture\",!0,!1),sd=new W(\"MSLostPointerCapture\",!0,!1),gd=new W(" +
+    "\"MSPointerDown\",!0,!0),td=new W(\"MSPointerMove\",!0,!0),ed=new W(\"M" +
+    "SPointerOver\",!0,!0),fd=new W(\"MSPointerOut\",\n!0,!0),ud=new W(\"MSP" +
+    "ointerUp\",!0,!0);function cd(a,b,c){b=b.create(a,c);\"isTrusted\"in " +
+    "b||(b.isTrusted=!1);return a.dispatchEvent(b)};function vd(a,b){th" +
+    "is.g=a[pa.Symbol.iterator]();this.h=b}vd.prototype[Symbol.iterator" +
+    "]=function(){return this};vd.prototype.next=function(){var a=this." +
+    "g.next();return{value:a.done?void 0:this.h.call(void 0,a.value),do" +
+    "ne:a.done}};function wd(a,b){return new vd(a,b)};function xd(){}xd" +
+    ".prototype.next=function(){return yd};var yd=jd({done:!0,value:voi" +
+    "d 0});xd.prototype.F=function(){return this};function zd(a){if(a i" +
+    "nstanceof X||a instanceof Ad||a instanceof Bd)return a;if(\"functio" +
+    "n\"==typeof a.next)return new X(function(){return a});if(\"function\"" +
+    "==typeof a[Symbol.iterator])return new X(function(){return a[Symbo" +
+    "l.iterator]()});if(\"function\"==typeof a.F)return new X(function(){" +
+    "return a.F()});throw Error(\"Not an iterator or iterable.\");}functi" +
+    "on X(a){this.C=a}X.prototype.F=function(){return new Ad(this.C())}" +
+    ";X.prototype[Symbol.iterator]=function(){return new Bd(this.C())};" +
+    "X.prototype.h=function(){return new Bd(this.C())};\nfunction Ad(a){" +
+    "this.g=a}na(Ad,xd);Ad.prototype.next=function(){return this.g.next" +
+    "()};Ad.prototype[Symbol.iterator]=function(){return new Bd(this.g)" +
+    "};Ad.prototype.h=function(){return new Bd(this.g)};function Bd(a){" +
+    "X.call(this,function(){return a});this.g=a}na(Bd,X);Bd.prototype.n" +
+    "ext=function(){return this.g.next()};function Cd(a,b){this.h={};th" +
+    "is.g=[];this.j=this.size=0;var c=arguments.length;if(1<c){if(c%2)t" +
+    "hrow Error(\"Uneven number of arguments\");for(var d=0;d<c;d+=2)this" +
+    ".set(arguments[d],arguments[d+1])}else if(a)if(a instanceof Cd)for" +
+    "(c=Dd(a),d=0;d<c.length;d++)this.set(c[d],a.get(c[d]));else for(d " +
+    "in a)this.set(d,a[d])}function Dd(a){Ed(a);return a.g.concat()}h=C" +
+    "d.prototype;h.has=function(a){return Object.prototype.hasOwnProper" +
+    "ty.call(this.h,a)};\nfunction Ed(a){if(a.size!=a.g.length){for(var " +
+    "b=0,c=0;b<a.g.length;){var d=a.g[b];Object.prototype.hasOwnPropert" +
+    "y.call(a.h,d)&&(a.g[c++]=d);b++}a.g.length=c}if(a.size!=a.g.length" +
+    "){var e={};for(c=b=0;b<a.g.length;)d=a.g[b],Object.prototype.hasOw" +
+    "nProperty.call(e,d)||(a.g[c++]=d,e[d]=1),b++;a.g.length=c}}h.get=f" +
+    "unction(a,b){return Object.prototype.hasOwnProperty.call(this.h,a)" +
+    "?this.h[a]:b};\nh.set=function(a,b){Object.prototype.hasOwnProperty" +
+    ".call(this.h,a)||(this.size+=1,this.g.push(a),this.j++);this.h[a]=" +
+    "b};h.forEach=function(a,b){for(var c=Dd(this),d=0;d<c.length;d++){" +
+    "var e=c[d],f=this.get(e);a.call(b,f,e,this)}};h.keys=function(){re" +
+    "turn zd(this.F(!0)).h()};h.values=function(){return zd(this.F(!1))" +
+    ".h()};h.entries=function(){var a=this;return wd(this.keys(),functi" +
+    "on(b){return[b,a.get(b)]})};\nh.F=function(a){Ed(this);var b=0,c=th" +
+    "is.j,d=this,e=new xd;e.next=function(){if(c!=d.j)throw Error(\"The " +
+    "map has changed since the iterator was created\");if(b>=d.g.length)" +
+    "return yd;var f=d.g[b++];return{value:a?f:d.h[f],done:!1}};return " +
+    "e};var Fd={};function Y(a,b,c){var d=typeof a;(\"object\"==d&&null!=" +
+    "a||\"function\"==d)&&(a=a.l);a=new Gd(a);!b||b in Fd&&!c||(Fd[b]={ke" +
+    "y:a,shift:!1},c&&(Fd[c]={key:a,shift:!0}));return a}function Gd(a)"
+  )
+      .append(
+    "{this.code=a}Y(8);Y(9);Y(13);var Hd=Y(16),Id=Y(17),Jd=Y(18);Y(19);" +
+    "Y(20);Y(27);Y(32,\" \");Y(33);Y(34);Y(35);Y(36);Y(37);Y(38);Y(39);Y(" +
+    "40);Y(44);Y(45);Y(46);Y(48,\"0\",\")\");Y(49,\"1\",\"!\");Y(50,\"2\",\"@\");Y(" +
+    "51,\"3\",\"#\");Y(52,\"4\",\"$\");Y(53,\"5\",\"%\");Y(54,\"6\",\"^\");Y(55,\"7\",\"&\"" +
+    ");Y(56,\"8\",\"*\");Y(57,\"9\",\"(\");Y(65,\"a\",\"A\");\nY(66,\"b\",\"B\");Y(67,\"c" +
+    "\",\"C\");Y(68,\"d\",\"D\");Y(69,\"e\",\"E\");Y(70,\"f\",\"F\");Y(71,\"g\",\"G\");Y(7" +
+    "2,\"h\",\"H\");Y(73,\"i\",\"I\");Y(74,\"j\",\"J\");Y(75,\"k\",\"K\");Y(76,\"l\",\"L\")" +
+    ";Y(77,\"m\",\"M\");Y(78,\"n\",\"N\");Y(79,\"o\",\"O\");Y(80,\"p\",\"P\");Y(81,\"q\"," +
+    "\"Q\");Y(82,\"r\",\"R\");Y(83,\"s\",\"S\");Y(84,\"t\",\"T\");Y(85,\"u\",\"U\");Y(86," +
+    "\"v\",\"V\");Y(87,\"w\",\"W\");Y(88,\"x\",\"X\");Y(89,\"y\",\"Y\");Y(90,\"z\",\"Z\");v" +
+    "ar Kd=Y(Ia?{m:91,l:91}:Ha?{m:224,l:91}:{m:0,l:91});Y(Ia?{m:92,l:92" +
+    "}:Ha?{m:224,l:93}:{m:0,l:92});Y(Ia?{m:93,l:93}:Ha?{m:0,l:0}:{m:93," +
+    "l:null});\nY({m:96,l:96},\"0\");Y({m:97,l:97},\"1\");Y({m:98,l:98},\"2\")" +
+    ";Y({m:99,l:99},\"3\");Y({m:100,l:100},\"4\");Y({m:101,l:101},\"5\");Y({m" +
+    ":102,l:102},\"6\");Y({m:103,l:103},\"7\");Y({m:104,l:104},\"8\");Y({m:10" +
+    "5,l:105},\"9\");Y({m:106,l:106},\"*\");Y({m:107,l:107},\"+\");Y({m:109,l" +
+    ":109},\"-\");Y({m:110,l:110},\".\");Y({m:111,l:111},\"/\");Y(144);Y(112)" +
+    ";Y(113);Y(114);Y(115);Y(116);Y(117);Y(118);Y(119);Y(120);Y(121);Y(" +
+    "122);Y(123);Y({m:107,l:187},\"=\",\"+\");Y(108,\",\");Y({m:109,l:189},\"-" +
+    "\",\"_\");Y(188,\",\",\"<\");Y(190,\".\",\">\");Y(191,\"/\",\"?\");\nY(192,\"`\",\"~\"" +
+    ");Y(219,\"[\",\"{\");Y(220,\"\\\\\",\"|\");Y(221,\"]\",\"}\");Y({m:59,l:186},\";\"" +
+    ",\":\");Y(222,\"'\",'\"');var Ld=new Cd;Ld.set(1,Hd);Ld.set(2,Id);Ld.se" +
+    "t(4,Jd);Ld.set(8,Kd);(function(a){var b=new Cd;m(Array.from(a.keys" +
+    "()),function(c){b.set(a.get(c).code,c)});return b})(Ld);function M" +
+    "d(a,b,c){Uc.call(this,b,c);this.o=this.h=null;this.i=new u(0,0);th" +
+    "is.D=this.v=!1;if(a){\"number\"===typeof a.buttonPressed&&(this.h=a." +
+    "buttonPressed);try{R(a.elementPressed)&&(this.o=a.elementPressed)}" +
+    "catch(d){this.h=null}this.i=new u(a.clientXY.x,a.clientXY.y);this." +
+    "v=!!a.nextClickIsDoubleClick;this.D=!!a.hasEverInteracted;try{a.el" +
+    "ement&&R(a.element)&&Vc(this,a.element)}catch(d){this.h=null}}}l(M" +
+    "d,Uc);var Z={};Z[Zc]=[0,1,2,null];Z[od]=[null,null,2,null];Z[hd]=[" +
+    "0,1,2,null];Z[Yc]=[0,1,2,0];\nZ[qd]=[0,1,2,0];cb&&(Z[gd]=Z[hd],Z[ud" +
+    "]=Z[hd],Z[td]=[-1,-1,-1,-1],Z[fd]=Z[td],Z[ed]=Z[td]);Z[pd]=Z[Zc];Z" +
+    "[$c]=Z[hd];Z[Xc]=Z[Yc];var Nd={};Nd[$c]=gd;Nd[qd]=td;Nd[Yc]=fd;Nd[" +
+    "Xc]=ed;Nd[hd]=ud;function Od(a,b,c,d,e){a.D=!0;if(cb){var f=Nd[b];" +
+    "if(f&&!dd(a,f,a.i,Pd(a,f),!0,c,e))return!1}return Wc(a,b,a.i,Pd(a," +
+    "b),c,d,e,null)}function Pd(a,b){if(!(b in Z))return 0;a=Z[b][null=" +
+    "==a.h?3:a.h];if(null===a)throw new z(13,\"Event does not permit the" +
+    " specified mouse button.\");return a};function Qd(a){if(\"none\"!=(Va" +
+    "(a,\"display\")||(a.currentStyle?a.currentStyle.display:null)||a.sty" +
+    "le&&a.style.display))var b=Wa(a);else{b=a.style;var c=b.display,d=" +
+    "b.visibility,e=b.position;b.visibility=\"hidden\";b.position=\"absolu" +
+    "te\";b.display=\"inline\";var f=Wa(a);b.display=c;b.position=e;b.visi" +
+    "bility=d;b=f}return 0<b.width&&0<b.height||!a.offsetParent?b:Qd(a." +
+    "offsetParent)};qa(\"_\",function(a,b,c,d){if(!Dc(a))throw new z(11,\"" +
+    "Element is not currently visible and may not be manipulated\");b:{v" +
+    "ar e=b||void 0;if(\"scroll\"==Pc(a,e)){if(a.scrollIntoView&&(a.scrol" +
+    "lIntoView(),\"none\"==Pc(a,e)))break b;for(var f=Sc(a,e),g=Lc(a);g;g" +
+    "=Lc(g)){var k=g,q=Oc(k);var t=k;var r=Va(t,\"borderLeftWidth\");var " +
+    "w=Va(t,\"borderRightWidth\");var J=Va(t,\"borderTopWidth\");t=Va(t,\"bo" +
+    "rderBottomWidth\");w=new Ua(parseFloat(J),parseFloat(w),parseFloat(" +
+    "t),parseFloat(r));r=f.left-q.left-w.left;q=f.top-q.top-\nw.top;w=k." +
+    "clientHeight+f.top-f.bottom;k.scrollLeft+=Math.min(r,Math.max(r-(k" +
+    ".clientWidth+f.left-f.right),0));k.scrollTop+=Math.min(q,Math.max(" +
+    "q-w,0))}Pc(a,e)}}b?b=new Da(b.x,b.y):(b=Qd(a),b=new Da(b.width/2,b" +
+    ".height/2));c=c||new Md;e=b;b=Cc(a);f=Oc(a);c.i.x=e.x+f.left;c.i.y" +
+    "=e.y+f.top;e=c.g;if(a!=e){try{La(x(e)).closed&&(e=null)}catch(v){e" +
+    "=null}e&&(f=e===Xa.document.documentElement||e===Xa.document.body," +
+    "e=!c.D&&f?null:e,Od(c,Yc,a));Vc(c,a);Od(c,Xc,e,null,b)}Od(c,qd,nul" +
+    "l,null,b);c.v=!1;if(null!==c.h)throw new z(13,\n\"Cannot press more " +
+    "than one button or an already pressed button.\");c.h=0;c.o=c.g;if(R" +
+    "(c.g,\"OPTION\")||R(c.g,\"SELECT\")||Od(c,$c,null,null,!1))cb&&0==c.h&" +
+    "&R(c.o,\"OPTION\")&&dd(c,rd,c.i,0,!0),id(c);if(null===c.h)throw new " +
+    "z(13,\"Cannot release a button when no button is pressed.\");c.j&&Cc" +
+    "(c.g)&&(a=c.j,b=Bc(c.g),!b||a.multiple)&&(c.g.selected=!b,a.multip" +
+    "le&&!$a(4)||cd(a,nd));a=Cc(c.g);Od(c,hd,null,null,d);try{if(0==c.h" +
+    "&&c.g==c.o){var S=c.i,p=Pd(c,Zc);if(a||Cc(c.g))!c.j&&Ac(c.g)&&Bc(c" +
+    ".g),Wc(c,Zc,S,p,null,\n0,a);c.v&&Od(c,pd);c.v=!c.v;cb&&0==c.h&&R(c." +
+    "o,\"OPTION\")&&dd(c,sd,new u(0,0),0,!1)}else 2==c.h&&Od(c,od)}catch(" +
+    "v){}ad={};c.h=null;c.o=null});;return this._.apply(null,arguments)" +
+    ";}).apply({navigator:typeof window!=\"undefined\"?window.navigator:n" +
+    "ull},arguments);}\n"
+  )
+  .toString();
+  static final String CLICK_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String CLICK_ANDROID_original() {
+    return CLICK_ANDROID.replaceAll("xxx_rpl_lic", CLICK_ANDROID_license);
+  }
+
+/* field: FIND_ELEMENT_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String FIND_ELEMENT_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar aa=this||self;f" +
+    "unction ba(a,b){a=a.split(\".\");var c=aa;a[0]in c||\"undefined\"==typ" +
+    "eof c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d" +
+    "=a.shift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]" +
+    "?c=c[d]:c=c[d]={}:c[d]=b}function ca(a,b,c){return a.call.apply(a." +
+    "bind,arguments)}\nfunction da(a,b,c){if(!a)throw Error();if(2<argum" +
+    "ents.length){var d=Array.prototype.slice.call(arguments,2);return " +
+    "function(){var e=Array.prototype.slice.call(arguments);Array.proto" +
+    "type.unshift.apply(e,d);return a.apply(b,e)}}return function(){ret" +
+    "urn a.apply(b,arguments)}}function ea(a,b,c){Function.prototype.bi" +
+    "nd&&-1!=Function.prototype.bind.toString().indexOf(\"native code\")?" +
+    "ea=ca:ea=da;return ea.apply(null,arguments)}\nfunction fa(a,b){var " +
+    "c=Array.prototype.slice.call(arguments,1);return function(){var d=" +
+    "c.slice();d.push.apply(d,arguments);return a.apply(this,d)}}functi" +
+    "on k(a,b){function c(){}c.prototype=b.prototype;a.X=b.prototype;a." +
+    "prototype=new c;a.prototype.constructor=a;a.W=function(d,e,f){for(" +
+    "var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=" +
+    "arguments[h];return b.prototype[e].apply(d,g)}};/*\n\n Copyright 201" +
+    "4 Software Freedom Conservancy\n\n Licensed under the Apache License" +
+    ", Version 2.0 (the \"License\");\n you may not use this file except i" +
+    "n compliance with the License.\n You may obtain a copy of the Licen" +
+    "se at\n\n      http://www.apache.org/licenses/LICENSE-2.0\n\n Unless r" +
+    "equired by applicable law or agreed to in writing, software\n distr" +
+    "ibuted under the License is distributed on an \"AS IS\" BASIS,\n WITH" +
+    "OUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie" +
+    "d.\n See the License for the specific language governing permission" +
+    "s and\n limitations under the License.\n*/\nvar ha=window;function ia" +
+    "(a,b){if(Error.captureStackTrace)Error.captureStackTrace(this,ia);" +
+    "else{var c=Error().stack;c&&(this.stack=c)}a&&(this.message=String" +
+    "(a));void 0!==b&&(this.cause=b)}k(ia,Error);ia.prototype.name=\"Cus" +
+    "tomError\";var ja;function ka(a,b){a=a.split(\"%s\");for(var c=\"\",d=a" +
+    ".length-1,e=0;e<d;e++)c+=a[e]+(e<b.length?b[e]:\"%s\");ia.call(this," +
+    "c+a[d])}k(ka,ia);ka.prototype.name=\"AssertionError\";function la(a," +
+    "b,c){if(!a){var d=\"Assertion failed\";if(b){d+=\": \"+b;var e=Array.p" +
+    "rototype.slice.call(arguments,2)}throw new ka(\"\"+d,e||[]);}};funct" +
+    "ion ma(a,b){if(\"string\"===typeof a)return\"string\"!==typeof b||1!=b" +
+    ".length?-1:a.indexOf(b,0);for(var c=0;c<a.length;c++)if(c in a&&a[" +
+    "c]===b)return c;return-1}function n(a,b){for(var c=a.length,d=\"str" +
+    "ing\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[" +
+    "e],e,a)}function na(a,b){for(var c=a.length,d=[],e=0,f=\"string\"===" +
+    "typeof a?a.split(\"\"):a,g=0;g<c;g++)if(g in f){var h=f[g];b.call(vo" +
+    "id 0,h,g,a)&&(d[e++]=h)}return d}\nfunction t(a,b,c){var d=c;n(a,fu" +
+    "nction(e,f){d=b.call(void 0,d,e,f,a)});return d}function oa(a,b){f" +
+    "or(var c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)" +
+    "if(e in d&&b.call(void 0,d[e],e,a))return!0;return!1}function pa(a" +
+    ",b){for(var c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c" +
+    ";e++)if(e in d&&!b.call(void 0,d[e],e,a))return!1;return!0}\nfuncti" +
+    "on qa(a,b){a:{for(var c=a.length,d=\"string\"===typeof a?a.split(\"\")" +
+    ":a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a)){b=e;break a}b=-" +
+    "1}return 0>b?null:\"string\"===typeof a?a.charAt(b):a[b]}function ra" +
+    "(a){return Array.prototype.concat.apply([],arguments)}function sa(" +
+    "a,b,c){la(null!=a.length);return 2>=arguments.length?Array.prototy" +
+    "pe.slice.call(a,b):Array.prototype.slice.call(a,b,c)};function ta(" +
+    "a){var b=a.length-1;return 0<=b&&a.indexOf(\" \",b)==b}var u=String." +
+    "prototype.trim?function(a){return a.trim()}:function(a){return/^[\\" +
+    "s\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};function ua(a,b){return a" +
+    "<b?-1:a>b?1:0};function va(){var a=aa.navigator;return a&&(a=a.use" +
+    "rAgent)?a:\"\"};function v(a,b){this.x=void 0!==a?a:0;this.y=void 0!" +
+    "==b?b:0}v.prototype.toString=function(){return\"(\"+this.x+\", \"+this" +
+    ".y+\")\"};v.prototype.ceil=function(){this.x=Math.ceil(this.x);this." +
+    "y=Math.ceil(this.y);return this};v.prototype.floor=function(){this" +
+    ".x=Math.floor(this.x);this.y=Math.floor(this.y);return this};v.pro" +
+    "totype.round=function(){this.x=Math.round(this.x);this.y=Math.roun" +
+    "d(this.y);return this};function w(a,b){this.width=a;this.height=b}" +
+    "w.prototype.toString=function(){return\"(\"+this.width+\" x \"+this.he" +
+    "ight+\")\"};w.prototype.aspectRatio=function(){return this.width/thi" +
+    "s.height};w.prototype.ceil=function(){this.width=Math.ceil(this.wi" +
+    "dth);this.height=Math.ceil(this.height);return this};w.prototype.f" +
+    "loor=function(){this.width=Math.floor(this.width);this.height=Math" +
+    ".floor(this.height);return this};\nw.prototype.round=function(){thi" +
+    "s.width=Math.round(this.width);this.height=Math.round(this.height)" +
+    ";return this};function wa(a){return String(a).replace(/\\-([a-z])/g" +
+    ",function(b,c){return c.toUpperCase()})};function x(a){return a?ne" +
+    "w xa(z(a)):ja||(ja=new xa)}function ya(a,b){return\"string\"===typeo" +
+    "f b?a.getElementById(b):b}function za(a){for(;a&&1!=a.nodeType;)a=" +
+    "a.previousSibling;return a}function Aa(a,b){if(!a||!b)return!1;if(" +
+    "a.contains&&1==b.nodeType)return a==b||a.contains(b);if(\"undefined" +
+    "\"!=typeof a.compareDocumentPosition)return a==b||!!(a.compareDocum" +
+    "entPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;return b==a}\nfunct" +
+    "ion Ba(a,b){if(a==b)return 0;if(a.compareDocumentPosition)return a" +
+    ".compareDocumentPosition(b)&2?1:-1;if(\"sourceIndex\"in a||a.parentN" +
+    "ode&&\"sourceIndex\"in a.parentNode){var c=1==a.nodeType,d=1==b.node" +
+    "Type;if(c&&d)return a.sourceIndex-b.sourceIndex;var e=a.parentNode" +
+    ",f=b.parentNode;return e==f?Ca(a,b):!c&&Aa(e,b)?-1*Da(a,b):!d&&Aa(" +
+    "f,a)?Da(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.sourceIndex:f.so" +
+    "urceIndex)}d=z(a);c=d.createRange();c.selectNode(a);c.collapse(!0)" +
+    ";a=d.createRange();a.selectNode(b);\na.collapse(!0);return c.compar" +
+    "eBoundaryPoints(aa.Range.START_TO_END,a)}function Da(a,b){var c=a." +
+    "parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=b.parentNode;r" +
+    "eturn Ca(b,a)}function Ca(a,b){for(;b=b.previousSibling;)if(b==a)r" +
+    "eturn-1;return 1}function z(a){la(a,\"Node cannot be null or undefi" +
+    "ned.\");return 9==a.nodeType?a:a.ownerDocument||a.document}function" +
+    " Ea(a,b){a&&(a=a.parentNode);for(var c=0;a;){la(\"parentNode\"!=a.na" +
+    "me);if(b(a))return a;a=a.parentNode;c++}return null}\nfunction xa(a" +
+    "){this.g=a||aa.document||document}xa.prototype.getElementsByTagNam" +
+    "e=function(a,b){return(b||this.g).getElementsByTagName(String(a))}" +
+    ";\nfunction A(a,b,c,d){a=d||a.g;var e=b&&\"*\"!=b?String(b).toUpperCa" +
+    "se():\"\";if(a.querySelectorAll&&a.querySelector&&(e||c))c=a.querySe" +
+    "lectorAll(e+(c?\".\"+c:\"\"));else if(c&&a.getElementsByClassName)if(b" +
+    "=a.getElementsByClassName(c),e){a={};for(var f=d=0,g;g=b[f];f++)e=" +
+    "=g.nodeName&&(a[d++]=g);a.length=d;c=a}else c=b;else if(b=a.getEle" +
+    "mentsByTagName(e||\"*\"),c){a={};for(f=d=0;g=b[f];f++){e=g.className" +
+    ";var h;if(h=\"function\"==typeof e.split)h=0<=ma(e.split(/\\s+/),c);h" +
+    "&&(a[d++]=g)}a.length=d;c=a}else c=b;return c}\n;function B(a,b){th" +
+    "is.code=a;this.g=Fa[a]||\"unknown error\";this.message=b||\"\";a=this." +
+    "g.replace(/((?:^|\\s+)[a-z])/g,function(c){return c.toUpperCase().r" +
+    "eplace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5;if(0>b||a.indexOf(\"Error\"," +
+    "b)!=b)a+=\"Error\";this.name=a;a=Error(this.message);a.name=this.nam" +
+    "e;this.stack=a.stack||\"\"}k(B,Error);\nvar Fa={15:\"element not selec" +
+    "table\",11:\"element not visible\",31:\"unknown error\",30:\"unknown err" +
+    "or\",24:\"invalid cookie domain\",29:\"invalid element coordinates\",12" +
+    ":\"invalid element state\",32:\"invalid selector\",51:\"invalid selecto" +
+    "r\",52:\"invalid selector\",17:\"javascript error\",405:\"unsupported op" +
+    "eration\",34:\"move target out of bounds\",27:\"no such alert\",7:\"no s" +
+    "uch element\",8:\"no such frame\",23:\"no such window\",28:\"script time" +
+    "out\",33:\"session not created\",10:\"stale element reference\",21:\"tim" +
+    "eout\",25:\"unable to set cookie\",\n26:\"unexpected alert open\",13:\"un" +
+    "known error\",9:\"unknown command\"};B.prototype.toString=function(){" +
+    "return this.name+\": \"+this.message};var Ga={F:function(a){return!(" +
+    "!a.querySelectorAll||!a.querySelector)},v:function(a,b){if(!a)thro" +
+    "w new B(32,\"No class name specified\");a=u(a);if(-1!==a.indexOf(\" \"" +
+    "))throw new B(32,\"Compound class names not permitted\");if(Ga.F(b))" +
+    "try{return b.querySelector(\".\"+a.replace(/\\./g,\"\\\\.\"))||null}catch" +
+    "(c){throw new B(32,\"An invalid or illegal class name was specified" +
+    "\");}a=A(x(b),\"*\",a,b);return a.length?a[0]:null},A:function(a,b){i" +
+    "f(!a)throw new B(32,\"No class name specified\");a=u(a);if(-1!==a.in" +
+    "dexOf(\" \"))throw new B(32,\n\"Compound class names not permitted\");i" +
+    "f(Ga.F(b))try{return b.querySelectorAll(\".\"+a.replace(/\\./g,\"\\\\.\")" +
+    ")}catch(c){throw new B(32,\"An invalid or illegal class name was sp" +
+    "ecified\");}return A(x(b),\"*\",a,b)}};function Ha(a){return(a=a.exec" +
+    "(va()))?a[1]:\"\"}Ha(/Android\\s+([0-9.]+)/)||Ha(/Version\\/([0-9.]+)/" +
+    ");function Ia(a){var b=0,c=u(String(Ja)).split(\".\");a=u(String(a))" +
+    ".split(\".\");for(var d=Math.max(c.length,a.length),e=0;0==b&&e<d;e+" +
+    "+){var f=c[e]||\"\",g=a[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\"" +
+    ",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].lengt" +
+    "h&&0==g[0].length)break;b=ua(0==f[1].length?0:parseInt(f[1],10),0=" +
+    "=g[1].length?0:parseInt(g[1],10))||ua(0==f[2].length,0==g[2].lengt" +
+    "h)||ua(f[2],g[2]);f=f[3];g=g[3]}while(0==b)}}var Ka=/Android\\s+([0" +
+    "-9\\.]+)/.exec(va()),Ja=Ka?Ka[1]:\"0\";Ia(2.3);\nIa(4);var La={v:funct" +
+    "ion(a,b){if(!a)throw new B(32,\"No selector specified\");a=u(a);try{" +
+    "var c=b.querySelector(a)}catch(d){throw new B(32,\"An invalid or il" +
+    "legal selector was specified\");}return c&&1==c.nodeType?c:null},A:" +
+    "function(a,b){if(!a)throw new B(32,\"No selector specified\");a=u(a)" +
+    ";try{return b.querySelectorAll(a)}catch(c){throw new B(32,\"An inva" +
+    "lid or illegal selector was specified\");}}};function Ma(a,b,c,d){t" +
+    "his.top=a;this.g=b;this.h=c;this.left=d}Ma.prototype.toString=func" +
+    "tion(){return\"(\"+this.top+\"t, \"+this.g+\"r, \"+this.h+\"b, \"+this.lef" +
+    "t+\"l)\"};Ma.prototype.ceil=function(){this.top=Math.ceil(this.top);" +
+    "this.g=Math.ceil(this.g);this.h=Math.ceil(this.h);this.left=Math.c" +
+    "eil(this.left);return this};Ma.prototype.floor=function(){this.top" +
+    "=Math.floor(this.top);this.g=Math.floor(this.g);this.h=Math.floor(" +
+    "this.h);this.left=Math.floor(this.left);return this};\nMa.prototype" +
+    ".round=function(){this.top=Math.round(this.top);this.g=Math.round(" +
+    "this.g);this.h=Math.round(this.h);this.left=Math.round(this.left);" +
+    "return this};function C(a,b,c,d){this.left=a;this.top=b;this.width" +
+    "=c;this.height=d}C.prototype.toString=function(){return\"(\"+this.le" +
+    "ft+\", \"+this.top+\" - \"+this.width+\"w x \"+this.height+\"h)\"};C.proto" +
+    "type.ceil=function(){this.left=Math.ceil(this.left);this.top=Math." +
+    "ceil(this.top);this.width=Math.ceil(this.width);this.height=Math.c" +
+    "eil(this.height);return this};\nC.prototype.floor=function(){this.l" +
+    "eft=Math.floor(this.left);this.top=Math.floor(this.top);this.width" +
+    "=Math.floor(this.width);this.height=Math.floor(this.height);return" +
+    " this};C.prototype.round=function(){this.left=Math.round(this.left" +
+    ");this.top=Math.round(this.top);this.width=Math.round(this.width);" +
+    "this.height=Math.round(this.height);return this};/*\n\n The MIT Lice" +
+    "nse\n\n Copyright (c) 2007 Cybozu Labs, Inc.\n Copyright (c) 2012 Goo" +
+    "gle Inc.\n\n Permission is hereby granted, free of charge, to any pe" +
+    "rson obtaining a copy\n of this software and associated documentati" +
+    "on files (the \"Software\"), to\n deal in the Software without restri" +
+    "ction, including without limitation the\n rights to use, copy, modi" +
+    "fy, merge, publish, distribute, sublicense, and/or\n sell copies of" +
+    " the Software, and to permit persons to whom the Software is\n furn" +
+    "ished to do so, subject to the following conditions:\n\n The above c" +
+    "opyright notice and this permission notice shall be included in\n a" +
+    "ll copies or substantial portions of the Software.\n\n THE SOFTWARE " +
+    "IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMP" +
+    "LIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI" +
+    "TY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO E" +
+    "VENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLA" +
+    "IM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT," +
+    " TORT OR OTHERWISE, ARISING\n FROM, OUT OF OR IN CONNECTION WITH TH" +
+    "E SOFTWARE OR THE USE OR OTHER DEALINGS\n IN THE SOFTWARE.\n*/\nfunct" +
+    "ion D(a,b,c){this.g=a;this.j=b||1;this.h=c||1};function Na(a){this" +
+    ".h=a;this.g=0}function Oa(a){a=a.match(Pa);for(var b=0;b<a.length;" +
+    "b++)Qa.test(a[b])&&a.splice(b,1);return new Na(a)}var Pa=RegExp(\"\\" +
+    "\\$?(?:(?![0-9-])[\\\\w-]+:)?(?![0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(" +
+    "?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[^\\\"]*\\\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),Qa=/^\\s" +
+    "/;function E(a,b){return a.h[a.g+(b||0)]}Na.prototype.next=functio" +
+    "n(){return this.h[this.g++]};function Ra(a){return a.h.length<=a.g" +
+    "};function F(a){var b=null,c=a.nodeType;1==c&&(b=a.textContent,b=v" +
+    "oid 0==b||null==b?a.innerText:b,b=void 0==b||null==b?\"\":b);if(\"str" +
+    "ing\"!=typeof b)if(9==c||1==c){a=9==c?a.documentElement:a.firstChil" +
+    "d;c=0;var d=[];for(b=\"\";a;){do 1!=a.nodeType&&(b+=a.nodeValue),d[c" +
+    "++]=a;while(a=a.firstChild);for(;c&&!(a=d[--c].nextSibling););}}el" +
+    "se b=a.nodeValue;return\"\"+b}\nfunction G(a,b,c){if(null===b)return!" +
+    "0;try{if(!a.getAttribute)return!1}catch(d){return!1}return null==c" +
+    "?!!a.getAttribute(b):a.getAttribute(b,2)==c}function Sa(a,b,c,d,e)" +
+    "{return Ta.call(null,a,b,\"string\"===typeof c?c:null,\"string\"===typ" +
+    "eof d?d:null,e||new H)}\nfunction Ta(a,b,c,d,e){b.getElementsByName" +
+    "&&d&&\"name\"==c?(b=b.getElementsByName(d),n(b,function(f){a.g(f)&&e" +
+    ".add(f)})):b.getElementsByClassName&&d&&\"class\"==c?(b=b.getElement" +
+    "sByClassName(d),n(b,function(f){f.className==d&&a.g(f)&&e.add(f)})" +
+    "):a instanceof I?Ua(a,b,c,d,e):b.getElementsByTagName&&(b=b.getEle" +
+    "mentsByTagName(a.j()),n(b,function(f){G(f,c,d)&&e.add(f)}));return" +
+    " e}function Ua(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)G(b" +
+    ",c,d)&&a.g(b)&&e.add(b),Ua(a,b,c,d,e)};function H(){this.j=this.g=" +
+    "null;this.h=0}function Va(a){this.h=a;this.next=this.g=null}functi" +
+    "on Wa(a,b){if(!a.g)return b;if(!b.g)return a;var c=a.g;b=b.g;for(v" +
+    "ar d=null,e,f=0;c&&b;)c.h==b.h?(e=c,c=c.next,b=b.next):0<Ba(c.h,b." +
+    "h)?(e=b,b=b.next):(e=c,c=c.next),(e.g=d)?d.next=e:a.g=e,d=e,f++;fo" +
+    "r(e=c||b;e;)e.g=d,d=d.next=e,f++,e=e.next;a.j=d;a.h=f;return a}fun" +
+    "ction Xa(a,b){b=new Va(b);b.next=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a" +
+    ".h++}\nH.prototype.add=function(a){a=new Va(a);a.g=this.j;this.g?th" +
+    "is.j.next=a:this.g=this.j=a;this.j=a;this.h++};function Ya(a){retu" +
+    "rn(a=a.g)?a.h:null}function Za(a){return(a=Ya(a))?F(a):\"\"}function" +
+    " J(a,b){return new ab(a,!!b)}function ab(a,b){this.j=a;this.h=(thi" +
+    "s.C=b)?a.j:a.g;this.g=null}ab.prototype.next=function(){var a=this" +
+    ".h;if(null==a)return null;var b=this.g=a;this.h=this.C?a.g:a.next;" +
+    "return b.h};function bb(a){switch(a.nodeType){case 1:return fa(cb," +
+    "a);case 9:return bb(a.documentElement);case 11:case 10:case 6:case" +
+    " 12:return db;default:return a.parentNode?bb(a.parentNode):db}}fun" +
+    "ction db(){return null}function cb(a,b){if(a.prefix==b)return a.na" +
+    "mespaceURI||\"http://www.w3.org/1999/xhtml\";var c=a.getAttributeNod" +
+    "e(\"xmlns:\"+b);return c&&c.specified?c.value||null:a.parentNode&&9!" +
+    "=a.parentNode.nodeType?cb(a.parentNode,b):null};function K(a){this" +
+    ".o=a;this.h=this.l=!1;this.j=null}function M(a){return\"\\n  \"+a.toS" +
+    "tring().split(\"\\n\").join(\"\\n  \")}function eb(a,b){a.l=b}function f" +
+    "b(a,b){a.h=b}function N(a,b){a=a.g(b);return a instanceof H?+Za(a)" +
+    ":+a}function O(a,b){a=a.g(b);return a instanceof H?Za(a):\"\"+a}func" +
+    "tion gb(a,b){a=a.g(b);return a instanceof H?!!a.h:!!a};function hb" +
+    "(a,b,c){K.call(this,a.o);this.i=a;this.m=b;this.B=c;this.l=b.l||c." +
+    "l;this.h=b.h||c.h;this.i==ib&&(c.h||c.l||4==c.o||0==c.o||!b.j?b.h|" +
+    "|b.l||4==b.o||0==b.o||!c.j||(this.j={name:c.j.name,D:b}):this.j={n" +
+    "ame:b.j.name,D:c})}k(hb,K);\nfunction jb(a,b,c,d,e){b=b.g(d);c=c.g(" +
+    "d);var f;if(b instanceof H&&c instanceof H){b=J(b);for(d=b.next();" +
+    "d;d=b.next())for(e=J(c),f=e.next();f;f=e.next())if(a(F(d),F(f)))re" +
+    "turn!0;return!1}if(b instanceof H||c instanceof H){b instanceof H?" +
+    "(e=b,d=c):(e=c,d=b);f=J(e);for(var g=typeof d,h=f.next();h;h=f.nex" +
+    "t()){switch(g){case \"number\":h=+F(h);break;case \"boolean\":h=!!F(h)" +
+    ";break;case \"string\":h=F(h);break;default:throw Error(\"Illegal pri" +
+    "mitive type for comparison.\");}if(e==b&&a(h,d)||e==c&&a(d,h))retur" +
+    "n!0}return!1}return e?\n\"boolean\"==typeof b||\"boolean\"==typeof c?a(" +
+    "!!b,!!c):\"number\"==typeof b||\"number\"==typeof c?a(+b,+c):a(b,c):a(" +
+    "+b,+c)}hb.prototype.g=function(a){return this.i.u(this.m,this.B,a)" +
+    "};hb.prototype.toString=function(){var a=\"Binary Expression: \"+thi" +
+    "s.i;a+=M(this.m);return a+=M(this.B)};function kb(a,b,c,d){this.U=" +
+    "a;this.N=b;this.o=c;this.u=d}kb.prototype.toString=function(){retu" +
+    "rn this.U};var lb={};\nfunction P(a,b,c,d){if(lb.hasOwnProperty(a))" +
+    "throw Error(\"Binary operator already created: \"+a);a=new kb(a,b,c," +
+    "d);return lb[a.toString()]=a}P(\"div\",6,1,function(a,b,c){return N(" +
+    "a,c)/N(b,c)});P(\"mod\",6,1,function(a,b,c){return N(a,c)%N(b,c)});P" +
+    "(\"*\",6,1,function(a,b,c){return N(a,c)*N(b,c)});P(\"+\",5,1,function" +
+    "(a,b,c){return N(a,c)+N(b,c)});P(\"-\",5,1,function(a,b,c){return N(" +
+    "a,c)-N(b,c)});P(\"<\",4,2,function(a,b,c){return jb(function(d,e){re" +
+    "turn d<e},a,b,c)});\nP(\">\",4,2,function(a,b,c){return jb(function(d" +
+    ",e){return d>e},a,b,c)});P(\"<=\",4,2,function(a,b,c){return jb(func" +
+    "tion(d,e){return d<=e},a,b,c)});P(\">=\",4,2,function(a,b,c){return " +
+    "jb(function(d,e){return d>=e},a,b,c)});var ib=P(\"=\",3,2,function(a" +
+    ",b,c){return jb(function(d,e){return d==e},a,b,c,!0)});P(\"!=\",3,2," +
+    "function(a,b,c){return jb(function(d,e){return d!=e},a,b,c,!0)});P" +
+    "(\"and\",2,2,function(a,b,c){return gb(a,c)&&gb(b,c)});P(\"or\",1,2,fu" +
+    "nction(a,b,c){return gb(a,c)||gb(b,c)});function mb(a,b){if(b.g.le" +
+    "ngth&&4!=a.o)throw Error(\"Primary expression must evaluate to node" +
+    "set if filter has predicate(s).\");K.call(this,a.o);this.m=a;this.i" +
+    "=b;this.l=a.l;this.h=a.h}k(mb,K);mb.prototype.g=function(a){a=this" +
+    ".m.g(a);return nb(this.i,a)};mb.prototype.toString=function(){var " +
+    "a=\"Filter:\"+M(this.m);return a+=M(this.i)};function ob(a,b){if(b.l" +
+    "ength<a.M)throw Error(\"Function \"+a.s+\" expects at least\"+a.M+\" ar" +
+    "guments, \"+b.length+\" given\");if(null!==a.H&&b.length>a.H)throw Er" +
+    "ror(\"Function \"+a.s+\" expects at most \"+a.H+\" arguments, \"+b.lengt" +
+    "h+\" given\");a.T&&n(b,function(c,d){if(4!=c.o)throw Error(\"Argument" +
+    " \"+d+\" to function \"+a.s+\" is not of type Nodeset: \"+c);});K.call(" +
+    "this,a.o);this.G=a;this.i=b;eb(this,a.l||oa(b,function(c){return c" +
+    ".l}));fb(this,a.S&&!b.length||a.R&&!!b.length||oa(b,function(c){re" +
+    "turn c.h}))}\nk(ob,K);ob.prototype.g=function(a){return this.G.u.ap" +
+    "ply(null,ra(a,this.i))};ob.prototype.toString=function(){var a=\"Fu" +
+    "nction: \"+this.G;if(this.i.length){var b=t(this.i,function(c,d){re" +
+    "turn c+M(d)},\"Arguments:\");a+=M(b)}return a};function pb(a,b,c,d,e" +
+    ",f,g,h){this.s=a;this.o=b;this.l=c;this.S=d;this.R=!1;this.u=e;thi" +
+    "s.M=f;this.H=void 0!==g?g:f;this.T=!!h}pb.prototype.toString=funct" +
+    "ion(){return this.s};var qb={};\nfunction Q(a,b,c,d,e,f,g,h){if(qb." +
+    "hasOwnProperty(a))throw Error(\"Function already created: \"+a+\".\");" +
+    "qb[a]=new pb(a,b,c,d,e,f,g,h)}Q(\"boolean\",2,!1,!1,function(a,b){re" +
+    "turn gb(b,a)},1);Q(\"ceiling\",1,!1,!1,function(a,b){return Math.cei" +
+    "l(N(b,a))},1);Q(\"concat\",3,!1,!1,function(a,b){var c=sa(arguments," +
+    "1);return t(c,function(d,e){return d+O(e,a)},\"\")},2,null);Q(\"conta" +
+    "ins\",2,!1,!1,function(a,b,c){b=O(b,a);a=O(c,a);return-1!=b.indexOf" +
+    "(a)},2);Q(\"count\",1,!1,!1,function(a,b){return b.g(a).h},1,1,!0);\n" +
+    "Q(\"false\",2,!1,!1,function(){return!1},0);Q(\"floor\",1,!1,!1,functi" +
+    "on(a,b){return Math.floor(N(b,a))},1);Q(\"id\",4,!1,!1,function(a,b)" +
+    "{var c=a.g,d=9==c.nodeType?c:c.ownerDocument;a=O(b,a).split(/\\s+/)" +
+    ";var e=[];n(a,function(g){g=d.getElementById(g);!g||0<=ma(e,g)||e." +
+    "push(g)});e.sort(Ba);var f=new H;n(e,function(g){f.add(g)});return" +
+    " f},1);Q(\"lang\",2,!1,!1,function(){return!1},1);Q(\"last\",1,!0,!1,f" +
+    "unction(a){if(1!=arguments.length)throw Error(\"Function last expec" +
+    "ts ()\");return a.h},0);\nQ(\"local-name\",3,!1,!0,function(a,b){retur" +
+    "n(a=b?Ya(b.g(a)):a.g)?a.localName||a.nodeName.toLowerCase():\"\"},0," +
+    "1,!0);Q(\"name\",3,!1,!0,function(a,b){return(a=b?Ya(b.g(a)):a.g)?a." +
+    "nodeName.toLowerCase():\"\"},0,1,!0);Q(\"namespace-uri\",3,!0,!1,funct" +
+    "ion(){return\"\"},0,1,!0);Q(\"normalize-space\",3,!1,!0,function(a,b){" +
+    "return(b?O(b,a):F(a.g)).replace(/[\\s\\xa0]+/g,\" \").replace(/^\\s+|\\s" +
+    "+$/g,\"\")},0,1);Q(\"not\",2,!1,!1,function(a,b){return!gb(b,a)},1);Q(" +
+    "\"number\",1,!1,!0,function(a,b){return b?N(b,a):+F(a.g)},0,1);\nQ(\"p" +
+    "osition\",1,!0,!1,function(a){return a.j},0);Q(\"round\",1,!1,!1,func" +
+    "tion(a,b){return Math.round(N(b,a))},1);Q(\"starts-with\",2,!1,!1,fu" +
+    "nction(a,b,c){b=O(b,a);a=O(c,a);return 0==b.lastIndexOf(a,0)},2);Q" +
+    "(\"string\",3,!1,!0,function(a,b){return b?O(b,a):F(a.g)},0,1);Q(\"st" +
+    "ring-length\",1,!1,!0,function(a,b){return(b?O(b,a):F(a.g)).length}" +
+    ",0,1);\nQ(\"substring\",3,!1,!1,function(a,b,c,d){c=N(c,a);if(isNaN(c" +
+    ")||Infinity==c||-Infinity==c)return\"\";d=d?N(d,a):Infinity;if(isNaN" +
+    "(d)||-Infinity===d)return\"\";c=Math.round(c)-1;var e=Math.max(c,0);" +
+    "a=O(b,a);return Infinity==d?a.substring(e):a.substring(e,c+Math.ro" +
+    "und(d))},2,3);Q(\"substring-after\",3,!1,!1,function(a,b,c){b=O(b,a)" +
+    ";a=O(c,a);c=b.indexOf(a);return-1==c?\"\":b.substring(c+a.length)},2" +
+    ");\nQ(\"substring-before\",3,!1,!1,function(a,b,c){b=O(b,a);a=O(c,a);" +
+    "a=b.indexOf(a);return-1==a?\"\":b.substring(0,a)},2);Q(\"sum\",1,!1,!1" +
+    ",function(a,b){a=J(b.g(a));b=0;for(var c=a.next();c;c=a.next())b+=" +
+    "+F(c);return b},1,1,!0);Q(\"translate\",3,!1,!1,function(a,b,c,d){b=" +
+    "O(b,a);c=O(c,a);var e=O(d,a);a={};for(d=0;d<c.length;d++){var f=c." +
+    "charAt(d);f in a||(a[f]=e.charAt(d))}c=\"\";for(d=0;d<b.length;d++)f" +
+    "=b.charAt(d),c+=f in a?a[f]:f;return c},3);Q(\"true\",2,!1,!1,functi" +
+    "on(){return!0},0);function I(a,b){this.m=a;this.i=void 0!==b?b:nul" +
+    "l;this.h=null;switch(a){case \"comment\":this.h=8;break;case \"text\":" +
+    "this.h=3;break;case \"processing-instruction\":this.h=7;break;case \"" +
+    "node\":break;default:throw Error(\"Unexpected argument\");}}function " +
+    "rb(a){return\"comment\"==a||\"text\"==a||\"processing-instruction\"==a||" +
+    "\"node\"==a}I.prototype.g=function(a){return null===this.h||this.h==" +
+    "a.nodeType};I.prototype.getType=function(){return this.h};I.protot" +
+    "ype.j=function(){return this.m};\nI.prototype.toString=function(){v" +
+    "ar a=\"Kind Test: \"+this.m;null!==this.i&&(a+=M(this.i));return a};" +
+    "function sb(a){K.call(this,3);this.i=a.substring(1,a.length-1)}k(s" +
+    "b,K);sb.prototype.g=function(){return this.i};sb.prototype.toStrin" +
+    "g=function(){return\"Literal: \"+this.i};function tb(a,b){this.s=a.t" +
+    "oLowerCase();this.h=b?b.toLowerCase():\"http://www.w3.org/1999/xhtm" +
+    "l\"}tb.prototype.g=function(a){var b=a.nodeType;return 1!=b&&2!=b?!" +
+    "1:\"*\"!=this.s&&this.s!=a.nodeName.toLowerCase()?!1:this.h==(a.name" +
+    "spaceURI?a.namespaceURI.toLowerCase():\"http://www.w3.org/1999/xhtm" +
+    "l\")};tb.prototype.j=function(){return this.s};tb.prototype.toStrin" +
+    "g=function(){return\"Name Test: \"+(\"http://www.w3.org/1999/xhtml\"==" +
+    "this.h?\"\":this.h+\":\")+this.s};function ub(a){K.call(this,1);this.i" +
+    "=a}k(ub,K);ub.prototype.g=function(){return this.i};ub.prototype.t" +
+    "oString=function(){return\"Number: \"+this.i};function vb(a,b){K.cal" +
+    "l(this,a.o);this.m=a;this.i=b;this.l=a.l;this.h=a.h;1==this.i.leng" +
+    "th&&(a=this.i[0],a.I||a.i!=wb||(a=a.B,\"*\"!=a.j()&&(this.j={name:a." +
+    "j(),D:null})))}k(vb,K);function xb(){K.call(this,4)}k(xb,K);xb.pro" +
+    "totype.g=function(a){var b=new H;a=a.g;9==a.nodeType?b.add(a):b.ad" +
+    "d(a.ownerDocument);return b};xb.prototype.toString=function(){retu" +
+    "rn\"Root Helper Expression\"};function yb(){K.call(this,4)}k(yb,K);y" +
+    "b.prototype.g=function(a){var b=new H;b.add(a.g);return b};yb.prot" +
+    "otype.toString=function(){return\"Context Helper Expression\"};\nfunc" +
+    "tion zb(a){return\"/\"==a||\"//\"==a}vb.prototype.g=function(a){var b=" +
+    "this.m.g(a);if(!(b instanceof H))throw Error(\"Filter expression mu" +
+    "st evaluate to nodeset.\");a=this.i;for(var c=0,d=a.length;c<d&&b.h" +
+    ";c++){var e=a[c],f=J(b,e.i.C);if(e.l||e.i!=Ab)if(e.l||e.i!=Bb){var" +
+    " g=f.next();for(b=e.g(new D(g));null!=(g=f.next());)g=e.g(new D(g)" +
+    "),b=Wa(b,g)}else g=f.next(),b=e.g(new D(g));else{for(g=f.next();(b" +
+    "=f.next())&&(!g.contains||g.contains(b))&&b.compareDocumentPositio" +
+    "n(g)&8;g=b);b=e.g(new D(g))}}return b};\nvb.prototype.toString=func" +
+    "tion(){var a=\"Path Expression:\"+M(this.m);if(this.i.length){var b=" +
+    "t(this.i,function(c,d){return c+M(d)},\"Steps:\");a+=M(b)}return a};" +
+    "function Cb(a,b){this.g=a;this.C=!!b}\nfunction nb(a,b,c){for(c=c||" +
+    "0;c<a.g.length;c++)for(var d=a.g[c],e=J(b),f=b.h,g,h=0;g=e.next();" +
+    "h++){var p=a.C?f-h:h+1;g=d.g(new D(g,p,f));if(\"number\"==typeof g)p" +
+    "=p==g;else if(\"string\"==typeof g||\"boolean\"==typeof g)p=!!g;else i" +
+    "f(g instanceof H)p=0<g.h;else throw Error(\"Predicate.evaluate retu" +
+    "rned an unexpected type.\");if(!p){p=e;g=p.j;var q=p.g;if(!q)throw " +
+    "Error(\"Next must be called at least once before remove.\");var m=q." +
+    "g;q=q.next;m?m.next=q:g.g=q;q?q.g=m:g.j=m;g.h--;p.g=null}}return b" +
+    "}\nCb.prototype.toString=function(){return t(this.g,function(a,b){r" +
+    "eturn a+M(b)},\"Predicates:\")};function R(a,b,c,d){K.call(this,4);t" +
+    "his.i=a;this.B=b;this.m=c||new Cb([]);this.I=!!d;b=this.m;b=0<b.g." +
+    "length?b.g[0].j:null;a.V&&b&&(this.j={name:b.name,D:b.D});a:{a=thi" +
+    "s.m;for(b=0;b<a.g.length;b++)if(c=a.g[b],c.l||1==c.o||0==c.o){a=!0" +
+    ";break a}a=!1}this.l=a}k(R,K);\nR.prototype.g=function(a){var b=a.g" +
+    ",c=this.j,d=null,e=null,f=0;c&&(d=c.name,e=c.D?O(c.D,a):null,f=1);" +
+    "if(this.I)if(this.l||this.i!=Db)if(b=J((new R(Eb,new I(\"node\"))).g" +
+    "(a)),c=b.next())for(a=this.u(c,d,e,f);null!=(c=b.next());)a=Wa(a,t" +
+    "his.u(c,d,e,f));else a=new H;else a=Sa(this.B,b,d,e),a=nb(this.m,a" +
+    ",f);else a=this.u(a.g,d,e,f);return a};R.prototype.u=function(a,b," +
+    "c,d){a=this.i.G(this.B,a,b,c);return a=nb(this.m,a,d)};\nR.prototyp" +
+    "e.toString=function(){var a=\"Step:\"+M(\"Operator: \"+(this.I?\"//\":\"/" +
+    "\"));this.i.s&&(a+=M(\"Axis: \"+this.i));a+=M(this.B);if(this.m.g.len" +
+    "gth){var b=t(this.m.g,function(c,d){return c+M(d)},\"Predicates:\");" +
+    "a+=M(b)}return a};function Fb(a,b,c,d){this.s=a;this.G=b;this.C=c;" +
+    "this.V=d}Fb.prototype.toString=function(){return this.s};var Gb={}" +
+    ";function S(a,b,c,d){if(Gb.hasOwnProperty(a))throw Error(\"Axis alr" +
+    "eady created: \"+a);b=new Fb(a,b,c,!!d);return Gb[a]=b}\nS(\"ancestor" +
+    "\",function(a,b){for(var c=new H;b=b.parentNode;)a.g(b)&&Xa(c,b);re" +
+    "turn c},!0);S(\"ancestor-or-self\",function(a,b){var c=new H;do a.g(" +
+    "b)&&Xa(c,b);while(b=b.parentNode);return c},!0);\nvar wb=S(\"attribu" +
+    "te\",function(a,b){var c=new H,d=a.j();if(b=b.attributes)if(a insta" +
+    "nceof I&&null===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);el" +
+    "se(d=b.getNamedItem(d))&&c.add(d);return c},!1),Db=S(\"child\",funct" +
+    "ion(a,b,c,d,e){c=\"string\"===typeof c?c:null;d=\"string\"===typeof d?" +
+    "d:null;e=e||new H;for(b=b.firstChild;b;b=b.nextSibling)G(b,c,d)&&a" +
+    ".g(b)&&e.add(b);return e},!1,!0);S(\"descendant\",Sa,!1,!0);\nvar Eb=" +
+    "S(\"descendant-or-self\",function(a,b,c,d){var e=new H;G(b,c,d)&&a.g" +
+    "(b)&&e.add(b);return Sa(a,b,c,d,e)},!1,!0),Ab=S(\"following\",functi" +
+    "on(a,b,c,d){var e=new H;do for(var f=b;f=f.nextSibling;)G(f,c,d)&&"
+  )
+      .append(
+    "a.g(f)&&e.add(f),e=Sa(a,f,c,d,e);while(b=b.parentNode);return e},!" +
+    "1,!0);S(\"following-sibling\",function(a,b){for(var c=new H;b=b.next" +
+    "Sibling;)a.g(b)&&c.add(b);return c},!1);S(\"namespace\",function(){r" +
+    "eturn new H},!1);\nvar Hb=S(\"parent\",function(a,b){var c=new H;if(9" +
+    "==b.nodeType)return c;if(2==b.nodeType)return c.add(b.ownerElement" +
+    "),c;b=b.parentNode;a.g(b)&&c.add(b);return c},!1),Bb=S(\"preceding\"" +
+    ",function(a,b,c,d){var e=new H,f=[];do f.unshift(b);while(b=b.pare" +
+    "ntNode);for(var g=1,h=f.length;g<h;g++){var p=[];for(b=f[g];b=b.pr" +
+    "eviousSibling;)p.unshift(b);for(var q=0,m=p.length;q<m;q++)b=p[q]," +
+    "G(b,c,d)&&a.g(b)&&e.add(b),e=Sa(a,b,c,d,e)}return e},!0,!0);\nS(\"pr" +
+    "eceding-sibling\",function(a,b){for(var c=new H;b=b.previousSibling" +
+    ";)a.g(b)&&Xa(c,b);return c},!0);var Ib=S(\"self\",function(a,b){var " +
+    "c=new H;a.g(b)&&c.add(b);return c},!1);function Kb(a){K.call(this," +
+    "1);this.i=a;this.l=a.l;this.h=a.h}k(Kb,K);Kb.prototype.g=function(" +
+    "a){return-N(this.i,a)};Kb.prototype.toString=function(){return\"Una" +
+    "ry Expression: -\"+M(this.i)};function Lb(a){K.call(this,4);this.i=" +
+    "a;eb(this,oa(this.i,function(b){return b.l}));fb(this,oa(this.i,fu" +
+    "nction(b){return b.h}))}k(Lb,K);Lb.prototype.g=function(a){var b=n" +
+    "ew H;n(this.i,function(c){c=c.g(a);if(!(c instanceof H))throw Erro" +
+    "r(\"Path expression must evaluate to NodeSet.\");b=Wa(b,c)});return " +
+    "b};Lb.prototype.toString=function(){return t(this.i,function(a,b){" +
+    "return a+M(b)},\"Union Expression:\")};function Mb(a,b){this.g=a;thi" +
+    "s.h=b}function Nb(a){for(var b,c=[];;){U(a,\"Missing right hand sid" +
+    "e of binary expression.\");b=Ob(a);var d=a.g.next();if(!d)break;var" +
+    " e=(d=lb[d]||null)&&d.N;if(!e){a.g.g--;break}for(;c.length&&e<=c[c" +
+    ".length-1].N;)b=new hb(c.pop(),c.pop(),b);c.push(b,d)}for(;c.lengt" +
+    "h;)b=new hb(c.pop(),c.pop(),b);return b}function U(a,b){if(Ra(a.g)" +
+    ")throw Error(b);}function Pb(a,b){a=a.g.next();if(a!=b)throw Error" +
+    "(\"Bad token, expected: \"+b+\" got: \"+a);}\nfunction Qb(a){a=a.g.next" +
+    "();if(\")\"!=a)throw Error(\"Bad token: \"+a);}function Rb(a){a=a.g.ne" +
+    "xt();if(2>a.length)throw Error(\"Unclosed literal string\");return n" +
+    "ew sb(a)}function Sb(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c" +
+    ")return new tb(b);var d=b.substring(0,c);a=a.h(d);if(!a)throw Erro" +
+    "r(\"Namespace prefix not declared: \"+d);b=b.substr(c+1);return new " +
+    "tb(b,a)}\nfunction Tb(a){var b=[];if(zb(E(a.g))){var c=a.g.next();v" +
+    "ar d=E(a.g);if(\"/\"==c&&(Ra(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&" +
+    "!/(?![0-9])[\\w]/.test(d)))return new xb;d=new xb;U(a,\"Missing next" +
+    " location step.\");c=Ub(a,c);b.push(c)}else{a:{c=E(a.g);d=c.charAt(" +
+    "0);switch(d){case \"$\":throw Error(\"Variable reference not allowed " +
+    "in HTML XPath\");case \"(\":a.g.next();c=Nb(a);U(a,'unclosed \"(\"');Pb" +
+    "(a,\")\");break;case '\"':case \"'\":c=Rb(a);break;default:if(isNaN(+c)" +
+    ")if(!rb(c)&&/(?![0-9])[\\w]/.test(d)&&\"(\"==E(a.g,\n1)){c=a.g.next();" +
+    "c=qb[c]||null;a.g.next();for(d=[];\")\"!=E(a.g);){U(a,\"Missing funct" +
+    "ion argument list.\");d.push(Nb(a));if(\",\"!=E(a.g))break;a.g.next()" +
+    "}U(a,\"Unclosed function argument list.\");Qb(a);c=new ob(c,d)}else{" +
+    "c=null;break a}else c=new ub(+a.g.next())}\"[\"==E(a.g)&&(d=new Cb(V" +
+    "b(a)),c=new mb(c,d))}if(c)if(zb(E(a.g)))d=c;else return c;else c=U" +
+    "b(a,\"/\"),d=new yb,b.push(c)}for(;zb(E(a.g));)c=a.g.next(),U(a,\"Mis" +
+    "sing next location step.\"),c=Ub(a,c),b.push(c);return new vb(d,b)}" +
+    "\nfunction Ub(a,b){if(\"/\"!=b&&\"//\"!=b)throw Error('Step op should b" +
+    "e \"/\" or \"//\"');if(\".\"==E(a.g)){var c=new R(Ib,new I(\"node\"));a.g." +
+    "next();return c}if(\"..\"==E(a.g))return c=new R(Hb,new I(\"node\")),a" +
+    ".g.next(),c;if(\"@\"==E(a.g)){var d=wb;a.g.next();U(a,\"Missing attri" +
+    "bute name\")}else if(\"::\"==E(a.g,1)){if(!/(?![0-9])[\\w]/.test(E(a.g" +
+    ").charAt(0)))throw Error(\"Bad token: \"+a.g.next());var e=a.g.next(" +
+    ");d=Gb[e]||null;if(!d)throw Error(\"No axis with name: \"+e);a.g.nex" +
+    "t();U(a,\"Missing node name\")}else d=Db;e=\nE(a.g);if(/(?![0-9])[\\w]" +
+    "/.test(e.charAt(0)))if(\"(\"==E(a.g,1)){if(!rb(e))throw Error(\"Inval" +
+    "id node type: \"+e);e=a.g.next();if(!rb(e))throw Error(\"Invalid typ" +
+    "e name: \"+e);Pb(a,\"(\");U(a,\"Bad nodetype\");var f=E(a.g).charAt(0)," +
+    "g=null;if('\"'==f||\"'\"==f)g=Rb(a);U(a,\"Bad nodetype\");Qb(a);e=new I" +
+    "(e,g)}else e=Sb(a);else if(\"*\"==e)e=Sb(a);else throw Error(\"Bad to" +
+    "ken: \"+a.g.next());a=new Cb(Vb(a),d.C);return c||new R(d,e,a,\"//\"=" +
+    "=b)}\nfunction Vb(a){for(var b=[];\"[\"==E(a.g);){a.g.next();U(a,\"Mis" +
+    "sing predicate expression.\");var c=Nb(a);b.push(c);U(a,\"Unclosed p" +
+    "redicate expression.\");Pb(a,\"]\")}return b}function Ob(a){if(\"-\"==E" +
+    "(a.g))return a.g.next(),new Kb(Ob(a));var b=Tb(a);if(\"|\"!=E(a.g))a" +
+    "=b;else{for(b=[b];\"|\"==a.g.next();)U(a,\"Missing next union locatio" +
+    "n path.\"),b.push(Tb(a));a.g.g--;a=new Lb(b)}return a};function Wb(" +
+    "a,b){if(!a.length)throw Error(\"Empty XPath expression.\");a=Oa(a);i" +
+    "f(Ra(a))throw Error(\"Invalid XPath expression.\");b?\"function\"!==ty" +
+    "peof b&&(b=ea(b.lookupNamespaceURI,b)):b=function(){return null};v" +
+    "ar c=Nb(new Mb(a,b));if(!Ra(a))throw Error(\"Bad token: \"+a.next())" +
+    ";this.evaluate=function(d,e){d=c.g(new D(d));return new V(d,e)}}\nf" +
+    "unction V(a,b){if(0==b)if(a instanceof H)b=4;else if(\"string\"==typ" +
+    "eof a)b=2;else if(\"number\"==typeof a)b=1;else if(\"boolean\"==typeof" +
+    " a)b=3;else throw Error(\"Unexpected evaluation result.\");if(2!=b&&" +
+    "1!=b&&3!=b&&!(a instanceof H))throw Error(\"value could not be conv" +
+    "erted to the specified type\");this.resultType=b;switch(b){case 2:t" +
+    "his.stringValue=a instanceof H?Za(a):\"\"+a;break;case 1:this.number" +
+    "Value=a instanceof H?+Za(a):+a;break;case 3:this.booleanValue=a in" +
+    "stanceof H?0<a.h:!!a;break;case 4:case 5:case 6:case 7:var c=\nJ(a)" +
+    ";var d=[];for(var e=c.next();e;e=c.next())d.push(e);this.snapshotL" +
+    "ength=a.h;this.invalidIteratorState=!1;break;case 8:case 9:this.si" +
+    "ngleNodeValue=Ya(a);break;default:throw Error(\"Unknown XPathResult" +
+    " type.\");}var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw " +
+    "Error(\"iterateNext called with wrong result type\");return f>=d.len" +
+    "gth?null:d[f++]};this.snapshotItem=function(g){if(6!=b&&7!=b)throw" +
+    " Error(\"snapshotItem called with wrong result type\");return g>=d.l" +
+    "ength||0>g?null:d[g]}}V.ANY_TYPE=0;\nV.NUMBER_TYPE=1;V.STRING_TYPE=" +
+    "2;V.BOOLEAN_TYPE=3;V.UNORDERED_NODE_ITERATOR_TYPE=4;V.ORDERED_NODE" +
+    "_ITERATOR_TYPE=5;V.UNORDERED_NODE_SNAPSHOT_TYPE=6;V.ORDERED_NODE_S" +
+    "NAPSHOT_TYPE=7;V.ANY_UNORDERED_NODE_TYPE=8;V.FIRST_ORDERED_NODE_TY" +
+    "PE=9;function Xb(a){this.lookupNamespaceURI=bb(a)}\nfunction Yb(a,b" +
+    "){a=a||aa;var c=a.document;if(!c.evaluate||b)a.XPathResult=V,c.eva" +
+    "luate=function(d,e,f,g){return(new Wb(d,f)).evaluate(e,g)},c.creat" +
+    "eExpression=function(d,e){return new Wb(d,e)},c.createNSResolver=f" +
+    "unction(d){return new Xb(d)}}ba(\"wgxpath.install\",Yb);var W={};W.J" +
+    "=function(){var a={Y:\"http://www.w3.org/2000/svg\"};return function" +
+    "(b){return a[b]||null}}();\nW.u=function(a,b,c){var d=z(a);if(!d.do" +
+    "cumentElement)return null;Yb(d?d.parentWindow||d.defaultView:windo" +
+    "w);try{for(var e=d.createNSResolver?d.createNSResolver(d.documentE" +
+    "lement):W.J,f={},g=d.getElementsByTagName(\"*\"),h=0;h<g.length;++h)" +
+    "{var p=g[h],q=p.namespaceURI;if(q&&!f[q]){var m=p.lookupPrefix(q);" +
+    "if(!m){var y=q.match(\".*/(\\\\w+)/?$\");m=y?y[1]:\"xhtml\"}f[q]=m}}var " +
+    "L={},T;for(T in f)L[f[T]]=T;e=function(l){return L[l]||null};try{r" +
+    "eturn d.evaluate(b,a,e,c,null)}catch(l){if(\"TypeError\"===l.name)re" +
+    "turn e=\nd.createNSResolver?d.createNSResolver(d.documentElement):W" +
+    ".J,d.evaluate(b,a,e,c,null);throw l;}}catch(l){throw new B(32,\"Una" +
+    "ble to locate an element with the xpath expression \"+b+\" because o" +
+    "f the following error:\\n\"+l);}};W.K=function(a,b){if(!a||1!=a.node" +
+    "Type)throw new B(32,'The result of the xpath expression \"'+b+'\" is" +
+    ": '+a+\". It should be an element.\");};\nW.v=function(a,b){var c=fun" +
+    "ction(){var d=W.u(b,a,9);return d?d.singleNodeValue||null:b.select" +
+    "SingleNode?(d=z(b),d.setProperty&&d.setProperty(\"SelectionLanguage" +
+    "\",\"XPath\"),b.selectSingleNode(a)):null}();null!==c&&W.K(c,a);retur" +
+    "n c};\nW.A=function(a,b){var c=function(){var d=W.u(b,a,7);if(d){fo" +
+    "r(var e=d.snapshotLength,f=[],g=0;g<e;++g)f.push(d.snapshotItem(g)" +
+    ");return f}return b.selectNodes?(d=z(b),d.setProperty&&d.setProper" +
+    "ty(\"SelectionLanguage\",\"XPath\"),b.selectNodes(a)):[]}();n(c,functi" +
+    "on(d){W.K(d,a)});return c};var Zb={aliceblue:\"#f0f8ff\",antiquewhit" +
+    "e:\"#faebd7\",aqua:\"#00ffff\",aquamarine:\"#7fffd4\",azure:\"#f0ffff\",be" +
+    "ige:\"#f5f5dc\",bisque:\"#ffe4c4\",black:\"#000000\",blanchedalmond:\"#ff" +
+    "ebcd\",blue:\"#0000ff\",blueviolet:\"#8a2be2\",brown:\"#a52a2a\",burlywoo" +
+    "d:\"#deb887\",cadetblue:\"#5f9ea0\",chartreuse:\"#7fff00\",chocolate:\"#d" +
+    "2691e\",coral:\"#ff7f50\",cornflowerblue:\"#6495ed\",cornsilk:\"#fff8dc\"" +
+    ",crimson:\"#dc143c\",cyan:\"#00ffff\",darkblue:\"#00008b\",darkcyan:\"#00" +
+    "8b8b\",darkgoldenrod:\"#b8860b\",darkgray:\"#a9a9a9\",darkgreen:\"#00640" +
+    "0\",\ndarkgrey:\"#a9a9a9\",darkkhaki:\"#bdb76b\",darkmagenta:\"#8b008b\",d" +
+    "arkolivegreen:\"#556b2f\",darkorange:\"#ff8c00\",darkorchid:\"#9932cc\"," +
+    "darkred:\"#8b0000\",darksalmon:\"#e9967a\",darkseagreen:\"#8fbc8f\",dark" +
+    "slateblue:\"#483d8b\",darkslategray:\"#2f4f4f\",darkslategrey:\"#2f4f4f" +
+    "\",darkturquoise:\"#00ced1\",darkviolet:\"#9400d3\",deeppink:\"#ff1493\"," +
+    "deepskyblue:\"#00bfff\",dimgray:\"#696969\",dimgrey:\"#696969\",dodgerbl" +
+    "ue:\"#1e90ff\",firebrick:\"#b22222\",floralwhite:\"#fffaf0\",forestgreen" +
+    ":\"#228b22\",fuchsia:\"#ff00ff\",gainsboro:\"#dcdcdc\",\nghostwhite:\"#f8f" +
+    "8ff\",gold:\"#ffd700\",goldenrod:\"#daa520\",gray:\"#808080\",green:\"#008" +
+    "000\",greenyellow:\"#adff2f\",grey:\"#808080\",honeydew:\"#f0fff0\",hotpi" +
+    "nk:\"#ff69b4\",indianred:\"#cd5c5c\",indigo:\"#4b0082\",ivory:\"#fffff0\"," +
+    "khaki:\"#f0e68c\",lavender:\"#e6e6fa\",lavenderblush:\"#fff0f5\",lawngre" +
+    "en:\"#7cfc00\",lemonchiffon:\"#fffacd\",lightblue:\"#add8e6\",lightcoral" +
+    ":\"#f08080\",lightcyan:\"#e0ffff\",lightgoldenrodyellow:\"#fafad2\",ligh" +
+    "tgray:\"#d3d3d3\",lightgreen:\"#90ee90\",lightgrey:\"#d3d3d3\",lightpink" +
+    ":\"#ffb6c1\",lightsalmon:\"#ffa07a\",\nlightseagreen:\"#20b2aa\",lightsky" +
+    "blue:\"#87cefa\",lightslategray:\"#778899\",lightslategrey:\"#778899\",l" +
+    "ightsteelblue:\"#b0c4de\",lightyellow:\"#ffffe0\",lime:\"#00ff00\",limeg" +
+    "reen:\"#32cd32\",linen:\"#faf0e6\",magenta:\"#ff00ff\",maroon:\"#800000\"," +
+    "mediumaquamarine:\"#66cdaa\",mediumblue:\"#0000cd\",mediumorchid:\"#ba5" +
+    "5d3\",mediumpurple:\"#9370db\",mediumseagreen:\"#3cb371\",mediumslatebl" +
+    "ue:\"#7b68ee\",mediumspringgreen:\"#00fa9a\",mediumturquoise:\"#48d1cc\"" +
+    ",mediumvioletred:\"#c71585\",midnightblue:\"#191970\",mintcream:\"#f5ff" +
+    "fa\",mistyrose:\"#ffe4e1\",\nmoccasin:\"#ffe4b5\",navajowhite:\"#ffdead\"," +
+    "navy:\"#000080\",oldlace:\"#fdf5e6\",olive:\"#808000\",olivedrab:\"#6b8e2" +
+    "3\",orange:\"#ffa500\",orangered:\"#ff4500\",orchid:\"#da70d6\",palegolde" +
+    "nrod:\"#eee8aa\",palegreen:\"#98fb98\",paleturquoise:\"#afeeee\",palevio" +
+    "letred:\"#db7093\",papayawhip:\"#ffefd5\",peachpuff:\"#ffdab9\",peru:\"#c" +
+    "d853f\",pink:\"#ffc0cb\",plum:\"#dda0dd\",powderblue:\"#b0e0e6\",purple:\"" +
+    "#800080\",red:\"#ff0000\",rosybrown:\"#bc8f8f\",royalblue:\"#4169e1\",sad" +
+    "dlebrown:\"#8b4513\",salmon:\"#fa8072\",sandybrown:\"#f4a460\",seagreen:" +
+    "\"#2e8b57\",\nseashell:\"#fff5ee\",sienna:\"#a0522d\",silver:\"#c0c0c0\",sk" +
+    "yblue:\"#87ceeb\",slateblue:\"#6a5acd\",slategray:\"#708090\",slategrey:" +
+    "\"#708090\",snow:\"#fffafa\",springgreen:\"#00ff7f\",steelblue:\"#4682b4\"" +
+    ",tan:\"#d2b48c\",teal:\"#008080\",thistle:\"#d8bfd8\",tomato:\"#ff6347\",t" +
+    "urquoise:\"#40e0d0\",violet:\"#ee82ee\",wheat:\"#f5deb3\",white:\"#ffffff" +
+    "\",whitesmoke:\"#f5f5f5\",yellow:\"#ffff00\",yellowgreen:\"#9acd32\"};var" +
+    " $b=\"backgroundColor borderTopColor borderRightColor borderBottomC" +
+    "olor borderLeftColor color outlineColor\".split(\" \"),ac=/#([0-9a-fA" +
+    "-F])([0-9a-fA-F])([0-9a-fA-F])/,bc=/^#(?:[0-9a-f]{3}){1,2}$/i,cc=/" +
+    "^(?:rgba)?\\((\\d{1,3}),\\s?(\\d{1,3}),\\s?(\\d{1,3}),\\s?(0|1|0\\.\\d*)\\)$" +
+    "/i,dc=/^(?:rgb)?\\((0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2}),\\s?(0|[1-9]" +
+    "\\d{0,2})\\)$/i;function ec(a,b){b=b.toLowerCase();return\"style\"==b?" +
+    "fc(a.style.cssText):(a=a.getAttributeNode(b))&&a.specified?a.value" +
+    ":null}var gc=RegExp(\"[;]+(?=(?:(?:[^\\\"]*\\\"){2})*[^\\\"]*$)(?=(?:(?:[" +
+    "^']*'){2})*[^']*$)(?=(?:[^()]*\\\\([^()]*\\\\))*[^()]*$)\");function fc" +
+    "(a){var b=[];n(a.split(gc),function(c){var d=c.indexOf(\":\");0<d&&(" +
+    "c=[c.slice(0,d),c.slice(d+1)],2==c.length&&b.push(c[0].toLowerCase" +
+    "(),\":\",c[1],\";\"))});b=b.join(\"\");return b=\";\"==b.charAt(b.length-1" +
+    ")?b:b+\";\"}\nfunction X(a,b){b&&\"string\"!==typeof b&&(b=b.toString()" +
+    ");return!!a&&1==a.nodeType&&(!b||a.tagName.toUpperCase()==b)};func" +
+    "tion hc(a){for(a=a.parentNode;a&&1!=a.nodeType&&9!=a.nodeType&&11!" +
+    "=a.nodeType;)a=a.parentNode;return X(a)?a:null}\nfunction Y(a,b){b=" +
+    "wa(b);if(\"float\"==b||\"cssFloat\"==b||\"styleFloat\"==b)b=\"cssFloat\";a" +
+    ":{var c=b;var d=z(a);if(d.defaultView&&d.defaultView.getComputedSt" +
+    "yle&&(d=d.defaultView.getComputedStyle(a,null))){c=d[c]||d.getProp" +
+    "ertyValue(c)||\"\";break a}c=\"\"}a=c||ic(a,b);if(null===a)a=null;else" +
+    " if(0<=ma($b,b)){b:{var e=a.match(cc);if(e&&(b=Number(e[1]),c=Numb" +
+    "er(e[2]),d=Number(e[3]),e=Number(e[4]),0<=b&&255>=b&&0<=c&&255>=c&" +
+    "&0<=d&&255>=d&&0<=e&&1>=e)){b=[b,c,d,e];break b}b=null}if(!b)b:{if" +
+    "(d=a.match(dc))if(b=Number(d[1]),\nc=Number(d[2]),d=Number(d[3]),0<" +
+    "=b&&255>=b&&0<=c&&255>=c&&0<=d&&255>=d){b=[b,c,d,1];break b}b=null" +
+    "}if(!b)b:{b=a.toLowerCase();c=Zb[b.toLowerCase()];if(!c&&(c=\"#\"==b" +
+    ".charAt(0)?b:\"#\"+b,4==c.length&&(c=c.replace(ac,\"#$1$1$2$2$3$3\"))," +
+    "!bc.test(c))){b=null;break b}b=[parseInt(c.substr(1,2),16),parseIn" +
+    "t(c.substr(3,2),16),parseInt(c.substr(5,2),16),1]}a=b?\"rgba(\"+b.jo" +
+    "in(\", \")+\")\":a}return a}\nfunction ic(a,b){var c=a.currentStyle||a." +
+    "style,d=c[b];void 0===d&&\"function\"===typeof c.getPropertyValue&&(" +
+    "d=c.getPropertyValue(b));return\"inherit\"!=d?void 0!==d?d:null:(a=h" +
+    "c(a))?ic(a,b):null}\nfunction jc(a,b,c){function d(g){var h=kc(g);r" +
+    "eturn 0<h.height&&0<h.width?!0:X(g,\"PATH\")&&(0<h.height||0<h.width" +
+    ")?(g=Y(g,\"stroke-width\"),!!g&&0<parseInt(g,10)):\"hidden\"!=Y(g,\"ove" +
+    "rflow\")&&oa(g.childNodes,function(p){return 3==p.nodeType||X(p)&&d" +
+    "(p)})}function e(g){return\"hidden\"==lc(g)&&pa(g.childNodes,functio" +
+    "n(h){return!X(h)||e(h)||!d(h)})}if(!X(a))throw Error(\"Argument to " +
+    "isShown must be of type Element\");if(X(a,\"BODY\"))return!0;if(X(a,\"" +
+    "OPTION\")||X(a,\"OPTGROUP\"))return a=Ea(a,function(g){return X(g,\n\"S" +
+    "ELECT\")}),!!a&&jc(a,!0,c);var f=mc(a);if(f)return!!f.image&&0<f.re" +
+    "ct.width&&0<f.rect.height&&jc(f.image,b,c);if(X(a,\"INPUT\")&&\"hidde" +
+    "n\"==a.type.toLowerCase()||X(a,\"NOSCRIPT\"))return!1;f=Y(a,\"visibili" +
+    "ty\");return\"collapse\"!=f&&\"hidden\"!=f&&c(a)&&(b||0!=nc(a))&&d(a)?!" +
+    "e(a):!1}\nfunction oc(a){function b(c){if(X(c)&&\"none\"==Y(c,\"displa" +
+    "y\"))return!1;var d;(d=c.parentNode)&&d.shadowRoot&&void 0!==c.assi" +
+    "gnedSlot?d=c.assignedSlot?c.assignedSlot.parentNode:null:c.getDest" +
+    "inationInsertionPoints&&(c=c.getDestinationInsertionPoints(),0<c.l" +
+    "ength&&(d=c[c.length-1]));return!d||9!=d.nodeType&&11!=d.nodeType?" +
+    "!!d&&b(d):!0}return jc(a,!1,b)}\nfunction lc(a){function b(l){funct" +
+    "ion r($a){return $a==g?!0:0==Y($a,\"display\").lastIndexOf(\"inline\"," +
+    "0)||\"absolute\"==Jb&&\"static\"==Y($a,\"position\")?!1:!0}var Jb=Y(l,\"p" +
+    "osition\");if(\"fixed\"==Jb)return q=!0,l==g?null:g;for(l=hc(l);l&&!r" +
+    "(l);)l=hc(l);return l}function c(l){var r=l;if(\"visible\"==p)if(l==" +
+    "g&&h)r=h;else if(l==h)return{x:\"visible\",y:\"visible\"};r={x:Y(r,\"ov" +
+    "erflow-x\"),y:Y(r,\"overflow-y\")};l==g&&(r.x=\"visible\"==r.x?\"auto\":r" +
+    ".x,r.y=\"visible\"==r.y?\"auto\":r.y);return r}function d(l){if(l==g){" +
+    "var r=\n(new xa(f)).g;l=r.scrollingElement?r.scrollingElement:r.bod" +
+    "y||r.documentElement;r=r.parentWindow||r.defaultView;l=new v(r.pag" +
+    "eXOffset||l.scrollLeft,r.pageYOffset||l.scrollTop)}else l=new v(l." +
+    "scrollLeft,l.scrollTop);return l}var e=pc(a),f=z(a),g=f.documentEl" +
+    "ement,h=f.body,p=Y(g,\"overflow\"),q;for(a=b(a);a;a=b(a)){var m=c(a)" +
+    ";if(\"visible\"!=m.x||\"visible\"!=m.y){var y=kc(a);if(0==y.width||0==" +
+    "y.height)return\"hidden\";var L=e.g<y.left,T=e.h<y.top;if(L&&\"hidden" +
+    "\"==m.x||T&&\"hidden\"==m.y)return\"hidden\";if(L&&\n\"visible\"!=m.x||T&&" +
+    "\"visible\"!=m.y){L=d(a);T=e.h<y.top-L.y;if(e.g<y.left-L.x&&\"visible" +
+    "\"!=m.x||T&&\"visible\"!=m.x)return\"hidden\";e=lc(a);return\"hidden\"==e" +
+    "?\"hidden\":\"scroll\"}L=e.left>=y.left+y.width;y=e.top>=y.top+y.heigh" +
+    "t;if(L&&\"hidden\"==m.x||y&&\"hidden\"==m.y)return\"hidden\";if(L&&\"visi" +
+    "ble\"!=m.x||y&&\"visible\"!=m.y){if(q&&(m=d(a),e.left>=g.scrollWidth-" +
+    "m.x||e.g>=g.scrollHeight-m.y))return\"hidden\";e=lc(a);return\"hidden" +
+    "\"==e?\"hidden\":\"scroll\"}}}return\"none\"}\nfunction kc(a){var b=mc(a);" +
+    "if(b)return b.rect;if(X(a,\"HTML\"))return a=z(a),a=((a?a.parentWind" +
+    "ow||a.defaultView:window)||window).document,a=\"CSS1Compat\"==a.comp" +
+    "atMode?a.documentElement:a.body,a=new w(a.clientWidth,a.clientHeig" +
+    "ht),new C(0,0,a.width,a.height);try{var c=a.getBoundingClientRect(" +
+    ")}catch(d){return new C(0,0,0,0)}return new C(c.left,c.top,c.right" +
+    "-c.left,c.bottom-c.top)}\nfunction mc(a){var b=X(a,\"MAP\");if(!b&&!X" +
+    "(a,\"AREA\"))return null;var c=b?a:X(a.parentNode,\"MAP\")?a.parentNod" +
+    "e:null,d=null,e=null;c&&c.name&&(d=z(c),d=W.v('/descendant::*[@use" +
+    "map = \"#'+c.name+'\"]',d))&&(e=kc(d),b||\"default\"==a.shape.toLowerC" +
+    "ase()||(a=qc(a),b=Math.min(Math.max(a.left,0),e.width),c=Math.min(" +
+    "Math.max(a.top,0),e.height),e=new C(b+e.left,c+e.top,Math.min(a.wi" +
+    "dth,e.width-b),Math.min(a.height,e.height-c))));return{image:d,rec" +
+    "t:e||new C(0,0,0,0)}}\nfunction qc(a){var b=a.shape.toLowerCase();a" +
+    "=a.coords.split(\",\");if(\"rect\"==b&&4==a.length){b=a[0];var c=a[1];" +
+    "return new C(b,c,a[2]-b,a[3]-c)}if(\"circle\"==b&&3==a.length)return" +
+    " b=a[2],new C(a[0]-b,a[1]-b,2*b,2*b);if(\"poly\"==b&&2<a.length){b=a" +
+    "[0];c=a[1];for(var d=b,e=c,f=2;f+1<a.length;f+=2)b=Math.min(b,a[f]" +
+    "),d=Math.max(d,a[f]),c=Math.min(c,a[f+1]),e=Math.max(e,a[f+1]);ret" +
+    "urn new C(b,c,d-b,e-c)}return new C(0,0,0,0)}function pc(a){a=kc(a" +
+    ");return new Ma(a.top,a.left+a.width,a.top+a.height,a.left)}\nfunct" +
+    "ion rc(a){return a.replace(/^[^\\S\\xa0]+|[^\\S\\xa0]+$/g,\"\")}function" +
+    " sc(a){var b=[];tc(a,b);a=b.length;var c=Array(a);b=\"string\"===typ" +
+    "eof b?b.split(\"\"):b;for(var d=0;d<a;d++)d in b&&(c[d]=rc.call(void" +
+    " 0,b[d]));return rc(c.join(\"\\n\")).replace(/\\xa0/g,\" \")}\nfunction u" +
+    "c(a,b,c){if(X(a,\"BR\"))b.push(\"\");else{var d=X(a,\"TD\"),e=Y(a,\"displ" +
+    "ay\"),f=!d&&!(0<=ma(vc,e)),g=void 0!==a.previousElementSibling?a.pr" +
+    "eviousElementSibling:za(a.previousSibling);g=g?Y(g,\"display\"):\"\";v" +
+    "ar h=Y(a,\"float\")||Y(a,\"cssFloat\")||Y(a,\"styleFloat\");!f||\"run-in\"" +
+    "==g&&\"none\"==h||/^[\\s\\xa0]*$/.test(b[b.length-1]||\"\")||b.push(\"\");" +
+    "var p=oc(a),q=null,m=null;p&&(q=Y(a,\"white-space\"),m=Y(a,\"text-tra" +
+    "nsform\"));n(a.childNodes,function(y){c(y,b,p,q,m)});a=b[b.length-1" +
+    "]||\"\";!d&&\"table-cell\"!=e||!a||\nta(a)||(b[b.length-1]+=\" \");f&&\"ru" +
+    "n-in\"!=e&&!/^[\\s\\xa0]*$/.test(a)&&b.push(\"\")}}function tc(a,b){uc(" +
+    "a,b,function(c,d,e,f,g){3==c.nodeType&&e?wc(c,d,f,g):X(c)&&tc(c,d)" +
+    "})}var vc=\"inline inline-block inline-table none table-cell table-" +
+    "column table-column-group\".split(\" \");\nfunction wc(a,b,c,d){a=a.no" +
+    "deValue.replace(/[\\u200b\\u200e\\u200f]/g,\"\");a=a.replace(/(\\r\\n|\\r|" +
+    "\\n)/g,\"\\n\");if(\"normal\"==c||\"nowrap\"==c)a=a.replace(/\\n/g,\" \");a=\"" +
+    "pre\"==c||\"pre-wrap\"==c?a.replace(/[ \\f\\t\\v\\u2028\\u2029]/g,\"\\u00a0\"" +
+    "):a.replace(/[ \\f\\t\\v\\u2028\\u2029]+/g,\" \");\"capitalize\"==d?a=a.rep" +
+    "lace(/(^|\\s)(\\S)/g,function(e,f,g){return f+g.toUpperCase()}):\"upp" +
+    "ercase\"==d?a=a.toUpperCase():\"lowercase\"==d&&(a=a.toLowerCase());c" +
+    "=b.pop()||\"\";ta(c)&&0==a.lastIndexOf(\" \",0)&&(a=a.substr(1));b.pus" +
+    "h(c+a)}\nfunction nc(a){var b=1,c=Y(a,\"opacity\");c&&(b=Number(c));(" +
+    "a=hc(a))&&(b*=nc(a));return b};var xc={F:function(a,b){return!(!a." +
+    "querySelectorAll||!a.querySelector)&&!/^\\d.*/.test(b)},v:function(" +
+    "a,b){var c=x(b),d=ya(c.g,a);return d?ec(d,\"id\")==a&&b!=d&&Aa(b,d)?" +
+    "d:qa(A(c,\"*\"),function(e){return ec(e,\"id\")==a&&b!=e&&Aa(b,e)}):nu" +
+    "ll},A:function(a,b){if(!a)return[];if(xc.F(b,a))try{return b.query" +
+    "SelectorAll(\"#\"+xc.P(a))}catch(c){return[]}b=A(x(b),\"*\",null,b);re" +
+    "turn na(b,function(c){return ec(c,\"id\")==a})},P:function(a){return" +
+    " a.replace(/([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])/g,\"\\\\$1\")" +
+    "}};var Z={},yc={};Z.O=function(a,b,c){try{var d=La.A(\"a\",b)}catch(" +
+    "e){d=A(x(b),\"A\",null,b)}return qa(d,function(e){e=sc(e);e=e.replac" +
+    "e(/^[\\s]+|[\\s]+$/g,\"\");return c&&-1!=e.indexOf(a)||e==a})};Z.L=fun" +
+    "ction(a,b,c){try{var d=La.A(\"a\",b)}catch(e){d=A(x(b),\"A\",null,b)}r" +
+    "eturn na(d,function(e){e=sc(e);e=e.replace(/^[\\s]+|[\\s]+$/g,\"\");re" +
+    "turn c&&-1!=e.indexOf(a)||e==a})};Z.v=function(a,b){return Z.O(a,b" +
+    ",!1)};Z.A=function(a,b){return Z.L(a,b,!1)};yc.v=function(a,b){ret" +
+    "urn Z.O(a,b,!0)};\nyc.A=function(a,b){return Z.L(a,b,!0)};var zc={v" +
+    ":function(a,b){if(\"\"===a)throw new B(32,'Unable to locate an eleme" +
+    "nt with the tagName \"\"');return b.getElementsByTagName(a)[0]||null" +
+    "},A:function(a,b){if(\"\"===a)throw new B(32,'Unable to locate an el" +
+    "ement with the tagName \"\"');return b.getElementsByTagName(a)}};var" +
+    " Ac={className:Ga,\"class name\":Ga,css:La,\"css selector\":La,id:xc,l" +
+    "inkText:Z,\"link text\":Z,name:{v:function(a,b){b=A(x(b),\"*\",null,b)" +
+    ";return qa(b,function(c){return ec(c,\"name\")==a})},A:function(a,b)" +
+    "{b=A(x(b),\"*\",null,b);return na(b,function(c){return ec(c,\"name\")=" +
+    "=a})}},partialLinkText:yc,\"partial link text\":yc,tagName:zc,\"tag n" +
+    "ame\":zc,xpath:W};ba(\"_\",function(a,b){a:{for(c in a)if(a.hasOwnPro" +
+    "perty(c))break a;var c=null}if(c){var d=Ac[c];if(d&&\"function\"===t" +
+    "ypeof d.v)return d.v(a[c],b||ha.document)}throw new B(61,\"Unsuppor" +
+    "ted locator strategy: \"+c);});;return this._.apply(null,arguments)" +
+    ";}).apply({navigator:typeof window!=\"undefined\"?window.navigator:n" +
+    "ull},arguments);}\n"
+  )
+  .toString();
+  static final String FIND_ELEMENT_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String FIND_ELEMENT_ANDROID_original() {
+    return FIND_ELEMENT_ANDROID.replaceAll("xxx_rpl_lic", FIND_ELEMENT_ANDROID_license);
+  }
+
+/* field: FIND_ELEMENTS_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String FIND_ELEMENTS_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar aa=this||self;f" +
+    "unction ba(a,b){a=a.split(\".\");var c=aa;a[0]in c||\"undefined\"==typ" +
+    "eof c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d" +
+    "=a.shift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]" +
+    "?c=c[d]:c=c[d]={}:c[d]=b}function ca(a,b,c){return a.call.apply(a." +
+    "bind,arguments)}\nfunction da(a,b,c){if(!a)throw Error();if(2<argum" +
+    "ents.length){var d=Array.prototype.slice.call(arguments,2);return " +
+    "function(){var e=Array.prototype.slice.call(arguments);Array.proto" +
+    "type.unshift.apply(e,d);return a.apply(b,e)}}return function(){ret" +
+    "urn a.apply(b,arguments)}}function ea(a,b,c){Function.prototype.bi" +
+    "nd&&-1!=Function.prototype.bind.toString().indexOf(\"native code\")?" +
+    "ea=ca:ea=da;return ea.apply(null,arguments)}\nfunction fa(a,b){var " +
+    "c=Array.prototype.slice.call(arguments,1);return function(){var d=" +
+    "c.slice();d.push.apply(d,arguments);return a.apply(this,d)}}functi" +
+    "on k(a,b){function c(){}c.prototype=b.prototype;a.X=b.prototype;a." +
+    "prototype=new c;a.prototype.constructor=a;a.W=function(d,e,f){for(" +
+    "var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=" +
+    "arguments[h];return b.prototype[e].apply(d,g)}};/*\n\n Copyright 201" +
+    "4 Software Freedom Conservancy\n\n Licensed under the Apache License" +
+    ", Version 2.0 (the \"License\");\n you may not use this file except i" +
+    "n compliance with the License.\n You may obtain a copy of the Licen" +
+    "se at\n\n      http://www.apache.org/licenses/LICENSE-2.0\n\n Unless r" +
+    "equired by applicable law or agreed to in writing, software\n distr" +
+    "ibuted under the License is distributed on an \"AS IS\" BASIS,\n WITH" +
+    "OUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implie" +
+    "d.\n See the License for the specific language governing permission" +
+    "s and\n limitations under the License.\n*/\nvar ha=window;function ia" +
+    "(a,b){if(Error.captureStackTrace)Error.captureStackTrace(this,ia);" +
+    "else{var c=Error().stack;c&&(this.stack=c)}a&&(this.message=String" +
+    "(a));void 0!==b&&(this.cause=b)}k(ia,Error);ia.prototype.name=\"Cus" +
+    "tomError\";var ja;function ka(a,b){a=a.split(\"%s\");for(var c=\"\",d=a" +
+    ".length-1,e=0;e<d;e++)c+=a[e]+(e<b.length?b[e]:\"%s\");ia.call(this," +
+    "c+a[d])}k(ka,ia);ka.prototype.name=\"AssertionError\";function la(a," +
+    "b,c){if(!a){var d=\"Assertion failed\";if(b){d+=\": \"+b;var e=Array.p" +
+    "rototype.slice.call(arguments,2)}throw new ka(\"\"+d,e||[]);}};funct" +
+    "ion ma(a,b){if(\"string\"===typeof a)return\"string\"!==typeof b||1!=b" +
+    ".length?-1:a.indexOf(b,0);for(var c=0;c<a.length;c++)if(c in a&&a[" +
+    "c]===b)return c;return-1}function n(a,b){for(var c=a.length,d=\"str" +
+    "ing\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[" +
+    "e],e,a)}function na(a,b){for(var c=a.length,d=[],e=0,f=\"string\"===" +
+    "typeof a?a.split(\"\"):a,g=0;g<c;g++)if(g in f){var h=f[g];b.call(vo" +
+    "id 0,h,g,a)&&(d[e++]=h)}return d}\nfunction t(a,b,c){var d=c;n(a,fu" +
+    "nction(e,f){d=b.call(void 0,d,e,f,a)});return d}function oa(a,b){f" +
+    "or(var c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)" +
+    "if(e in d&&b.call(void 0,d[e],e,a))return!0;return!1}function pa(a" +
+    ",b){for(var c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c" +
+    ";e++)if(e in d&&!b.call(void 0,d[e],e,a))return!1;return!0}\nfuncti" +
+    "on qa(a,b){a:{for(var c=a.length,d=\"string\"===typeof a?a.split(\"\")" +
+    ":a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a)){b=e;break a}b=-" +
+    "1}return 0>b?null:\"string\"===typeof a?a.charAt(b):a[b]}function ra" +
+    "(a){return Array.prototype.concat.apply([],arguments)}function sa(" +
+    "a,b,c){la(null!=a.length);return 2>=arguments.length?Array.prototy" +
+    "pe.slice.call(a,b):Array.prototype.slice.call(a,b,c)};function ta(" +
+    "a){var b=a.length-1;return 0<=b&&a.indexOf(\" \",b)==b}var u=String." +
+    "prototype.trim?function(a){return a.trim()}:function(a){return/^[\\" +
+    "s\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};function ua(a,b){return a" +
+    "<b?-1:a>b?1:0};function va(){var a=aa.navigator;return a&&(a=a.use" +
+    "rAgent)?a:\"\"};function v(a,b){this.x=void 0!==a?a:0;this.y=void 0!" +
+    "==b?b:0}v.prototype.toString=function(){return\"(\"+this.x+\", \"+this" +
+    ".y+\")\"};v.prototype.ceil=function(){this.x=Math.ceil(this.x);this." +
+    "y=Math.ceil(this.y);return this};v.prototype.floor=function(){this" +
+    ".x=Math.floor(this.x);this.y=Math.floor(this.y);return this};v.pro" +
+    "totype.round=function(){this.x=Math.round(this.x);this.y=Math.roun" +
+    "d(this.y);return this};function w(a,b){this.width=a;this.height=b}" +
+    "w.prototype.toString=function(){return\"(\"+this.width+\" x \"+this.he" +
+    "ight+\")\"};w.prototype.aspectRatio=function(){return this.width/thi" +
+    "s.height};w.prototype.ceil=function(){this.width=Math.ceil(this.wi" +
+    "dth);this.height=Math.ceil(this.height);return this};w.prototype.f" +
+    "loor=function(){this.width=Math.floor(this.width);this.height=Math" +
+    ".floor(this.height);return this};\nw.prototype.round=function(){thi" +
+    "s.width=Math.round(this.width);this.height=Math.round(this.height)" +
+    ";return this};function wa(a){return String(a).replace(/\\-([a-z])/g" +
+    ",function(b,c){return c.toUpperCase()})};function x(a){return a?ne" +
+    "w xa(z(a)):ja||(ja=new xa)}function ya(a,b){return\"string\"===typeo" +
+    "f b?a.getElementById(b):b}function za(a){for(;a&&1!=a.nodeType;)a=" +
+    "a.previousSibling;return a}function Aa(a,b){if(!a||!b)return!1;if(" +
+    "a.contains&&1==b.nodeType)return a==b||a.contains(b);if(\"undefined" +
+    "\"!=typeof a.compareDocumentPosition)return a==b||!!(a.compareDocum" +
+    "entPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;return b==a}\nfunct" +
+    "ion Ba(a,b){if(a==b)return 0;if(a.compareDocumentPosition)return a" +
+    ".compareDocumentPosition(b)&2?1:-1;if(\"sourceIndex\"in a||a.parentN" +
+    "ode&&\"sourceIndex\"in a.parentNode){var c=1==a.nodeType,d=1==b.node" +
+    "Type;if(c&&d)return a.sourceIndex-b.sourceIndex;var e=a.parentNode" +
+    ",f=b.parentNode;return e==f?Ca(a,b):!c&&Aa(e,b)?-1*Da(a,b):!d&&Aa(" +
+    "f,a)?Da(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.sourceIndex:f.so" +
+    "urceIndex)}d=z(a);c=d.createRange();c.selectNode(a);c.collapse(!0)" +
+    ";a=d.createRange();a.selectNode(b);\na.collapse(!0);return c.compar" +
+    "eBoundaryPoints(aa.Range.START_TO_END,a)}function Da(a,b){var c=a." +
+    "parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=b.parentNode;r" +
+    "eturn Ca(b,a)}function Ca(a,b){for(;b=b.previousSibling;)if(b==a)r" +
+    "eturn-1;return 1}function z(a){la(a,\"Node cannot be null or undefi" +
+    "ned.\");return 9==a.nodeType?a:a.ownerDocument||a.document}function" +
+    " Ea(a,b){a&&(a=a.parentNode);for(var c=0;a;){la(\"parentNode\"!=a.na" +
+    "me);if(b(a))return a;a=a.parentNode;c++}return null}\nfunction xa(a" +
+    "){this.g=a||aa.document||document}xa.prototype.getElementsByTagNam" +
+    "e=function(a,b){return(b||this.g).getElementsByTagName(String(a))}" +
+    ";\nfunction A(a,b,c,d){a=d||a.g;var e=b&&\"*\"!=b?String(b).toUpperCa" +
+    "se():\"\";if(a.querySelectorAll&&a.querySelector&&(e||c))c=a.querySe" +
+    "lectorAll(e+(c?\".\"+c:\"\"));else if(c&&a.getElementsByClassName)if(b" +
+    "=a.getElementsByClassName(c),e){a={};for(var f=d=0,g;g=b[f];f++)e=" +
+    "=g.nodeName&&(a[d++]=g);a.length=d;c=a}else c=b;else if(b=a.getEle" +
+    "mentsByTagName(e||\"*\"),c){a={};for(f=d=0;g=b[f];f++){e=g.className" +
+    ";var h;if(h=\"function\"==typeof e.split)h=0<=ma(e.split(/\\s+/),c);h" +
+    "&&(a[d++]=g)}a.length=d;c=a}else c=b;return c}\n;function B(a,b){th" +
+    "is.code=a;this.g=Fa[a]||\"unknown error\";this.message=b||\"\";a=this." +
+    "g.replace(/((?:^|\\s+)[a-z])/g,function(c){return c.toUpperCase().r" +
+    "eplace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5;if(0>b||a.indexOf(\"Error\"," +
+    "b)!=b)a+=\"Error\";this.name=a;a=Error(this.message);a.name=this.nam" +
+    "e;this.stack=a.stack||\"\"}k(B,Error);\nvar Fa={15:\"element not selec" +
+    "table\",11:\"element not visible\",31:\"unknown error\",30:\"unknown err" +
+    "or\",24:\"invalid cookie domain\",29:\"invalid element coordinates\",12" +
+    ":\"invalid element state\",32:\"invalid selector\",51:\"invalid selecto" +
+    "r\",52:\"invalid selector\",17:\"javascript error\",405:\"unsupported op" +
+    "eration\",34:\"move target out of bounds\",27:\"no such alert\",7:\"no s" +
+    "uch element\",8:\"no such frame\",23:\"no such window\",28:\"script time" +
+    "out\",33:\"session not created\",10:\"stale element reference\",21:\"tim" +
+    "eout\",25:\"unable to set cookie\",\n26:\"unexpected alert open\",13:\"un" +
+    "known error\",9:\"unknown command\"};B.prototype.toString=function(){" +
+    "return this.name+\": \"+this.message};var Ga={F:function(a){return!(" +
+    "!a.querySelectorAll||!a.querySelector)},A:function(a,b){if(!a)thro" +
+    "w new B(32,\"No class name specified\");a=u(a);if(-1!==a.indexOf(\" \"" +
+    "))throw new B(32,\"Compound class names not permitted\");if(Ga.F(b))" +
+    "try{return b.querySelector(\".\"+a.replace(/\\./g,\"\\\\.\"))||null}catch" +
+    "(c){throw new B(32,\"An invalid or illegal class name was specified" +
+    "\");}a=A(x(b),\"*\",a,b);return a.length?a[0]:null},u:function(a,b){i" +
+    "f(!a)throw new B(32,\"No class name specified\");a=u(a);if(-1!==a.in" +
+    "dexOf(\" \"))throw new B(32,\n\"Compound class names not permitted\");i" +
+    "f(Ga.F(b))try{return b.querySelectorAll(\".\"+a.replace(/\\./g,\"\\\\.\")" +
+    ")}catch(c){throw new B(32,\"An invalid or illegal class name was sp" +
+    "ecified\");}return A(x(b),\"*\",a,b)}};function Ha(a){return(a=a.exec" +
+    "(va()))?a[1]:\"\"}Ha(/Android\\s+([0-9.]+)/)||Ha(/Version\\/([0-9.]+)/" +
+    ");function Ia(a){var b=0,c=u(String(Ja)).split(\".\");a=u(String(a))" +
+    ".split(\".\");for(var d=Math.max(c.length,a.length),e=0;0==b&&e<d;e+" +
+    "+){var f=c[e]||\"\",g=a[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\"" +
+    ",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].lengt" +
+    "h&&0==g[0].length)break;b=ua(0==f[1].length?0:parseInt(f[1],10),0=" +
+    "=g[1].length?0:parseInt(g[1],10))||ua(0==f[2].length,0==g[2].lengt" +
+    "h)||ua(f[2],g[2]);f=f[3];g=g[3]}while(0==b)}}var Ka=/Android\\s+([0" +
+    "-9\\.]+)/.exec(va()),Ja=Ka?Ka[1]:\"0\";Ia(2.3);\nIa(4);var La={A:funct" +
+    "ion(a,b){if(!a)throw new B(32,\"No selector specified\");a=u(a);try{" +
+    "var c=b.querySelector(a)}catch(d){throw new B(32,\"An invalid or il" +
+    "legal selector was specified\");}return c&&1==c.nodeType?c:null},u:" +
+    "function(a,b){if(!a)throw new B(32,\"No selector specified\");a=u(a)" +
+    ";try{return b.querySelectorAll(a)}catch(c){throw new B(32,\"An inva" +
+    "lid or illegal selector was specified\");}}};function Ma(a,b,c,d){t" +
+    "his.top=a;this.g=b;this.h=c;this.left=d}Ma.prototype.toString=func" +
+    "tion(){return\"(\"+this.top+\"t, \"+this.g+\"r, \"+this.h+\"b, \"+this.lef" +
+    "t+\"l)\"};Ma.prototype.ceil=function(){this.top=Math.ceil(this.top);" +
+    "this.g=Math.ceil(this.g);this.h=Math.ceil(this.h);this.left=Math.c" +
+    "eil(this.left);return this};Ma.prototype.floor=function(){this.top" +
+    "=Math.floor(this.top);this.g=Math.floor(this.g);this.h=Math.floor(" +
+    "this.h);this.left=Math.floor(this.left);return this};\nMa.prototype" +
+    ".round=function(){this.top=Math.round(this.top);this.g=Math.round(" +
+    "this.g);this.h=Math.round(this.h);this.left=Math.round(this.left);" +
+    "return this};function C(a,b,c,d){this.left=a;this.top=b;this.width" +
+    "=c;this.height=d}C.prototype.toString=function(){return\"(\"+this.le" +
+    "ft+\", \"+this.top+\" - \"+this.width+\"w x \"+this.height+\"h)\"};C.proto" +
+    "type.ceil=function(){this.left=Math.ceil(this.left);this.top=Math." +
+    "ceil(this.top);this.width=Math.ceil(this.width);this.height=Math.c" +
+    "eil(this.height);return this};\nC.prototype.floor=function(){this.l" +
+    "eft=Math.floor(this.left);this.top=Math.floor(this.top);this.width" +
+    "=Math.floor(this.width);this.height=Math.floor(this.height);return" +
+    " this};C.prototype.round=function(){this.left=Math.round(this.left" +
+    ");this.top=Math.round(this.top);this.width=Math.round(this.width);" +
+    "this.height=Math.round(this.height);return this};/*\n\n The MIT Lice" +
+    "nse\n\n Copyright (c) 2007 Cybozu Labs, Inc.\n Copyright (c) 2012 Goo" +
+    "gle Inc.\n\n Permission is hereby granted, free of charge, to any pe" +
+    "rson obtaining a copy\n of this software and associated documentati" +
+    "on files (the \"Software\"), to\n deal in the Software without restri" +
+    "ction, including without limitation the\n rights to use, copy, modi" +
+    "fy, merge, publish, distribute, sublicense, and/or\n sell copies of" +
+    " the Software, and to permit persons to whom the Software is\n furn" +
+    "ished to do so, subject to the following conditions:\n\n The above c" +
+    "opyright notice and this permission notice shall be included in\n a" +
+    "ll copies or substantial portions of the Software.\n\n THE SOFTWARE " +
+    "IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMP" +
+    "LIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILI" +
+    "TY,\n FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO E" +
+    "VENT SHALL THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLA" +
+    "IM, DAMAGES OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT," +
+    " TORT OR OTHERWISE, ARISING\n FROM, OUT OF OR IN CONNECTION WITH TH" +
+    "E SOFTWARE OR THE USE OR OTHER DEALINGS\n IN THE SOFTWARE.\n*/\nfunct" +
+    "ion D(a,b,c){this.g=a;this.j=b||1;this.h=c||1};function Na(a){this" +
+    ".h=a;this.g=0}function Oa(a){a=a.match(Pa);for(var b=0;b<a.length;" +
+    "b++)Qa.test(a[b])&&a.splice(b,1);return new Na(a)}var Pa=RegExp(\"\\" +
+    "\\$?(?:(?![0-9-])[\\\\w-]+:)?(?![0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(" +
+    "?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[^\\\"]*\\\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),Qa=/^\\s" +
+    "/;function E(a,b){return a.h[a.g+(b||0)]}Na.prototype.next=functio" +
+    "n(){return this.h[this.g++]};function Ra(a){return a.h.length<=a.g" +
+    "};function F(a){var b=null,c=a.nodeType;1==c&&(b=a.textContent,b=v" +
+    "oid 0==b||null==b?a.innerText:b,b=void 0==b||null==b?\"\":b);if(\"str" +
+    "ing\"!=typeof b)if(9==c||1==c){a=9==c?a.documentElement:a.firstChil" +
+    "d;c=0;var d=[];for(b=\"\";a;){do 1!=a.nodeType&&(b+=a.nodeValue),d[c" +
+    "++]=a;while(a=a.firstChild);for(;c&&!(a=d[--c].nextSibling););}}el" +
+    "se b=a.nodeValue;return\"\"+b}\nfunction G(a,b,c){if(null===b)return!" +
+    "0;try{if(!a.getAttribute)return!1}catch(d){return!1}return null==c" +
+    "?!!a.getAttribute(b):a.getAttribute(b,2)==c}function Sa(a,b,c,d,e)" +
+    "{return Ta.call(null,a,b,\"string\"===typeof c?c:null,\"string\"===typ" +
+    "eof d?d:null,e||new H)}\nfunction Ta(a,b,c,d,e){b.getElementsByName" +
+    "&&d&&\"name\"==c?(b=b.getElementsByName(d),n(b,function(f){a.g(f)&&e" +
+    ".add(f)})):b.getElementsByClassName&&d&&\"class\"==c?(b=b.getElement" +
+    "sByClassName(d),n(b,function(f){f.className==d&&a.g(f)&&e.add(f)})" +
+    "):a instanceof I?Ua(a,b,c,d,e):b.getElementsByTagName&&(b=b.getEle" +
+    "mentsByTagName(a.j()),n(b,function(f){G(f,c,d)&&e.add(f)}));return" +
+    " e}function Ua(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)G(b" +
+    ",c,d)&&a.g(b)&&e.add(b),Ua(a,b,c,d,e)};function H(){this.j=this.g=" +
+    "null;this.h=0}function Va(a){this.h=a;this.next=this.g=null}functi" +
+    "on Wa(a,b){if(!a.g)return b;if(!b.g)return a;var c=a.g;b=b.g;for(v" +
+    "ar d=null,e,f=0;c&&b;)c.h==b.h?(e=c,c=c.next,b=b.next):0<Ba(c.h,b." +
+    "h)?(e=b,b=b.next):(e=c,c=c.next),(e.g=d)?d.next=e:a.g=e,d=e,f++;fo" +
+    "r(e=c||b;e;)e.g=d,d=d.next=e,f++,e=e.next;a.j=d;a.h=f;return a}fun" +
+    "ction Xa(a,b){b=new Va(b);b.next=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a" +
+    ".h++}\nH.prototype.add=function(a){a=new Va(a);a.g=this.j;this.g?th" +
+    "is.j.next=a:this.g=this.j=a;this.j=a;this.h++};function Ya(a){retu" +
+    "rn(a=a.g)?a.h:null}function Za(a){return(a=Ya(a))?F(a):\"\"}function" +
+    " J(a,b){return new ab(a,!!b)}function ab(a,b){this.j=a;this.h=(thi" +
+    "s.C=b)?a.j:a.g;this.g=null}ab.prototype.next=function(){var a=this" +
+    ".h;if(null==a)return null;var b=this.g=a;this.h=this.C?a.g:a.next;" +
+    "return b.h};function bb(a){switch(a.nodeType){case 1:return fa(cb," +
+    "a);case 9:return bb(a.documentElement);case 11:case 10:case 6:case" +
+    " 12:return db;default:return a.parentNode?bb(a.parentNode):db}}fun" +
+    "ction db(){return null}function cb(a,b){if(a.prefix==b)return a.na" +
+    "mespaceURI||\"http://www.w3.org/1999/xhtml\";var c=a.getAttributeNod" +
+    "e(\"xmlns:\"+b);return c&&c.specified?c.value||null:a.parentNode&&9!" +
+    "=a.parentNode.nodeType?cb(a.parentNode,b):null};function K(a){this" +
+    ".o=a;this.h=this.l=!1;this.j=null}function M(a){return\"\\n  \"+a.toS" +
+    "tring().split(\"\\n\").join(\"\\n  \")}function eb(a,b){a.l=b}function f" +
+    "b(a,b){a.h=b}function N(a,b){a=a.g(b);return a instanceof H?+Za(a)" +
+    ":+a}function O(a,b){a=a.g(b);return a instanceof H?Za(a):\"\"+a}func" +
+    "tion gb(a,b){a=a.g(b);return a instanceof H?!!a.h:!!a};function hb" +
+    "(a,b,c){K.call(this,a.o);this.i=a;this.m=b;this.B=c;this.l=b.l||c." +
+    "l;this.h=b.h||c.h;this.i==ib&&(c.h||c.l||4==c.o||0==c.o||!b.j?b.h|" +
+    "|b.l||4==b.o||0==b.o||!c.j||(this.j={name:c.j.name,D:b}):this.j={n" +
+    "ame:b.j.name,D:c})}k(hb,K);\nfunction jb(a,b,c,d,e){b=b.g(d);c=c.g(" +
+    "d);var f;if(b instanceof H&&c instanceof H){b=J(b);for(d=b.next();" +
+    "d;d=b.next())for(e=J(c),f=e.next();f;f=e.next())if(a(F(d),F(f)))re" +
+    "turn!0;return!1}if(b instanceof H||c instanceof H){b instanceof H?" +
+    "(e=b,d=c):(e=c,d=b);f=J(e);for(var g=typeof d,h=f.next();h;h=f.nex" +
+    "t()){switch(g){case \"number\":h=+F(h);break;case \"boolean\":h=!!F(h)" +
+    ";break;case \"string\":h=F(h);break;default:throw Error(\"Illegal pri" +
+    "mitive type for comparison.\");}if(e==b&&a(h,d)||e==c&&a(d,h))retur" +
+    "n!0}return!1}return e?\n\"boolean\"==typeof b||\"boolean\"==typeof c?a(" +
+    "!!b,!!c):\"number\"==typeof b||\"number\"==typeof c?a(+b,+c):a(b,c):a(" +
+    "+b,+c)}hb.prototype.g=function(a){return this.i.v(this.m,this.B,a)" +
+    "};hb.prototype.toString=function(){var a=\"Binary Expression: \"+thi" +
+    "s.i;a+=M(this.m);return a+=M(this.B)};function kb(a,b,c,d){this.U=" +
+    "a;this.N=b;this.o=c;this.v=d}kb.prototype.toString=function(){retu" +
+    "rn this.U};var lb={};\nfunction P(a,b,c,d){if(lb.hasOwnProperty(a))" +
+    "throw Error(\"Binary operator already created: \"+a);a=new kb(a,b,c," +
+    "d);return lb[a.toString()]=a}P(\"div\",6,1,function(a,b,c){return N(" +
+    "a,c)/N(b,c)});P(\"mod\",6,1,function(a,b,c){return N(a,c)%N(b,c)});P" +
+    "(\"*\",6,1,function(a,b,c){return N(a,c)*N(b,c)});P(\"+\",5,1,function" +
+    "(a,b,c){return N(a,c)+N(b,c)});P(\"-\",5,1,function(a,b,c){return N(" +
+    "a,c)-N(b,c)});P(\"<\",4,2,function(a,b,c){return jb(function(d,e){re" +
+    "turn d<e},a,b,c)});\nP(\">\",4,2,function(a,b,c){return jb(function(d" +
+    ",e){return d>e},a,b,c)});P(\"<=\",4,2,function(a,b,c){return jb(func" +
+    "tion(d,e){return d<=e},a,b,c)});P(\">=\",4,2,function(a,b,c){return " +
+    "jb(function(d,e){return d>=e},a,b,c)});var ib=P(\"=\",3,2,function(a" +
+    ",b,c){return jb(function(d,e){return d==e},a,b,c,!0)});P(\"!=\",3,2," +
+    "function(a,b,c){return jb(function(d,e){return d!=e},a,b,c,!0)});P" +
+    "(\"and\",2,2,function(a,b,c){return gb(a,c)&&gb(b,c)});P(\"or\",1,2,fu" +
+    "nction(a,b,c){return gb(a,c)||gb(b,c)});function mb(a,b){if(b.g.le" +
+    "ngth&&4!=a.o)throw Error(\"Primary expression must evaluate to node" +
+    "set if filter has predicate(s).\");K.call(this,a.o);this.m=a;this.i" +
+    "=b;this.l=a.l;this.h=a.h}k(mb,K);mb.prototype.g=function(a){a=this" +
+    ".m.g(a);return nb(this.i,a)};mb.prototype.toString=function(){var " +
+    "a=\"Filter:\"+M(this.m);return a+=M(this.i)};function ob(a,b){if(b.l" +
+    "ength<a.M)throw Error(\"Function \"+a.s+\" expects at least\"+a.M+\" ar" +
+    "guments, \"+b.length+\" given\");if(null!==a.H&&b.length>a.H)throw Er" +
+    "ror(\"Function \"+a.s+\" expects at most \"+a.H+\" arguments, \"+b.lengt" +
+    "h+\" given\");a.T&&n(b,function(c,d){if(4!=c.o)throw Error(\"Argument" +
+    " \"+d+\" to function \"+a.s+\" is not of type Nodeset: \"+c);});K.call(" +
+    "this,a.o);this.G=a;this.i=b;eb(this,a.l||oa(b,function(c){return c" +
+    ".l}));fb(this,a.S&&!b.length||a.R&&!!b.length||oa(b,function(c){re" +
+    "turn c.h}))}\nk(ob,K);ob.prototype.g=function(a){return this.G.v.ap" +
+    "ply(null,ra(a,this.i))};ob.prototype.toString=function(){var a=\"Fu" +
+    "nction: \"+this.G;if(this.i.length){var b=t(this.i,function(c,d){re" +
+    "turn c+M(d)},\"Arguments:\");a+=M(b)}return a};function pb(a,b,c,d,e" +
+    ",f,g,h){this.s=a;this.o=b;this.l=c;this.S=d;this.R=!1;this.v=e;thi" +
+    "s.M=f;this.H=void 0!==g?g:f;this.T=!!h}pb.prototype.toString=funct" +
+    "ion(){return this.s};var qb={};\nfunction Q(a,b,c,d,e,f,g,h){if(qb." +
+    "hasOwnProperty(a))throw Error(\"Function already created: \"+a+\".\");" +
+    "qb[a]=new pb(a,b,c,d,e,f,g,h)}Q(\"boolean\",2,!1,!1,function(a,b){re" +
+    "turn gb(b,a)},1);Q(\"ceiling\",1,!1,!1,function(a,b){return Math.cei" +
+    "l(N(b,a))},1);Q(\"concat\",3,!1,!1,function(a,b){var c=sa(arguments," +
+    "1);return t(c,function(d,e){return d+O(e,a)},\"\")},2,null);Q(\"conta" +
+    "ins\",2,!1,!1,function(a,b,c){b=O(b,a);a=O(c,a);return-1!=b.indexOf" +
+    "(a)},2);Q(\"count\",1,!1,!1,function(a,b){return b.g(a).h},1,1,!0);\n" +
+    "Q(\"false\",2,!1,!1,function(){return!1},0);Q(\"floor\",1,!1,!1,functi" +
+    "on(a,b){return Math.floor(N(b,a))},1);Q(\"id\",4,!1,!1,function(a,b)" +
+    "{var c=a.g,d=9==c.nodeType?c:c.ownerDocument;a=O(b,a).split(/\\s+/)" +
+    ";var e=[];n(a,function(g){g=d.getElementById(g);!g||0<=ma(e,g)||e." +
+    "push(g)});e.sort(Ba);var f=new H;n(e,function(g){f.add(g)});return" +
+    " f},1);Q(\"lang\",2,!1,!1,function(){return!1},1);Q(\"last\",1,!0,!1,f" +
+    "unction(a){if(1!=arguments.length)throw Error(\"Function last expec" +
+    "ts ()\");return a.h},0);\nQ(\"local-name\",3,!1,!0,function(a,b){retur" +
+    "n(a=b?Ya(b.g(a)):a.g)?a.localName||a.nodeName.toLowerCase():\"\"},0," +
+    "1,!0);Q(\"name\",3,!1,!0,function(a,b){return(a=b?Ya(b.g(a)):a.g)?a." +
+    "nodeName.toLowerCase():\"\"},0,1,!0);Q(\"namespace-uri\",3,!0,!1,funct" +
+    "ion(){return\"\"},0,1,!0);Q(\"normalize-space\",3,!1,!0,function(a,b){" +
+    "return(b?O(b,a):F(a.g)).replace(/[\\s\\xa0]+/g,\" \").replace(/^\\s+|\\s" +
+    "+$/g,\"\")},0,1);Q(\"not\",2,!1,!1,function(a,b){return!gb(b,a)},1);Q(" +
+    "\"number\",1,!1,!0,function(a,b){return b?N(b,a):+F(a.g)},0,1);\nQ(\"p" +
+    "osition\",1,!0,!1,function(a){return a.j},0);Q(\"round\",1,!1,!1,func" +
+    "tion(a,b){return Math.round(N(b,a))},1);Q(\"starts-with\",2,!1,!1,fu" +
+    "nction(a,b,c){b=O(b,a);a=O(c,a);return 0==b.lastIndexOf(a,0)},2);Q" +
+    "(\"string\",3,!1,!0,function(a,b){return b?O(b,a):F(a.g)},0,1);Q(\"st" +
+    "ring-length\",1,!1,!0,function(a,b){return(b?O(b,a):F(a.g)).length}" +
+    ",0,1);\nQ(\"substring\",3,!1,!1,function(a,b,c,d){c=N(c,a);if(isNaN(c" +
+    ")||Infinity==c||-Infinity==c)return\"\";d=d?N(d,a):Infinity;if(isNaN" +
+    "(d)||-Infinity===d)return\"\";c=Math.round(c)-1;var e=Math.max(c,0);" +
+    "a=O(b,a);return Infinity==d?a.substring(e):a.substring(e,c+Math.ro" +
+    "und(d))},2,3);Q(\"substring-after\",3,!1,!1,function(a,b,c){b=O(b,a)" +
+    ";a=O(c,a);c=b.indexOf(a);return-1==c?\"\":b.substring(c+a.length)},2" +
+    ");\nQ(\"substring-before\",3,!1,!1,function(a,b,c){b=O(b,a);a=O(c,a);" +
+    "a=b.indexOf(a);return-1==a?\"\":b.substring(0,a)},2);Q(\"sum\",1,!1,!1" +
+    ",function(a,b){a=J(b.g(a));b=0;for(var c=a.next();c;c=a.next())b+=" +
+    "+F(c);return b},1,1,!0);Q(\"translate\",3,!1,!1,function(a,b,c,d){b=" +
+    "O(b,a);c=O(c,a);var e=O(d,a);a={};for(d=0;d<c.length;d++){var f=c." +
+    "charAt(d);f in a||(a[f]=e.charAt(d))}c=\"\";for(d=0;d<b.length;d++)f" +
+    "=b.charAt(d),c+=f in a?a[f]:f;return c},3);Q(\"true\",2,!1,!1,functi" +
+    "on(){return!0},0);function I(a,b){this.m=a;this.i=void 0!==b?b:nul" +
+    "l;this.h=null;switch(a){case \"comment\":this.h=8;break;case \"text\":" +
+    "this.h=3;break;case \"processing-instruction\":this.h=7;break;case \"" +
+    "node\":break;default:throw Error(\"Unexpected argument\");}}function " +
+    "rb(a){return\"comment\"==a||\"text\"==a||\"processing-instruction\"==a||" +
+    "\"node\"==a}I.prototype.g=function(a){return null===this.h||this.h==" +
+    "a.nodeType};I.prototype.getType=function(){return this.h};I.protot" +
+    "ype.j=function(){return this.m};\nI.prototype.toString=function(){v" +
+    "ar a=\"Kind Test: \"+this.m;null!==this.i&&(a+=M(this.i));return a};" +
+    "function sb(a){K.call(this,3);this.i=a.substring(1,a.length-1)}k(s" +
+    "b,K);sb.prototype.g=function(){return this.i};sb.prototype.toStrin" +
+    "g=function(){return\"Literal: \"+this.i};function tb(a,b){this.s=a.t" +
+    "oLowerCase();this.h=b?b.toLowerCase():\"http://www.w3.org/1999/xhtm" +
+    "l\"}tb.prototype.g=function(a){var b=a.nodeType;return 1!=b&&2!=b?!" +
+    "1:\"*\"!=this.s&&this.s!=a.nodeName.toLowerCase()?!1:this.h==(a.name" +
+    "spaceURI?a.namespaceURI.toLowerCase():\"http://www.w3.org/1999/xhtm" +
+    "l\")};tb.prototype.j=function(){return this.s};tb.prototype.toStrin" +
+    "g=function(){return\"Name Test: \"+(\"http://www.w3.org/1999/xhtml\"==" +
+    "this.h?\"\":this.h+\":\")+this.s};function ub(a){K.call(this,1);this.i" +
+    "=a}k(ub,K);ub.prototype.g=function(){return this.i};ub.prototype.t" +
+    "oString=function(){return\"Number: \"+this.i};function vb(a,b){K.cal" +
+    "l(this,a.o);this.m=a;this.i=b;this.l=a.l;this.h=a.h;1==this.i.leng" +
+    "th&&(a=this.i[0],a.I||a.i!=wb||(a=a.B,\"*\"!=a.j()&&(this.j={name:a." +
+    "j(),D:null})))}k(vb,K);function xb(){K.call(this,4)}k(xb,K);xb.pro" +
+    "totype.g=function(a){var b=new H;a=a.g;9==a.nodeType?b.add(a):b.ad" +
+    "d(a.ownerDocument);return b};xb.prototype.toString=function(){retu" +
+    "rn\"Root Helper Expression\"};function yb(){K.call(this,4)}k(yb,K);y" +
+    "b.prototype.g=function(a){var b=new H;b.add(a.g);return b};yb.prot" +
+    "otype.toString=function(){return\"Context Helper Expression\"};\nfunc" +
+    "tion zb(a){return\"/\"==a||\"//\"==a}vb.prototype.g=function(a){var b=" +
+    "this.m.g(a);if(!(b instanceof H))throw Error(\"Filter expression mu" +
+    "st evaluate to nodeset.\");a=this.i;for(var c=0,d=a.length;c<d&&b.h" +
+    ";c++){var e=a[c],f=J(b,e.i.C);if(e.l||e.i!=Ab)if(e.l||e.i!=Bb){var" +
+    " g=f.next();for(b=e.g(new D(g));null!=(g=f.next());)g=e.g(new D(g)" +
+    "),b=Wa(b,g)}else g=f.next(),b=e.g(new D(g));else{for(g=f.next();(b" +
+    "=f.next())&&(!g.contains||g.contains(b))&&b.compareDocumentPositio" +
+    "n(g)&8;g=b);b=e.g(new D(g))}}return b};\nvb.prototype.toString=func" +
+    "tion(){var a=\"Path Expression:\"+M(this.m);if(this.i.length){var b=" +
+    "t(this.i,function(c,d){return c+M(d)},\"Steps:\");a+=M(b)}return a};" +
+    "function Cb(a,b){this.g=a;this.C=!!b}\nfunction nb(a,b,c){for(c=c||" +
+    "0;c<a.g.length;c++)for(var d=a.g[c],e=J(b),f=b.h,g,h=0;g=e.next();" +
+    "h++){var p=a.C?f-h:h+1;g=d.g(new D(g,p,f));if(\"number\"==typeof g)p" +
+    "=p==g;else if(\"string\"==typeof g||\"boolean\"==typeof g)p=!!g;else i" +
+    "f(g instanceof H)p=0<g.h;else throw Error(\"Predicate.evaluate retu" +
+    "rned an unexpected type.\");if(!p){p=e;g=p.j;var q=p.g;if(!q)throw " +
+    "Error(\"Next must be called at least once before remove.\");var m=q." +
+    "g;q=q.next;m?m.next=q:g.g=q;q?q.g=m:g.j=m;g.h--;p.g=null}}return b" +
+    "}\nCb.prototype.toString=function(){return t(this.g,function(a,b){r" +
+    "eturn a+M(b)},\"Predicates:\")};function R(a,b,c,d){K.call(this,4);t" +
+    "his.i=a;this.B=b;this.m=c||new Cb([]);this.I=!!d;b=this.m;b=0<b.g." +
+    "length?b.g[0].j:null;a.V&&b&&(this.j={name:b.name,D:b.D});a:{a=thi" +
+    "s.m;for(b=0;b<a.g.length;b++)if(c=a.g[b],c.l||1==c.o||0==c.o){a=!0" +
+    ";break a}a=!1}this.l=a}k(R,K);\nR.prototype.g=function(a){var b=a.g" +
+    ",c=this.j,d=null,e=null,f=0;c&&(d=c.name,e=c.D?O(c.D,a):null,f=1);" +
+    "if(this.I)if(this.l||this.i!=Db)if(b=J((new R(Eb,new I(\"node\"))).g" +
+    "(a)),c=b.next())for(a=this.v(c,d,e,f);null!=(c=b.next());)a=Wa(a,t" +
+    "his.v(c,d,e,f));else a=new H;else a=Sa(this.B,b,d,e),a=nb(this.m,a" +
+    ",f);else a=this.v(a.g,d,e,f);return a};R.prototype.v=function(a,b," +
+    "c,d){a=this.i.G(this.B,a,b,c);return a=nb(this.m,a,d)};\nR.prototyp" +
+    "e.toString=function(){var a=\"Step:\"+M(\"Operator: \"+(this.I?\"//\":\"/" +
+    "\"));this.i.s&&(a+=M(\"Axis: \"+this.i));a+=M(this.B);if(this.m.g.len" +
+    "gth){var b=t(this.m.g,function(c,d){return c+M(d)},\"Predicates:\");" +
+    "a+=M(b)}return a};function Fb(a,b,c,d){this.s=a;this.G=b;this.C=c;" +
+    "this.V=d}Fb.prototype.toString=function(){return this.s};var Gb={}" +
+    ";function S(a,b,c,d){if(Gb.hasOwnProperty(a))throw Error(\"Axis alr" +
+    "eady created: \"+a);b=new Fb(a,b,c,!!d);return Gb[a]=b}\nS(\"ancestor" +
+    "\",function(a,b){for(var c=new H;b=b.parentNode;)a.g(b)&&Xa(c,b);re" +
+    "turn c},!0);S(\"ancestor-or-self\",function(a,b){var c=new H;do a.g(" +
+    "b)&&Xa(c,b);while(b=b.parentNode);return c},!0);\nvar wb=S(\"attribu" +
+    "te\",function(a,b){var c=new H,d=a.j();if(b=b.attributes)if(a insta" +
+    "nceof I&&null===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);el" +
+    "se(d=b.getNamedItem(d))&&c.add(d);return c},!1),Db=S(\"child\",funct" +
+    "ion(a,b,c,d,e){c=\"string\"===typeof c?c:null;d=\"string\"===typeof d?" +
+    "d:null;e=e||new H;for(b=b.firstChild;b;b=b.nextSibling)G(b,c,d)&&a" +
+    ".g(b)&&e.add(b);return e},!1,!0);S(\"descendant\",Sa,!1,!0);\nvar Eb=" +
+    "S(\"descendant-or-self\",function(a,b,c,d){var e=new H;G(b,c,d)&&a.g" +
+    "(b)&&e.add(b);return Sa(a,b,c,d,e)},!1,!0),Ab=S(\"following\",functi" +
+    "on(a,b,c,d){var e=new H;do for(var f=b;f=f.nextSibling;)G(f,c,d)&&"
+  )
+      .append(
+    "a.g(f)&&e.add(f),e=Sa(a,f,c,d,e);while(b=b.parentNode);return e},!" +
+    "1,!0);S(\"following-sibling\",function(a,b){for(var c=new H;b=b.next" +
+    "Sibling;)a.g(b)&&c.add(b);return c},!1);S(\"namespace\",function(){r" +
+    "eturn new H},!1);\nvar Hb=S(\"parent\",function(a,b){var c=new H;if(9" +
+    "==b.nodeType)return c;if(2==b.nodeType)return c.add(b.ownerElement" +
+    "),c;b=b.parentNode;a.g(b)&&c.add(b);return c},!1),Bb=S(\"preceding\"" +
+    ",function(a,b,c,d){var e=new H,f=[];do f.unshift(b);while(b=b.pare" +
+    "ntNode);for(var g=1,h=f.length;g<h;g++){var p=[];for(b=f[g];b=b.pr" +
+    "eviousSibling;)p.unshift(b);for(var q=0,m=p.length;q<m;q++)b=p[q]," +
+    "G(b,c,d)&&a.g(b)&&e.add(b),e=Sa(a,b,c,d,e)}return e},!0,!0);\nS(\"pr" +
+    "eceding-sibling\",function(a,b){for(var c=new H;b=b.previousSibling" +
+    ";)a.g(b)&&Xa(c,b);return c},!0);var Ib=S(\"self\",function(a,b){var " +
+    "c=new H;a.g(b)&&c.add(b);return c},!1);function Kb(a){K.call(this," +
+    "1);this.i=a;this.l=a.l;this.h=a.h}k(Kb,K);Kb.prototype.g=function(" +
+    "a){return-N(this.i,a)};Kb.prototype.toString=function(){return\"Una" +
+    "ry Expression: -\"+M(this.i)};function Lb(a){K.call(this,4);this.i=" +
+    "a;eb(this,oa(this.i,function(b){return b.l}));fb(this,oa(this.i,fu" +
+    "nction(b){return b.h}))}k(Lb,K);Lb.prototype.g=function(a){var b=n" +
+    "ew H;n(this.i,function(c){c=c.g(a);if(!(c instanceof H))throw Erro" +
+    "r(\"Path expression must evaluate to NodeSet.\");b=Wa(b,c)});return " +
+    "b};Lb.prototype.toString=function(){return t(this.i,function(a,b){" +
+    "return a+M(b)},\"Union Expression:\")};function Mb(a,b){this.g=a;thi" +
+    "s.h=b}function Nb(a){for(var b,c=[];;){U(a,\"Missing right hand sid" +
+    "e of binary expression.\");b=Ob(a);var d=a.g.next();if(!d)break;var" +
+    " e=(d=lb[d]||null)&&d.N;if(!e){a.g.g--;break}for(;c.length&&e<=c[c" +
+    ".length-1].N;)b=new hb(c.pop(),c.pop(),b);c.push(b,d)}for(;c.lengt" +
+    "h;)b=new hb(c.pop(),c.pop(),b);return b}function U(a,b){if(Ra(a.g)" +
+    ")throw Error(b);}function Pb(a,b){a=a.g.next();if(a!=b)throw Error" +
+    "(\"Bad token, expected: \"+b+\" got: \"+a);}\nfunction Qb(a){a=a.g.next" +
+    "();if(\")\"!=a)throw Error(\"Bad token: \"+a);}function Rb(a){a=a.g.ne" +
+    "xt();if(2>a.length)throw Error(\"Unclosed literal string\");return n" +
+    "ew sb(a)}function Sb(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c" +
+    ")return new tb(b);var d=b.substring(0,c);a=a.h(d);if(!a)throw Erro" +
+    "r(\"Namespace prefix not declared: \"+d);b=b.substr(c+1);return new " +
+    "tb(b,a)}\nfunction Tb(a){var b=[];if(zb(E(a.g))){var c=a.g.next();v" +
+    "ar d=E(a.g);if(\"/\"==c&&(Ra(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&" +
+    "!/(?![0-9])[\\w]/.test(d)))return new xb;d=new xb;U(a,\"Missing next" +
+    " location step.\");c=Ub(a,c);b.push(c)}else{a:{c=E(a.g);d=c.charAt(" +
+    "0);switch(d){case \"$\":throw Error(\"Variable reference not allowed " +
+    "in HTML XPath\");case \"(\":a.g.next();c=Nb(a);U(a,'unclosed \"(\"');Pb" +
+    "(a,\")\");break;case '\"':case \"'\":c=Rb(a);break;default:if(isNaN(+c)" +
+    ")if(!rb(c)&&/(?![0-9])[\\w]/.test(d)&&\"(\"==E(a.g,\n1)){c=a.g.next();" +
+    "c=qb[c]||null;a.g.next();for(d=[];\")\"!=E(a.g);){U(a,\"Missing funct" +
+    "ion argument list.\");d.push(Nb(a));if(\",\"!=E(a.g))break;a.g.next()" +
+    "}U(a,\"Unclosed function argument list.\");Qb(a);c=new ob(c,d)}else{" +
+    "c=null;break a}else c=new ub(+a.g.next())}\"[\"==E(a.g)&&(d=new Cb(V" +
+    "b(a)),c=new mb(c,d))}if(c)if(zb(E(a.g)))d=c;else return c;else c=U" +
+    "b(a,\"/\"),d=new yb,b.push(c)}for(;zb(E(a.g));)c=a.g.next(),U(a,\"Mis" +
+    "sing next location step.\"),c=Ub(a,c),b.push(c);return new vb(d,b)}" +
+    "\nfunction Ub(a,b){if(\"/\"!=b&&\"//\"!=b)throw Error('Step op should b" +
+    "e \"/\" or \"//\"');if(\".\"==E(a.g)){var c=new R(Ib,new I(\"node\"));a.g." +
+    "next();return c}if(\"..\"==E(a.g))return c=new R(Hb,new I(\"node\")),a" +
+    ".g.next(),c;if(\"@\"==E(a.g)){var d=wb;a.g.next();U(a,\"Missing attri" +
+    "bute name\")}else if(\"::\"==E(a.g,1)){if(!/(?![0-9])[\\w]/.test(E(a.g" +
+    ").charAt(0)))throw Error(\"Bad token: \"+a.g.next());var e=a.g.next(" +
+    ");d=Gb[e]||null;if(!d)throw Error(\"No axis with name: \"+e);a.g.nex" +
+    "t();U(a,\"Missing node name\")}else d=Db;e=\nE(a.g);if(/(?![0-9])[\\w]" +
+    "/.test(e.charAt(0)))if(\"(\"==E(a.g,1)){if(!rb(e))throw Error(\"Inval" +
+    "id node type: \"+e);e=a.g.next();if(!rb(e))throw Error(\"Invalid typ" +
+    "e name: \"+e);Pb(a,\"(\");U(a,\"Bad nodetype\");var f=E(a.g).charAt(0)," +
+    "g=null;if('\"'==f||\"'\"==f)g=Rb(a);U(a,\"Bad nodetype\");Qb(a);e=new I" +
+    "(e,g)}else e=Sb(a);else if(\"*\"==e)e=Sb(a);else throw Error(\"Bad to" +
+    "ken: \"+a.g.next());a=new Cb(Vb(a),d.C);return c||new R(d,e,a,\"//\"=" +
+    "=b)}\nfunction Vb(a){for(var b=[];\"[\"==E(a.g);){a.g.next();U(a,\"Mis" +
+    "sing predicate expression.\");var c=Nb(a);b.push(c);U(a,\"Unclosed p" +
+    "redicate expression.\");Pb(a,\"]\")}return b}function Ob(a){if(\"-\"==E" +
+    "(a.g))return a.g.next(),new Kb(Ob(a));var b=Tb(a);if(\"|\"!=E(a.g))a" +
+    "=b;else{for(b=[b];\"|\"==a.g.next();)U(a,\"Missing next union locatio" +
+    "n path.\"),b.push(Tb(a));a.g.g--;a=new Lb(b)}return a};function Wb(" +
+    "a,b){if(!a.length)throw Error(\"Empty XPath expression.\");a=Oa(a);i" +
+    "f(Ra(a))throw Error(\"Invalid XPath expression.\");b?\"function\"!==ty" +
+    "peof b&&(b=ea(b.lookupNamespaceURI,b)):b=function(){return null};v" +
+    "ar c=Nb(new Mb(a,b));if(!Ra(a))throw Error(\"Bad token: \"+a.next())" +
+    ";this.evaluate=function(d,e){d=c.g(new D(d));return new V(d,e)}}\nf" +
+    "unction V(a,b){if(0==b)if(a instanceof H)b=4;else if(\"string\"==typ" +
+    "eof a)b=2;else if(\"number\"==typeof a)b=1;else if(\"boolean\"==typeof" +
+    " a)b=3;else throw Error(\"Unexpected evaluation result.\");if(2!=b&&" +
+    "1!=b&&3!=b&&!(a instanceof H))throw Error(\"value could not be conv" +
+    "erted to the specified type\");this.resultType=b;switch(b){case 2:t" +
+    "his.stringValue=a instanceof H?Za(a):\"\"+a;break;case 1:this.number" +
+    "Value=a instanceof H?+Za(a):+a;break;case 3:this.booleanValue=a in" +
+    "stanceof H?0<a.h:!!a;break;case 4:case 5:case 6:case 7:var c=\nJ(a)" +
+    ";var d=[];for(var e=c.next();e;e=c.next())d.push(e);this.snapshotL" +
+    "ength=a.h;this.invalidIteratorState=!1;break;case 8:case 9:this.si" +
+    "ngleNodeValue=Ya(a);break;default:throw Error(\"Unknown XPathResult" +
+    " type.\");}var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw " +
+    "Error(\"iterateNext called with wrong result type\");return f>=d.len" +
+    "gth?null:d[f++]};this.snapshotItem=function(g){if(6!=b&&7!=b)throw" +
+    " Error(\"snapshotItem called with wrong result type\");return g>=d.l" +
+    "ength||0>g?null:d[g]}}V.ANY_TYPE=0;\nV.NUMBER_TYPE=1;V.STRING_TYPE=" +
+    "2;V.BOOLEAN_TYPE=3;V.UNORDERED_NODE_ITERATOR_TYPE=4;V.ORDERED_NODE" +
+    "_ITERATOR_TYPE=5;V.UNORDERED_NODE_SNAPSHOT_TYPE=6;V.ORDERED_NODE_S" +
+    "NAPSHOT_TYPE=7;V.ANY_UNORDERED_NODE_TYPE=8;V.FIRST_ORDERED_NODE_TY" +
+    "PE=9;function Xb(a){this.lookupNamespaceURI=bb(a)}\nfunction Yb(a,b" +
+    "){a=a||aa;var c=a.document;if(!c.evaluate||b)a.XPathResult=V,c.eva" +
+    "luate=function(d,e,f,g){return(new Wb(d,f)).evaluate(e,g)},c.creat" +
+    "eExpression=function(d,e){return new Wb(d,e)},c.createNSResolver=f" +
+    "unction(d){return new Xb(d)}}ba(\"wgxpath.install\",Yb);var W={};W.J" +
+    "=function(){var a={Y:\"http://www.w3.org/2000/svg\"};return function" +
+    "(b){return a[b]||null}}();\nW.v=function(a,b,c){var d=z(a);if(!d.do" +
+    "cumentElement)return null;Yb(d?d.parentWindow||d.defaultView:windo" +
+    "w);try{for(var e=d.createNSResolver?d.createNSResolver(d.documentE" +
+    "lement):W.J,f={},g=d.getElementsByTagName(\"*\"),h=0;h<g.length;++h)" +
+    "{var p=g[h],q=p.namespaceURI;if(q&&!f[q]){var m=p.lookupPrefix(q);" +
+    "if(!m){var y=q.match(\".*/(\\\\w+)/?$\");m=y?y[1]:\"xhtml\"}f[q]=m}}var " +
+    "L={},T;for(T in f)L[f[T]]=T;e=function(l){return L[l]||null};try{r" +
+    "eturn d.evaluate(b,a,e,c,null)}catch(l){if(\"TypeError\"===l.name)re" +
+    "turn e=\nd.createNSResolver?d.createNSResolver(d.documentElement):W" +
+    ".J,d.evaluate(b,a,e,c,null);throw l;}}catch(l){throw new B(32,\"Una" +
+    "ble to locate an element with the xpath expression \"+b+\" because o" +
+    "f the following error:\\n\"+l);}};W.K=function(a,b){if(!a||1!=a.node" +
+    "Type)throw new B(32,'The result of the xpath expression \"'+b+'\" is" +
+    ": '+a+\". It should be an element.\");};\nW.A=function(a,b){var c=fun" +
+    "ction(){var d=W.v(b,a,9);return d?d.singleNodeValue||null:b.select" +
+    "SingleNode?(d=z(b),d.setProperty&&d.setProperty(\"SelectionLanguage" +
+    "\",\"XPath\"),b.selectSingleNode(a)):null}();null!==c&&W.K(c,a);retur" +
+    "n c};\nW.u=function(a,b){var c=function(){var d=W.v(b,a,7);if(d){fo" +
+    "r(var e=d.snapshotLength,f=[],g=0;g<e;++g)f.push(d.snapshotItem(g)" +
+    ");return f}return b.selectNodes?(d=z(b),d.setProperty&&d.setProper" +
+    "ty(\"SelectionLanguage\",\"XPath\"),b.selectNodes(a)):[]}();n(c,functi" +
+    "on(d){W.K(d,a)});return c};var Zb={aliceblue:\"#f0f8ff\",antiquewhit" +
+    "e:\"#faebd7\",aqua:\"#00ffff\",aquamarine:\"#7fffd4\",azure:\"#f0ffff\",be" +
+    "ige:\"#f5f5dc\",bisque:\"#ffe4c4\",black:\"#000000\",blanchedalmond:\"#ff" +
+    "ebcd\",blue:\"#0000ff\",blueviolet:\"#8a2be2\",brown:\"#a52a2a\",burlywoo" +
+    "d:\"#deb887\",cadetblue:\"#5f9ea0\",chartreuse:\"#7fff00\",chocolate:\"#d" +
+    "2691e\",coral:\"#ff7f50\",cornflowerblue:\"#6495ed\",cornsilk:\"#fff8dc\"" +
+    ",crimson:\"#dc143c\",cyan:\"#00ffff\",darkblue:\"#00008b\",darkcyan:\"#00" +
+    "8b8b\",darkgoldenrod:\"#b8860b\",darkgray:\"#a9a9a9\",darkgreen:\"#00640" +
+    "0\",\ndarkgrey:\"#a9a9a9\",darkkhaki:\"#bdb76b\",darkmagenta:\"#8b008b\",d" +
+    "arkolivegreen:\"#556b2f\",darkorange:\"#ff8c00\",darkorchid:\"#9932cc\"," +
+    "darkred:\"#8b0000\",darksalmon:\"#e9967a\",darkseagreen:\"#8fbc8f\",dark" +
+    "slateblue:\"#483d8b\",darkslategray:\"#2f4f4f\",darkslategrey:\"#2f4f4f" +
+    "\",darkturquoise:\"#00ced1\",darkviolet:\"#9400d3\",deeppink:\"#ff1493\"," +
+    "deepskyblue:\"#00bfff\",dimgray:\"#696969\",dimgrey:\"#696969\",dodgerbl" +
+    "ue:\"#1e90ff\",firebrick:\"#b22222\",floralwhite:\"#fffaf0\",forestgreen" +
+    ":\"#228b22\",fuchsia:\"#ff00ff\",gainsboro:\"#dcdcdc\",\nghostwhite:\"#f8f" +
+    "8ff\",gold:\"#ffd700\",goldenrod:\"#daa520\",gray:\"#808080\",green:\"#008" +
+    "000\",greenyellow:\"#adff2f\",grey:\"#808080\",honeydew:\"#f0fff0\",hotpi" +
+    "nk:\"#ff69b4\",indianred:\"#cd5c5c\",indigo:\"#4b0082\",ivory:\"#fffff0\"," +
+    "khaki:\"#f0e68c\",lavender:\"#e6e6fa\",lavenderblush:\"#fff0f5\",lawngre" +
+    "en:\"#7cfc00\",lemonchiffon:\"#fffacd\",lightblue:\"#add8e6\",lightcoral" +
+    ":\"#f08080\",lightcyan:\"#e0ffff\",lightgoldenrodyellow:\"#fafad2\",ligh" +
+    "tgray:\"#d3d3d3\",lightgreen:\"#90ee90\",lightgrey:\"#d3d3d3\",lightpink" +
+    ":\"#ffb6c1\",lightsalmon:\"#ffa07a\",\nlightseagreen:\"#20b2aa\",lightsky" +
+    "blue:\"#87cefa\",lightslategray:\"#778899\",lightslategrey:\"#778899\",l" +
+    "ightsteelblue:\"#b0c4de\",lightyellow:\"#ffffe0\",lime:\"#00ff00\",limeg" +
+    "reen:\"#32cd32\",linen:\"#faf0e6\",magenta:\"#ff00ff\",maroon:\"#800000\"," +
+    "mediumaquamarine:\"#66cdaa\",mediumblue:\"#0000cd\",mediumorchid:\"#ba5" +
+    "5d3\",mediumpurple:\"#9370db\",mediumseagreen:\"#3cb371\",mediumslatebl" +
+    "ue:\"#7b68ee\",mediumspringgreen:\"#00fa9a\",mediumturquoise:\"#48d1cc\"" +
+    ",mediumvioletred:\"#c71585\",midnightblue:\"#191970\",mintcream:\"#f5ff" +
+    "fa\",mistyrose:\"#ffe4e1\",\nmoccasin:\"#ffe4b5\",navajowhite:\"#ffdead\"," +
+    "navy:\"#000080\",oldlace:\"#fdf5e6\",olive:\"#808000\",olivedrab:\"#6b8e2" +
+    "3\",orange:\"#ffa500\",orangered:\"#ff4500\",orchid:\"#da70d6\",palegolde" +
+    "nrod:\"#eee8aa\",palegreen:\"#98fb98\",paleturquoise:\"#afeeee\",palevio" +
+    "letred:\"#db7093\",papayawhip:\"#ffefd5\",peachpuff:\"#ffdab9\",peru:\"#c" +
+    "d853f\",pink:\"#ffc0cb\",plum:\"#dda0dd\",powderblue:\"#b0e0e6\",purple:\"" +
+    "#800080\",red:\"#ff0000\",rosybrown:\"#bc8f8f\",royalblue:\"#4169e1\",sad" +
+    "dlebrown:\"#8b4513\",salmon:\"#fa8072\",sandybrown:\"#f4a460\",seagreen:" +
+    "\"#2e8b57\",\nseashell:\"#fff5ee\",sienna:\"#a0522d\",silver:\"#c0c0c0\",sk" +
+    "yblue:\"#87ceeb\",slateblue:\"#6a5acd\",slategray:\"#708090\",slategrey:" +
+    "\"#708090\",snow:\"#fffafa\",springgreen:\"#00ff7f\",steelblue:\"#4682b4\"" +
+    ",tan:\"#d2b48c\",teal:\"#008080\",thistle:\"#d8bfd8\",tomato:\"#ff6347\",t" +
+    "urquoise:\"#40e0d0\",violet:\"#ee82ee\",wheat:\"#f5deb3\",white:\"#ffffff" +
+    "\",whitesmoke:\"#f5f5f5\",yellow:\"#ffff00\",yellowgreen:\"#9acd32\"};var" +
+    " $b=\"backgroundColor borderTopColor borderRightColor borderBottomC" +
+    "olor borderLeftColor color outlineColor\".split(\" \"),ac=/#([0-9a-fA" +
+    "-F])([0-9a-fA-F])([0-9a-fA-F])/,bc=/^#(?:[0-9a-f]{3}){1,2}$/i,cc=/" +
+    "^(?:rgba)?\\((\\d{1,3}),\\s?(\\d{1,3}),\\s?(\\d{1,3}),\\s?(0|1|0\\.\\d*)\\)$" +
+    "/i,dc=/^(?:rgb)?\\((0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2}),\\s?(0|[1-9]" +
+    "\\d{0,2})\\)$/i;function ec(a,b){b=b.toLowerCase();return\"style\"==b?" +
+    "fc(a.style.cssText):(a=a.getAttributeNode(b))&&a.specified?a.value" +
+    ":null}var gc=RegExp(\"[;]+(?=(?:(?:[^\\\"]*\\\"){2})*[^\\\"]*$)(?=(?:(?:[" +
+    "^']*'){2})*[^']*$)(?=(?:[^()]*\\\\([^()]*\\\\))*[^()]*$)\");function fc" +
+    "(a){var b=[];n(a.split(gc),function(c){var d=c.indexOf(\":\");0<d&&(" +
+    "c=[c.slice(0,d),c.slice(d+1)],2==c.length&&b.push(c[0].toLowerCase" +
+    "(),\":\",c[1],\";\"))});b=b.join(\"\");return b=\";\"==b.charAt(b.length-1" +
+    ")?b:b+\";\"}\nfunction X(a,b){b&&\"string\"!==typeof b&&(b=b.toString()" +
+    ");return!!a&&1==a.nodeType&&(!b||a.tagName.toUpperCase()==b)};func" +
+    "tion hc(a){for(a=a.parentNode;a&&1!=a.nodeType&&9!=a.nodeType&&11!" +
+    "=a.nodeType;)a=a.parentNode;return X(a)?a:null}\nfunction Y(a,b){b=" +
+    "wa(b);if(\"float\"==b||\"cssFloat\"==b||\"styleFloat\"==b)b=\"cssFloat\";a" +
+    ":{var c=b;var d=z(a);if(d.defaultView&&d.defaultView.getComputedSt" +
+    "yle&&(d=d.defaultView.getComputedStyle(a,null))){c=d[c]||d.getProp" +
+    "ertyValue(c)||\"\";break a}c=\"\"}a=c||ic(a,b);if(null===a)a=null;else" +
+    " if(0<=ma($b,b)){b:{var e=a.match(cc);if(e&&(b=Number(e[1]),c=Numb" +
+    "er(e[2]),d=Number(e[3]),e=Number(e[4]),0<=b&&255>=b&&0<=c&&255>=c&" +
+    "&0<=d&&255>=d&&0<=e&&1>=e)){b=[b,c,d,e];break b}b=null}if(!b)b:{if" +
+    "(d=a.match(dc))if(b=Number(d[1]),\nc=Number(d[2]),d=Number(d[3]),0<" +
+    "=b&&255>=b&&0<=c&&255>=c&&0<=d&&255>=d){b=[b,c,d,1];break b}b=null" +
+    "}if(!b)b:{b=a.toLowerCase();c=Zb[b.toLowerCase()];if(!c&&(c=\"#\"==b" +
+    ".charAt(0)?b:\"#\"+b,4==c.length&&(c=c.replace(ac,\"#$1$1$2$2$3$3\"))," +
+    "!bc.test(c))){b=null;break b}b=[parseInt(c.substr(1,2),16),parseIn" +
+    "t(c.substr(3,2),16),parseInt(c.substr(5,2),16),1]}a=b?\"rgba(\"+b.jo" +
+    "in(\", \")+\")\":a}return a}\nfunction ic(a,b){var c=a.currentStyle||a." +
+    "style,d=c[b];void 0===d&&\"function\"===typeof c.getPropertyValue&&(" +
+    "d=c.getPropertyValue(b));return\"inherit\"!=d?void 0!==d?d:null:(a=h" +
+    "c(a))?ic(a,b):null}\nfunction jc(a,b,c){function d(g){var h=kc(g);r" +
+    "eturn 0<h.height&&0<h.width?!0:X(g,\"PATH\")&&(0<h.height||0<h.width" +
+    ")?(g=Y(g,\"stroke-width\"),!!g&&0<parseInt(g,10)):\"hidden\"!=Y(g,\"ove" +
+    "rflow\")&&oa(g.childNodes,function(p){return 3==p.nodeType||X(p)&&d" +
+    "(p)})}function e(g){return\"hidden\"==lc(g)&&pa(g.childNodes,functio" +
+    "n(h){return!X(h)||e(h)||!d(h)})}if(!X(a))throw Error(\"Argument to " +
+    "isShown must be of type Element\");if(X(a,\"BODY\"))return!0;if(X(a,\"" +
+    "OPTION\")||X(a,\"OPTGROUP\"))return a=Ea(a,function(g){return X(g,\n\"S" +
+    "ELECT\")}),!!a&&jc(a,!0,c);var f=mc(a);if(f)return!!f.image&&0<f.re" +
+    "ct.width&&0<f.rect.height&&jc(f.image,b,c);if(X(a,\"INPUT\")&&\"hidde" +
+    "n\"==a.type.toLowerCase()||X(a,\"NOSCRIPT\"))return!1;f=Y(a,\"visibili" +
+    "ty\");return\"collapse\"!=f&&\"hidden\"!=f&&c(a)&&(b||0!=nc(a))&&d(a)?!" +
+    "e(a):!1}\nfunction oc(a){function b(c){if(X(c)&&\"none\"==Y(c,\"displa" +
+    "y\"))return!1;var d;(d=c.parentNode)&&d.shadowRoot&&void 0!==c.assi" +
+    "gnedSlot?d=c.assignedSlot?c.assignedSlot.parentNode:null:c.getDest" +
+    "inationInsertionPoints&&(c=c.getDestinationInsertionPoints(),0<c.l" +
+    "ength&&(d=c[c.length-1]));return!d||9!=d.nodeType&&11!=d.nodeType?" +
+    "!!d&&b(d):!0}return jc(a,!1,b)}\nfunction lc(a){function b(l){funct" +
+    "ion r($a){return $a==g?!0:0==Y($a,\"display\").lastIndexOf(\"inline\"," +
+    "0)||\"absolute\"==Jb&&\"static\"==Y($a,\"position\")?!1:!0}var Jb=Y(l,\"p" +
+    "osition\");if(\"fixed\"==Jb)return q=!0,l==g?null:g;for(l=hc(l);l&&!r" +
+    "(l);)l=hc(l);return l}function c(l){var r=l;if(\"visible\"==p)if(l==" +
+    "g&&h)r=h;else if(l==h)return{x:\"visible\",y:\"visible\"};r={x:Y(r,\"ov" +
+    "erflow-x\"),y:Y(r,\"overflow-y\")};l==g&&(r.x=\"visible\"==r.x?\"auto\":r" +
+    ".x,r.y=\"visible\"==r.y?\"auto\":r.y);return r}function d(l){if(l==g){" +
+    "var r=\n(new xa(f)).g;l=r.scrollingElement?r.scrollingElement:r.bod" +
+    "y||r.documentElement;r=r.parentWindow||r.defaultView;l=new v(r.pag" +
+    "eXOffset||l.scrollLeft,r.pageYOffset||l.scrollTop)}else l=new v(l." +
+    "scrollLeft,l.scrollTop);return l}var e=pc(a),f=z(a),g=f.documentEl" +
+    "ement,h=f.body,p=Y(g,\"overflow\"),q;for(a=b(a);a;a=b(a)){var m=c(a)" +
+    ";if(\"visible\"!=m.x||\"visible\"!=m.y){var y=kc(a);if(0==y.width||0==" +
+    "y.height)return\"hidden\";var L=e.g<y.left,T=e.h<y.top;if(L&&\"hidden" +
+    "\"==m.x||T&&\"hidden\"==m.y)return\"hidden\";if(L&&\n\"visible\"!=m.x||T&&" +
+    "\"visible\"!=m.y){L=d(a);T=e.h<y.top-L.y;if(e.g<y.left-L.x&&\"visible" +
+    "\"!=m.x||T&&\"visible\"!=m.x)return\"hidden\";e=lc(a);return\"hidden\"==e" +
+    "?\"hidden\":\"scroll\"}L=e.left>=y.left+y.width;y=e.top>=y.top+y.heigh" +
+    "t;if(L&&\"hidden\"==m.x||y&&\"hidden\"==m.y)return\"hidden\";if(L&&\"visi" +
+    "ble\"!=m.x||y&&\"visible\"!=m.y){if(q&&(m=d(a),e.left>=g.scrollWidth-" +
+    "m.x||e.g>=g.scrollHeight-m.y))return\"hidden\";e=lc(a);return\"hidden" +
+    "\"==e?\"hidden\":\"scroll\"}}}return\"none\"}\nfunction kc(a){var b=mc(a);" +
+    "if(b)return b.rect;if(X(a,\"HTML\"))return a=z(a),a=((a?a.parentWind" +
+    "ow||a.defaultView:window)||window).document,a=\"CSS1Compat\"==a.comp" +
+    "atMode?a.documentElement:a.body,a=new w(a.clientWidth,a.clientHeig" +
+    "ht),new C(0,0,a.width,a.height);try{var c=a.getBoundingClientRect(" +
+    ")}catch(d){return new C(0,0,0,0)}return new C(c.left,c.top,c.right" +
+    "-c.left,c.bottom-c.top)}\nfunction mc(a){var b=X(a,\"MAP\");if(!b&&!X" +
+    "(a,\"AREA\"))return null;var c=b?a:X(a.parentNode,\"MAP\")?a.parentNod" +
+    "e:null,d=null,e=null;c&&c.name&&(d=z(c),d=W.A('/descendant::*[@use" +
+    "map = \"#'+c.name+'\"]',d))&&(e=kc(d),b||\"default\"==a.shape.toLowerC" +
+    "ase()||(a=qc(a),b=Math.min(Math.max(a.left,0),e.width),c=Math.min(" +
+    "Math.max(a.top,0),e.height),e=new C(b+e.left,c+e.top,Math.min(a.wi" +
+    "dth,e.width-b),Math.min(a.height,e.height-c))));return{image:d,rec" +
+    "t:e||new C(0,0,0,0)}}\nfunction qc(a){var b=a.shape.toLowerCase();a" +
+    "=a.coords.split(\",\");if(\"rect\"==b&&4==a.length){b=a[0];var c=a[1];" +
+    "return new C(b,c,a[2]-b,a[3]-c)}if(\"circle\"==b&&3==a.length)return" +
+    " b=a[2],new C(a[0]-b,a[1]-b,2*b,2*b);if(\"poly\"==b&&2<a.length){b=a" +
+    "[0];c=a[1];for(var d=b,e=c,f=2;f+1<a.length;f+=2)b=Math.min(b,a[f]" +
+    "),d=Math.max(d,a[f]),c=Math.min(c,a[f+1]),e=Math.max(e,a[f+1]);ret" +
+    "urn new C(b,c,d-b,e-c)}return new C(0,0,0,0)}function pc(a){a=kc(a" +
+    ");return new Ma(a.top,a.left+a.width,a.top+a.height,a.left)}\nfunct" +
+    "ion rc(a){return a.replace(/^[^\\S\\xa0]+|[^\\S\\xa0]+$/g,\"\")}function" +
+    " sc(a){var b=[];tc(a,b);a=b.length;var c=Array(a);b=\"string\"===typ" +
+    "eof b?b.split(\"\"):b;for(var d=0;d<a;d++)d in b&&(c[d]=rc.call(void" +
+    " 0,b[d]));return rc(c.join(\"\\n\")).replace(/\\xa0/g,\" \")}\nfunction u" +
+    "c(a,b,c){if(X(a,\"BR\"))b.push(\"\");else{var d=X(a,\"TD\"),e=Y(a,\"displ" +
+    "ay\"),f=!d&&!(0<=ma(vc,e)),g=void 0!==a.previousElementSibling?a.pr" +
+    "eviousElementSibling:za(a.previousSibling);g=g?Y(g,\"display\"):\"\";v" +
+    "ar h=Y(a,\"float\")||Y(a,\"cssFloat\")||Y(a,\"styleFloat\");!f||\"run-in\"" +
+    "==g&&\"none\"==h||/^[\\s\\xa0]*$/.test(b[b.length-1]||\"\")||b.push(\"\");" +
+    "var p=oc(a),q=null,m=null;p&&(q=Y(a,\"white-space\"),m=Y(a,\"text-tra" +
+    "nsform\"));n(a.childNodes,function(y){c(y,b,p,q,m)});a=b[b.length-1" +
+    "]||\"\";!d&&\"table-cell\"!=e||!a||\nta(a)||(b[b.length-1]+=\" \");f&&\"ru" +
+    "n-in\"!=e&&!/^[\\s\\xa0]*$/.test(a)&&b.push(\"\")}}function tc(a,b){uc(" +
+    "a,b,function(c,d,e,f,g){3==c.nodeType&&e?wc(c,d,f,g):X(c)&&tc(c,d)" +
+    "})}var vc=\"inline inline-block inline-table none table-cell table-" +
+    "column table-column-group\".split(\" \");\nfunction wc(a,b,c,d){a=a.no" +
+    "deValue.replace(/[\\u200b\\u200e\\u200f]/g,\"\");a=a.replace(/(\\r\\n|\\r|" +
+    "\\n)/g,\"\\n\");if(\"normal\"==c||\"nowrap\"==c)a=a.replace(/\\n/g,\" \");a=\"" +
+    "pre\"==c||\"pre-wrap\"==c?a.replace(/[ \\f\\t\\v\\u2028\\u2029]/g,\"\\u00a0\"" +
+    "):a.replace(/[ \\f\\t\\v\\u2028\\u2029]+/g,\" \");\"capitalize\"==d?a=a.rep" +
+    "lace(/(^|\\s)(\\S)/g,function(e,f,g){return f+g.toUpperCase()}):\"upp" +
+    "ercase\"==d?a=a.toUpperCase():\"lowercase\"==d&&(a=a.toLowerCase());c" +
+    "=b.pop()||\"\";ta(c)&&0==a.lastIndexOf(\" \",0)&&(a=a.substr(1));b.pus" +
+    "h(c+a)}\nfunction nc(a){var b=1,c=Y(a,\"opacity\");c&&(b=Number(c));(" +
+    "a=hc(a))&&(b*=nc(a));return b};var xc={F:function(a,b){return!(!a." +
+    "querySelectorAll||!a.querySelector)&&!/^\\d.*/.test(b)},A:function(" +
+    "a,b){var c=x(b),d=ya(c.g,a);return d?ec(d,\"id\")==a&&b!=d&&Aa(b,d)?" +
+    "d:qa(A(c,\"*\"),function(e){return ec(e,\"id\")==a&&b!=e&&Aa(b,e)}):nu" +
+    "ll},u:function(a,b){if(!a)return[];if(xc.F(b,a))try{return b.query" +
+    "SelectorAll(\"#\"+xc.P(a))}catch(c){return[]}b=A(x(b),\"*\",null,b);re" +
+    "turn na(b,function(c){return ec(c,\"id\")==a})},P:function(a){return" +
+    " a.replace(/([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])/g,\"\\\\$1\")" +
+    "}};var Z={},yc={};Z.O=function(a,b,c){try{var d=La.u(\"a\",b)}catch(" +
+    "e){d=A(x(b),\"A\",null,b)}return qa(d,function(e){e=sc(e);e=e.replac" +
+    "e(/^[\\s]+|[\\s]+$/g,\"\");return c&&-1!=e.indexOf(a)||e==a})};Z.L=fun" +
+    "ction(a,b,c){try{var d=La.u(\"a\",b)}catch(e){d=A(x(b),\"A\",null,b)}r" +
+    "eturn na(d,function(e){e=sc(e);e=e.replace(/^[\\s]+|[\\s]+$/g,\"\");re" +
+    "turn c&&-1!=e.indexOf(a)||e==a})};Z.A=function(a,b){return Z.O(a,b" +
+    ",!1)};Z.u=function(a,b){return Z.L(a,b,!1)};yc.A=function(a,b){ret" +
+    "urn Z.O(a,b,!0)};\nyc.u=function(a,b){return Z.L(a,b,!0)};var zc={A" +
+    ":function(a,b){if(\"\"===a)throw new B(32,'Unable to locate an eleme" +
+    "nt with the tagName \"\"');return b.getElementsByTagName(a)[0]||null" +
+    "},u:function(a,b){if(\"\"===a)throw new B(32,'Unable to locate an el" +
+    "ement with the tagName \"\"');return b.getElementsByTagName(a)}};var" +
+    " Ac={className:Ga,\"class name\":Ga,css:La,\"css selector\":La,id:xc,l" +
+    "inkText:Z,\"link text\":Z,name:{A:function(a,b){b=A(x(b),\"*\",null,b)" +
+    ";return qa(b,function(c){return ec(c,\"name\")==a})},u:function(a,b)" +
+    "{b=A(x(b),\"*\",null,b);return na(b,function(c){return ec(c,\"name\")=" +
+    "=a})}},partialLinkText:yc,\"partial link text\":yc,tagName:zc,\"tag n" +
+    "ame\":zc,xpath:W};ba(\"_\",function(a,b){a:{for(c in a)if(a.hasOwnPro" +
+    "perty(c))break a;var c=null}if(c){var d=Ac[c];if(d&&\"function\"===t" +
+    "ypeof d.u)return d.u(a[c],b||ha.document)}throw new B(61,\"Unsuppor" +
+    "ted locator strategy: \"+c);});;return this._.apply(null,arguments)" +
+    ";}).apply({navigator:typeof window!=\"undefined\"?window.navigator:n" +
+    "ull},arguments);}\n"
+  )
+  .toString();
+  static final String FIND_ELEMENTS_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String FIND_ELEMENTS_ANDROID_original() {
+    return FIND_ELEMENTS_ANDROID.replaceAll("xxx_rpl_lic", FIND_ELEMENTS_ANDROID_license);
+  }
+
+/* field: SCROLL_INTO_VIEW_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String SCROLL_INTO_VIEW_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar h;function aa(a" +
+    "){var b=0;return function(){return b<a.length?{done:!1,value:a[b++" +
+    "]}:{done:!0}}}var ba=\"function\"==typeof Object.defineProperties?Ob" +
+    "ject.defineProperty:function(a,b,c){if(a==Array.prototype||a==Obje" +
+    "ct.prototype)return a;a[b]=c.value;return a};\nfunction ca(a){a=[\"o" +
+    "bject\"==typeof globalThis&&globalThis,a,\"object\"==typeof window&&w" +
+    "indow,\"object\"==typeof self&&self,\"object\"==typeof global&&global]" +
+    ";for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return " +
+    "c}throw Error(\"Cannot find global object\");}var da=ca(this);functi" +
+    "on ea(a,b){if(b)a:{var c=da;a=a.split(\".\");for(var d=0;d<a.length-" +
+    "1;d++){var e=a[d];if(!(e in c))break a;c=c[e]}a=a[a.length-1];d=c[" +
+    "a];b=b(d);b!=d&&null!=b&&ba(c,a,{configurable:!0,writable:!0,value" +
+    ":b})}}\nea(\"Symbol\",function(a){function b(f){if(this instanceof b)" +
+    "throw new TypeError(\"Symbol is not a constructor\");return new c(d+" +
+    "(f||\"\")+\"_\"+e++,f)}function c(f,g){this.g=f;ba(this,\"description\"," +
+    "{configurable:!0,writable:!0,value:g})}if(a)return a;c.prototype.t" +
+    "oString=function(){return this.g};var d=\"jscomp_symbol_\"+(1E9*Math" +
+    ".random()>>>0)+\"_\",e=0;return b});\nea(\"Symbol.iterator\",function(a" +
+    "){if(a)return a;a=Symbol(\"Symbol.iterator\");for(var b=\"Array Int8A" +
+    "rray Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Arra" +
+    "y Uint32Array Float32Array Float64Array\".split(\" \"),c=0;c<b.length" +
+    ";c++){var d=da[b[c]];\"function\"===typeof d&&\"function\"!=typeof d.p" +
+    "rototype[a]&&ba(d.prototype,a,{configurable:!0,writable:!0,value:f" +
+    "unction(){return fa(aa(this))}})}return a});function fa(a){a={next" +
+    ":a};a[Symbol.iterator]=function(){return this};return a}\nvar ha=\"f" +
+    "unction\"==typeof Object.create?Object.create:function(a){function " +
+    "b(){}b.prototype=a;return new b},ia;if(\"function\"==typeof Object.s" +
+    "etPrototypeOf)ia=Object.setPrototypeOf;else{var ja;a:{var ka={a:!0" +
+    "},la={};try{la.__proto__=ka;ja=la.a;break a}catch(a){}ja=!1}ia=ja?" +
+    "function(a,b){a.__proto__=b;if(a.__proto__!==b)throw new TypeError" +
+    "(a+\" is not extensible\");return a}:null}var ma=ia;\nfunction na(a,b" +
+    "){a.prototype=ha(b.prototype);a.prototype.constructor=a;if(ma)ma(a" +
+    ",b);else for(var c in b)if(\"prototype\"!=c)if(Object.defineProperti" +
+    "es){var d=Object.getOwnPropertyDescriptor(b,c);d&&Object.definePro" +
+    "perty(a,c,d)}else a[c]=b[c];a.T=b.prototype}function oa(a,b){a ins" +
+    "tanceof String&&(a+=\"\");var c=0,d=!1,e={next:function(){if(!d&&c<a" +
+    ".length){var f=c++;return{value:b(f,a[f]),done:!1}}d=!0;return{don" +
+    "e:!0,value:void 0}}};e[Symbol.iterator]=function(){return e};retur" +
+    "n e}\nea(\"Array.prototype.keys\",function(a){return a?a:function(){r" +
+    "eturn oa(this,function(b){return b})}});ea(\"Array.from\",function(a" +
+    "){return a?a:function(b,c,d){c=null!=c?c:function(k){return k};var" +
+    " e=[],f=\"undefined\"!=typeof Symbol&&Symbol.iterator&&b[Symbol.iter" +
+    "ator];if(\"function\"==typeof f){b=f.call(b);for(var g=0;!(f=b.next(" +
+    ")).done;)e.push(c.call(d,f.value,g++))}else for(f=b.length,g=0;g<f" +
+    ";g++)e.push(c.call(d,b[g],g));return e}});var l=this||self;\nfuncti" +
+    "on pa(a,b){a=a.split(\".\");var c=l;a[0]in c||\"undefined\"==typeof c." +
+    "execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d=a.shi" +
+    "ft());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]?c=c[d" +
+    "]:c=c[d]={}:c[d]=b}function qa(a,b,c){return a.call.apply(a.bind,a" +
+    "rguments)}\nfunction ra(a,b,c){if(!a)throw Error();if(2<arguments.l" +
+    "ength){var d=Array.prototype.slice.call(arguments,2);return functi" +
+    "on(){var e=Array.prototype.slice.call(arguments);Array.prototype.u" +
+    "nshift.apply(e,d);return a.apply(b,e)}}return function(){return a." +
+    "apply(b,arguments)}}function sa(a,b,c){Function.prototype.bind&&-1" +
+    "!=Function.prototype.bind.toString().indexOf(\"native code\")?sa=qa:" +
+    "sa=ra;return sa.apply(null,arguments)}\nfunction ta(a,b){var c=Arra" +
+    "y.prototype.slice.call(arguments,1);return function(){var d=c.slic" +
+    "e();d.push.apply(d,arguments);return a.apply(this,d)}}function m(a" +
+    ",b){function c(){}c.prototype=b.prototype;a.T=b.prototype;a.protot" +
+    "ype=new c;a.prototype.constructor=a;a.V=function(d,e,f){for(var g=" +
+    "Array(arguments.length-2),k=2;k<arguments.length;k++)g[k-2]=argume" +
+    "nts[k];return b.prototype[e].apply(d,g)}};function ua(a,b){if(Erro" +
+    "r.captureStackTrace)Error.captureStackTrace(this,ua);else{var c=Er" +
+    "ror().stack;c&&(this.stack=c)}a&&(this.message=String(a));void 0!=" +
+    "=b&&(this.cause=b)}m(ua,Error);ua.prototype.name=\"CustomError\";fun" +
+    "ction va(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length-1,e=0;e<d;e+" +
+    "+)c+=a[e]+(e<b.length?b[e]:\"%s\");ua.call(this,c+a[d])}m(va,ua);va." +
+    "prototype.name=\"AssertionError\";function wa(a,b,c){if(!a){var d=\"A" +
+    "ssertion failed\";if(b){d+=\": \"+b;var e=Array.prototype.slice.call(" +
+    "arguments,2)}throw new va(\"\"+d,e||[]);}};function xa(a,b){if(\"stri" +
+    "ng\"===typeof a)return\"string\"!==typeof b||1!=b.length?-1:a.indexOf" +
+    "(b,0);for(var c=0;c<a.length;c++)if(c in a&&a[c]===b)return c;retu" +
+    "rn-1}function p(a,b){for(var c=a.length,d=\"string\"===typeof a?a.sp" +
+    "lit(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[e],e,a)}function v(a" +
+    ",b,c){var d=c;p(a,function(e,f){d=b.call(void 0,d,e,f,a)});return " +
+    "d}function ya(a,b){for(var c=a.length,d=\"string\"===typeof a?a.spli" +
+    "t(\"\"):a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a))return!0;re" +
+    "turn!1}\nfunction za(a){return Array.prototype.concat.apply([],argu" +
+    "ments)}function Aa(a,b,c){wa(null!=a.length);return 2>=arguments.l" +
+    "ength?Array.prototype.slice.call(a,b):Array.prototype.slice.call(a" +
+    ",b,c)};function Ba(a,b){this.x=void 0!==a?a:0;this.y=void 0!==b?b:" +
+    "0}h=Ba.prototype;h.toString=function(){return\"(\"+this.x+\", \"+this." +
+    "y+\")\"};h.ceil=function(){this.x=Math.ceil(this.x);this.y=Math.ceil" +
+    "(this.y);return this};h.floor=function(){this.x=Math.floor(this.x)" +
+    ";this.y=Math.floor(this.y);return this};h.round=function(){this.x=" +
+    "Math.round(this.x);this.y=Math.round(this.y);return this};h.scale=" +
+    "function(a,b){this.x*=a;this.y*=\"number\"===typeof b?b:a;return thi" +
+    "s};var Ca=String.prototype.trim?function(a){return a.trim()}:funct" +
+    "ion(a){return/^[\\s\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};function" +
+    " Da(a,b){return a<b?-1:a>b?1:0};function Ea(){var a=l.navigator;re" +
+    "turn a&&(a=a.userAgent)?a:\"\"};var Fa=-1!=Ea().indexOf(\"Macintosh\")" +
+    ",Ga=-1!=Ea().indexOf(\"Windows\");function Ha(a,b){this.width=a;this" +
+    ".height=b}h=Ha.prototype;h.toString=function(){return\"(\"+this.widt" +
+    "h+\" x \"+this.height+\")\"};h.aspectRatio=function(){return this.widt" +
+    "h/this.height};h.ceil=function(){this.width=Math.ceil(this.width);" +
+    "this.height=Math.ceil(this.height);return this};h.floor=function()" +
+    "{this.width=Math.floor(this.width);this.height=Math.floor(this.hei" +
+    "ght);return this};h.round=function(){this.width=Math.round(this.wi" +
+    "dth);this.height=Math.round(this.height);return this};\nh.scale=fun" +
+    "ction(a,b){this.width*=a;this.height*=\"number\"===typeof b?b:a;retu" +
+    "rn this};function Ia(a){return String(a).replace(/\\-([a-z])/g,func" +
+    "tion(b,c){return c.toUpperCase()})};function Ja(a,b){if(!a||!b)ret" +
+    "urn!1;if(a.contains&&1==b.nodeType)return a==b||a.contains(b);if(\"" +
+    "undefined\"!=typeof a.compareDocumentPosition)return a==b||!!(a.com" +
+    "pareDocumentPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;return b=" +
+    "=a}\nfunction Ka(a,b){if(a==b)return 0;if(a.compareDocumentPosition" +
+    ")return a.compareDocumentPosition(b)&2?1:-1;if(\"sourceIndex\"in a||" +
+    "a.parentNode&&\"sourceIndex\"in a.parentNode){var c=1==a.nodeType,d=" +
+    "1==b.nodeType;if(c&&d)return a.sourceIndex-b.sourceIndex;var e=a.p" +
+    "arentNode,f=b.parentNode;return e==f?La(a,b):!c&&Ja(e,b)?-1*Ma(a,b" +
+    "):!d&&Ja(f,a)?Ma(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.sourceI" +
+    "ndex:f.sourceIndex)}d=w(a);c=d.createRange();c.selectNode(a);c.col" +
+    "lapse(!0);a=d.createRange();a.selectNode(b);\na.collapse(!0);return" +
+    " c.compareBoundaryPoints(l.Range.START_TO_END,a)}function Ma(a,b){" +
+    "var c=a.parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=b.pare" +
+    "ntNode;return La(b,a)}function La(a,b){for(;b=b.previousSibling;)i" +
+    "f(b==a)return-1;return 1}function w(a){wa(a,\"Node cannot be null o" +
+    "r undefined.\");return 9==a.nodeType?a:a.ownerDocument||a.document}" +
+    "function Na(a){this.g=a||l.document||document}Na.prototype.getElem" +
+    "entsByTagName=function(a,b){return(b||this.g).getElementsByTagName" +
+    "(String(a))};function Oa(a,b,c,d){this.top=a;this.g=b;this.h=c;thi" +
+    "s.left=d}h=Oa.prototype;h.toString=function(){return\"(\"+this.top+\"" +
+    "t, \"+this.g+\"r, \"+this.h+\"b, \"+this.left+\"l)\"};h.ceil=function(){t" +
+    "his.top=Math.ceil(this.top);this.g=Math.ceil(this.g);this.h=Math.c" +
+    "eil(this.h);this.left=Math.ceil(this.left);return this};h.floor=fu" +
+    "nction(){this.top=Math.floor(this.top);this.g=Math.floor(this.g);t" +
+    "his.h=Math.floor(this.h);this.left=Math.floor(this.left);return th" +
+    "is};\nh.round=function(){this.top=Math.round(this.top);this.g=Math." +
+    "round(this.g);this.h=Math.round(this.h);this.left=Math.round(this." +
+    "left);return this};h.scale=function(a,b){b=\"number\"===typeof b?b:a" +
+    ";this.left*=a;this.g*=a;this.top*=b;this.h*=b;return this};functio" +
+    "n x(a,b,c,d){this.left=a;this.top=b;this.width=c;this.height=d}h=x" +
+    ".prototype;h.toString=function(){return\"(\"+this.left+\", \"+this.top" +
+    "+\" - \"+this.width+\"w x \"+this.height+\"h)\"};h.ceil=function(){this." +
+    "left=Math.ceil(this.left);this.top=Math.ceil(this.top);this.width=" +
+    "Math.ceil(this.width);this.height=Math.ceil(this.height);return th" +
+    "is};h.floor=function(){this.left=Math.floor(this.left);this.top=Ma" +
+    "th.floor(this.top);this.width=Math.floor(this.width);this.height=M" +
+    "ath.floor(this.height);return this};\nh.round=function(){this.left=" +
+    "Math.round(this.left);this.top=Math.round(this.top);this.width=Mat" +
+    "h.round(this.width);this.height=Math.round(this.height);return thi" +
+    "s};h.scale=function(a,b){b=\"number\"===typeof b?b:a;this.left*=a;th" +
+    "is.width*=a;this.top*=b;this.height*=b;return this};function Pa(a," +
+    "b){var c=w(a);return c.defaultView&&c.defaultView.getComputedStyle" +
+    "&&(a=c.defaultView.getComputedStyle(a,null))?a[b]||a.getPropertyVa" +
+    "lue(b)||\"\":\"\"};/*\n\n Copyright 2014 Software Freedom Conservancy\n\n " +
+    "Licensed under the Apache License, Version 2.0 (the \"License\");\n y" +
+    "ou may not use this file except in compliance with the License.\n Y" +
+    "ou may obtain a copy of the License at\n\n      http://www.apache.or" +
+    "g/licenses/LICENSE-2.0\n\n Unless required by applicable law or agre" +
+    "ed to in writing, software\n distributed under the License is distr" +
+    "ibuted on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF A" +
+    "NY KIND, either express or implied.\n See the License for the speci" +
+    "fic language governing permissions and\n limitations under the Lice" +
+    "nse.\n*/\nfunction Qa(a,b){this.code=a;this.g=Ra[a]||\"unknown error\"" +
+    ";this.message=b||\"\";a=this.g.replace(/((?:^|\\s+)[a-z])/g,function(" +
+    "c){return c.toUpperCase().replace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5" +
+    ";if(0>b||a.indexOf(\"Error\",b)!=b)a+=\"Error\";this.name=a;a=Error(th" +
+    "is.message);a.name=this.name;this.stack=a.stack||\"\"}m(Qa,Error);\nv" +
+    "ar Ra={15:\"element not selectable\",11:\"element not visible\",31:\"un" +
+    "known error\",30:\"unknown error\",24:\"invalid cookie domain\",29:\"inv" +
+    "alid element coordinates\",12:\"invalid element state\",32:\"invalid s" +
+    "elector\",51:\"invalid selector\",52:\"invalid selector\",17:\"javascrip" +
+    "t error\",405:\"unsupported operation\",34:\"move target out of bounds" +
+    "\",27:\"no such alert\",7:\"no such element\",8:\"no such frame\",23:\"no " +
+    "such window\",28:\"script timeout\",33:\"session not created\",10:\"stal" +
+    "e element reference\",21:\"timeout\",25:\"unable to set cookie\",\n26:\"u" +
+    "nexpected alert open\",13:\"unknown error\",9:\"unknown command\"};Qa.p" +
+    "rototype.toString=function(){return this.name+\": \"+this.message};f" +
+    "unction Sa(a){return(a=a.exec(Ea()))?a[1]:\"\"}Sa(/Android\\s+([0-9.]" +
+    "+)/)||Sa(/Version\\/([0-9.]+)/);function Ta(a){var b=0,c=Ca(String(" +
+    "Ua)).split(\".\");a=Ca(String(a)).split(\".\");for(var d=Math.max(c.le" +
+    "ngth,a.length),e=0;0==b&&e<d;e++){var f=c[e]||\"\",g=a[e]||\"\";do{f=/" +
+    "(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)|" +
+    "|[\"\",\"\",\"\",\"\"];if(0==f[0].length&&0==g[0].length)break;b=Da(0==f[1" +
+    "].length?0:parseInt(f[1],10),0==g[1].length?0:parseInt(g[1],10))||" +
+    "Da(0==f[2].length,0==g[2].length)||Da(f[2],g[2]);f=f[3];g=g[3]}whi" +
+    "le(0==b)}}var Va=/Android\\s+([0-9\\.]+)/.exec(Ea()),Ua=Va?Va[1]:\"0\"" +
+    ";Ta(2.3);\nTa(4);/*\n\n The MIT License\n\n Copyright (c) 2007 Cybozu L" +
+    "abs, Inc.\n Copyright (c) 2012 Google Inc.\n\n Permission is hereby g" +
+    "ranted, free of charge, to any person obtaining a copy\n of this so" +
+    "ftware and associated documentation files (the \"Software\"), to\n de" +
+    "al in the Software without restriction, including without limitati" +
+    "on the\n rights to use, copy, modify, merge, publish, distribute, s" +
+    "ublicense, and/or\n sell copies of the Software, and to permit pers" +
+    "ons to whom the Software is\n furnished to do so, subject to the fo" +
+    "llowing conditions:\n\n The above copyright notice and this permissi" +
+    "on notice shall be included in\n all copies or substantial portions" +
+    " of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARR" +
+    "ANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED T" +
+    "O THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PUR" +
+    "POSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRI" +
+    "GHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, " +
+    "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n FROM" +
+    ", OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DE" +
+    "ALINGS\n IN THE SOFTWARE.\n*/\nfunction y(a,b,c){this.g=a;this.j=b||1" +
+    ";this.h=c||1};function Wa(a){this.h=a;this.g=0}function Xa(a){a=a." +
+    "match(Ya);for(var b=0;b<a.length;b++)Za.test(a[b])&&a.splice(b,1);" +
+    "return new Wa(a)}var Ya=RegExp(\"\\\\$?(?:(?![0-9-])[\\\\w-]+:)?(?![0-9" +
+    "-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[^\\\"]*\\\"|'[" +
+    "^']*'|[!<>]=|\\\\s+|.\",\"g\"),Za=/^\\s/;function z(a,b){return a.h[a.g+" +
+    "(b||0)]}Wa.prototype.next=function(){return this.h[this.g++]};func" +
+    "tion $a(a){return a.h.length<=a.g};function B(a){var b=null,c=a.no" +
+    "deType;1==c&&(b=a.textContent,b=void 0==b||null==b?a.innerText:b,b" +
+    "=void 0==b||null==b?\"\":b);if(\"string\"!=typeof b)if(9==c||1==c){a=9" +
+    "==c?a.documentElement:a.firstChild;c=0;var d=[];for(b=\"\";a;){do 1!" +
+    "=a.nodeType&&(b+=a.nodeValue),d[c++]=a;while(a=a.firstChild);for(;" +
+    "c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;return\"\"+b}\nfunc" +
+    "tion C(a,b,c){if(null===b)return!0;try{if(!a.getAttribute)return!1" +
+    "}catch(d){return!1}return null==c?!!a.getAttribute(b):a.getAttribu" +
+    "te(b,2)==c}function bb(a,b,c,d,e){return cb.call(null,a,b,\"string\"" +
+    "===typeof c?c:null,\"string\"===typeof d?d:null,e||new D)}\nfunction " +
+    "cb(a,b,c,d,e){b.getElementsByName&&d&&\"name\"==c?(b=b.getElementsBy" +
+    "Name(d),p(b,function(f){a.g(f)&&e.add(f)})):b.getElementsByClassNa" +
+    "me&&d&&\"class\"==c?(b=b.getElementsByClassName(d),p(b,function(f){f" +
+    ".className==d&&a.g(f)&&e.add(f)})):a instanceof E?db(a,b,c,d,e):b." +
+    "getElementsByTagName&&(b=b.getElementsByTagName(a.j()),p(b,functio" +
+    "n(f){C(f,c,d)&&e.add(f)}));return e}function db(a,b,c,d,e){for(b=b" +
+    ".firstChild;b;b=b.nextSibling)C(b,c,d)&&a.g(b)&&e.add(b),db(a,b,c," +
+    "d,e)};function D(){this.j=this.g=null;this.h=0}function eb(a){this" +
+    ".h=a;this.next=this.g=null}function fb(a,b){if(!a.g)return b;if(!b" +
+    ".g)return a;var c=a.g;b=b.g;for(var d=null,e,f=0;c&&b;)c.h==b.h?(e" +
+    "=c,c=c.next,b=b.next):0<Ka(c.h,b.h)?(e=b,b=b.next):(e=c,c=c.next)," +
+    "(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;)e.g=d,d=d.next=e,f++," +
+    "e=e.next;a.j=d;a.h=f;return a}function gb(a,b){b=new eb(b);b.next=" +
+    "a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nD.prototype.add=function(a)" +
+    "{a=new eb(a);a.g=this.j;this.g?this.j.next=a:this.g=this.j=a;this." +
+    "j=a;this.h++};function hb(a){return(a=a.g)?a.h:null}function ib(a)" +
+    "{return(a=hb(a))?B(a):\"\"}function F(a,b){return new jb(a,!!b)}func" +
+    "tion jb(a,b){this.j=a;this.h=(this.F=b)?a.j:a.g;this.g=null}jb.pro" +
+    "totype.next=function(){var a=this.h;if(null==a)return null;var b=t" +
+    "his.g=a;this.h=this.F?a.g:a.next;return b.h};function kb(a){switch" +
+    "(a.nodeType){case 1:return ta(lb,a);case 9:return kb(a.documentEle" +
+    "ment);case 11:case 10:case 6:case 12:return mb;default:return a.pa" +
+    "rentNode?kb(a.parentNode):mb}}function mb(){return null}function l" +
+    "b(a,b){if(a.prefix==b)return a.namespaceURI||\"http://www.w3.org/19" +
+    "99/xhtml\";var c=a.getAttributeNode(\"xmlns:\"+b);return c&&c.specifi" +
+    "ed?c.value||null:a.parentNode&&9!=a.parentNode.nodeType?lb(a.paren" +
+    "tNode,b):null};function G(a){this.u=a;this.h=this.o=!1;this.j=null" +
+    "}function H(a){return\"\\n  \"+a.toString().split(\"\\n\").join(\"\\n  \")}" +
+    "function nb(a,b){a.o=b}function ob(a,b){a.h=b}function I(a,b){a=a." +
+    "g(b);return a instanceof D?+ib(a):+a}function K(a,b){a=a.g(b);retu" +
+    "rn a instanceof D?ib(a):\"\"+a}function L(a,b){a=a.g(b);return a ins" +
+    "tanceof D?!!a.h:!!a};function pb(a,b,c){G.call(this,a.u);this.i=a;" +
+    "this.s=b;this.C=c;this.o=b.o||c.o;this.h=b.h||c.h;this.i==qb&&(c.h" +
+    "||c.o||4==c.u||0==c.u||!b.j?b.h||b.o||4==b.u||0==b.u||!c.j||(this." +
+    "j={name:c.j.name,G:b}):this.j={name:b.j.name,G:c})}m(pb,G);\nfuncti" +
+    "on M(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;if(b instanceof D&&c insta" +
+    "nceof D){b=F(b);for(d=b.next();d;d=b.next())for(e=F(c),f=e.next();" +
+    "f;f=e.next())if(a(B(d),B(f)))return!0;return!1}if(b instanceof D||" +
+    "c instanceof D){b instanceof D?(e=b,d=c):(e=c,d=b);f=F(e);for(var " +
+    "g=typeof d,k=f.next();k;k=f.next()){switch(g){case \"number\":k=+B(k" +
+    ");break;case \"boolean\":k=!!B(k);break;case \"string\":k=B(k);break;d" +
+    "efault:throw Error(\"Illegal primitive type for comparison.\");}if(e" +
+    "==b&&a(k,d)||e==c&&a(d,k))return!0}return!1}return e?\n\"boolean\"==t" +
+    "ypeof b||\"boolean\"==typeof c?a(!!b,!!c):\"number\"==typeof b||\"numbe" +
+    "r\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}pb.prototype.g=function(a){r" +
+    "eturn this.i.A(this.s,this.C,a)};pb.prototype.toString=function(){" +
+    "var a=\"Binary Expression: \"+this.i;a+=H(this.s);return a+=H(this.C" +
+    ")};function rb(a,b,c,d){this.R=a;this.M=b;this.u=c;this.A=d}rb.pro" +
+    "totype.toString=function(){return this.R};var sb={};\nfunction N(a," +
+    "b,c,d){if(sb.hasOwnProperty(a))throw Error(\"Binary operator alread" +
+    "y created: \"+a);a=new rb(a,b,c,d);return sb[a.toString()]=a}N(\"div" +
+    "\",6,1,function(a,b,c){return I(a,c)/I(b,c)});N(\"mod\",6,1,function(" +
+    "a,b,c){return I(a,c)%I(b,c)});N(\"*\",6,1,function(a,b,c){return I(a" +
+    ",c)*I(b,c)});N(\"+\",5,1,function(a,b,c){return I(a,c)+I(b,c)});N(\"-" +
+    "\",5,1,function(a,b,c){return I(a,c)-I(b,c)});N(\"<\",4,2,function(a," +
+    "b,c){return M(function(d,e){return d<e},a,b,c)});\nN(\">\",4,2,functi" +
+    "on(a,b,c){return M(function(d,e){return d>e},a,b,c)});N(\"<=\",4,2,f" +
+    "unction(a,b,c){return M(function(d,e){return d<=e},a,b,c)});N(\">=\"" +
+    ",4,2,function(a,b,c){return M(function(d,e){return d>=e},a,b,c)});" +
+    "var qb=N(\"=\",3,2,function(a,b,c){return M(function(d,e){return d==" +
+    "e},a,b,c,!0)});N(\"!=\",3,2,function(a,b,c){return M(function(d,e){r" +
+    "eturn d!=e},a,b,c,!0)});N(\"and\",2,2,function(a,b,c){return L(a,c)&" +
+    "&L(b,c)});N(\"or\",1,2,function(a,b,c){return L(a,c)||L(b,c)});funct" +
+    "ion tb(a,b){if(b.g.length&&4!=a.u)throw Error(\"Primary expression " +
+    "must evaluate to nodeset if filter has predicate(s).\");G.call(this" +
+    ",a.u);this.s=a;this.i=b;this.o=a.o;this.h=a.h}m(tb,G);tb.prototype" +
+    ".g=function(a){a=this.s.g(a);return ub(this.i,a)};tb.prototype.toS" +
+    "tring=function(){var a=\"Filter:\"+H(this.s);return a+=H(this.i)};fu" +
+    "nction vb(a,b){if(b.length<a.L)throw Error(\"Function \"+a.v+\" expec" +
+    "ts at least\"+a.L+\" arguments, \"+b.length+\" given\");if(null!==a.H&&" +
+    "b.length>a.H)throw Error(\"Function \"+a.v+\" expects at most \"+a.H+\"" +
+    " arguments, \"+b.length+\" given\");a.P&&p(b,function(c,d){if(4!=c.u)" +
+    "throw Error(\"Argument \"+d+\" to function \"+a.v+\" is not of type Nod" +
+    "eset: \"+c);});G.call(this,a.u);this.B=a;this.i=b;nb(this,a.o||ya(b" +
+    ",function(c){return c.o}));ob(this,a.O&&!b.length||a.N&&!!b.length" +
+    "||ya(b,function(c){return c.h}))}\nm(vb,G);vb.prototype.g=function(" +
+    "a){return this.B.A.apply(null,za(a,this.i))};vb.prototype.toString" +
+    "=function(){var a=\"Function: \"+this.B;if(this.i.length){var b=v(th" +
+    "is.i,function(c,d){return c+H(d)},\"Arguments:\");a+=H(b)}return a};" +
+    "function wb(a,b,c,d,e,f,g,k){this.v=a;this.u=b;this.o=c;this.O=d;t" +
+    "his.N=!1;this.A=e;this.L=f;this.H=void 0!==g?g:f;this.P=!!k}wb.pro" +
+    "totype.toString=function(){return this.v};var xb={};\nfunction O(a," +
+    "b,c,d,e,f,g,k){if(xb.hasOwnProperty(a))throw Error(\"Function alrea" +
+    "dy created: \"+a+\".\");xb[a]=new wb(a,b,c,d,e,f,g,k)}O(\"boolean\",2,!" +
+    "1,!1,function(a,b){return L(b,a)},1);O(\"ceiling\",1,!1,!1,function(" +
+    "a,b){return Math.ceil(I(b,a))},1);O(\"concat\",3,!1,!1,function(a,b)" +
+    "{var c=Aa(arguments,1);return v(c,function(d,e){return d+K(e,a)},\"" +
+    "\")},2,null);O(\"contains\",2,!1,!1,function(a,b,c){b=K(b,a);a=K(c,a)" +
+    ";return-1!=b.indexOf(a)},2);O(\"count\",1,!1,!1,function(a,b){return" +
+    " b.g(a).h},1,1,!0);\nO(\"false\",2,!1,!1,function(){return!1},0);O(\"f" +
+    "loor\",1,!1,!1,function(a,b){return Math.floor(I(b,a))},1);O(\"id\",4" +
+    ",!1,!1,function(a,b){var c=a.g,d=9==c.nodeType?c:c.ownerDocument;a" +
+    "=K(b,a).split(/\\s+/);var e=[];p(a,function(g){g=d.getElementById(g" +
+    ");!g||0<=xa(e,g)||e.push(g)});e.sort(Ka);var f=new D;p(e,function(" +
+    "g){f.add(g)});return f},1);O(\"lang\",2,!1,!1,function(){return!1},1" +
+    ");O(\"last\",1,!0,!1,function(a){if(1!=arguments.length)throw Error(" +
+    "\"Function last expects ()\");return a.h},0);\nO(\"local-name\",3,!1,!0" +
+    ",function(a,b){return(a=b?hb(b.g(a)):a.g)?a.localName||a.nodeName." +
+    "toLowerCase():\"\"},0,1,!0);O(\"name\",3,!1,!0,function(a,b){return(a=" +
+    "b?hb(b.g(a)):a.g)?a.nodeName.toLowerCase():\"\"},0,1,!0);O(\"namespac" +
+    "e-uri\",3,!0,!1,function(){return\"\"},0,1,!0);O(\"normalize-space\",3," +
+    "!1,!0,function(a,b){return(b?K(b,a):B(a.g)).replace(/[\\s\\xa0]+/g,\"" +
+    " \").replace(/^\\s+|\\s+$/g,\"\")},0,1);O(\"not\",2,!1,!1,function(a,b){r" +
+    "eturn!L(b,a)},1);O(\"number\",1,!1,!0,function(a,b){return b?I(b,a):" +
+    "+B(a.g)},0,1);\nO(\"position\",1,!0,!1,function(a){return a.j},0);O(\"" +
+    "round\",1,!1,!1,function(a,b){return Math.round(I(b,a))},1);O(\"star" +
+    "ts-with\",2,!1,!1,function(a,b,c){b=K(b,a);a=K(c,a);return 0==b.las" +
+    "tIndexOf(a,0)},2);O(\"string\",3,!1,!0,function(a,b){return b?K(b,a)" +
+    ":B(a.g)},0,1);O(\"string-length\",1,!1,!0,function(a,b){return(b?K(b" +
+    ",a):B(a.g)).length},0,1);\nO(\"substring\",3,!1,!1,function(a,b,c,d){" +
+    "c=I(c,a);if(isNaN(c)||Infinity==c||-Infinity==c)return\"\";d=d?I(d,a" +
+    "):Infinity;if(isNaN(d)||-Infinity===d)return\"\";c=Math.round(c)-1;v" +
+    "ar e=Math.max(c,0);a=K(b,a);return Infinity==d?a.substring(e):a.su" +
+    "bstring(e,c+Math.round(d))},2,3);O(\"substring-after\",3,!1,!1,funct" +
+    "ion(a,b,c){b=K(b,a);a=K(c,a);c=b.indexOf(a);return-1==c?\"\":b.subst" +
+    "ring(c+a.length)},2);\nO(\"substring-before\",3,!1,!1,function(a,b,c)" +
+    "{b=K(b,a);a=K(c,a);a=b.indexOf(a);return-1==a?\"\":b.substring(0,a)}" +
+    ",2);O(\"sum\",1,!1,!1,function(a,b){a=F(b.g(a));b=0;for(var c=a.next" +
+    "();c;c=a.next())b+=+B(c);return b},1,1,!0);O(\"translate\",3,!1,!1,f" +
+    "unction(a,b,c,d){b=K(b,a);c=K(c,a);var e=K(d,a);a={};for(d=0;d<c.l" +
+    "ength;d++){var f=c.charAt(d);f in a||(a[f]=e.charAt(d))}c=\"\";for(d" +
+    "=0;d<b.length;d++)f=b.charAt(d),c+=f in a?a[f]:f;return c},3);O(\"t" +
+    "rue\",2,!1,!1,function(){return!0},0);function E(a,b){this.s=a;this" +
+    ".i=void 0!==b?b:null;this.h=null;switch(a){case \"comment\":this.h=8" +
+    ";break;case \"text\":this.h=3;break;case \"processing-instruction\":th" +
+    "is.h=7;break;case \"node\":break;default:throw Error(\"Unexpected arg" +
+    "ument\");}}function yb(a){return\"comment\"==a||\"text\"==a||\"processin" +
+    "g-instruction\"==a||\"node\"==a}E.prototype.g=function(a){return null" +
+    "===this.h||this.h==a.nodeType};E.prototype.getType=function(){retu" +
+    "rn this.h};E.prototype.j=function(){return this.s};\nE.prototype.to" +
+    "String=function(){var a=\"Kind Test: \"+this.s;null!==this.i&&(a+=H(" +
+    "this.i));return a};function zb(a){G.call(this,3);this.i=a.substrin" +
+    "g(1,a.length-1)}m(zb,G);zb.prototype.g=function(){return this.i};z" +
+    "b.prototype.toString=function(){return\"Literal: \"+this.i};function" +
+    " Ab(a,b){this.v=a.toLowerCase();this.h=b?b.toLowerCase():\"http://w" +
+    "ww.w3.org/1999/xhtml\"}Ab.prototype.g=function(a){var b=a.nodeType;" +
+    "return 1!=b&&2!=b?!1:\"*\"!=this.v&&this.v!=a.nodeName.toLowerCase()" +
+    "?!1:this.h==(a.namespaceURI?a.namespaceURI.toLowerCase():\"http://w" +
+    "ww.w3.org/1999/xhtml\")};Ab.prototype.j=function(){return this.v};A" +
+    "b.prototype.toString=function(){return\"Name Test: \"+(\"http://www.w" +
+    "3.org/1999/xhtml\"==this.h?\"\":this.h+\":\")+this.v};function Bb(a){G." +
+    "call(this,1);this.i=a}m(Bb,G);Bb.prototype.g=function(){return thi" +
+    "s.i};Bb.prototype.toString=function(){return\"Number: \"+this.i};fun" +
+    "ction Cb(a,b){G.call(this,a.u);this.s=a;this.i=b;this.o=a.o;this.h" +
+    "=a.h;1==this.i.length&&(a=this.i[0],a.I||a.i!=Db||(a=a.C,\"*\"!=a.j(" +
+    ")&&(this.j={name:a.j(),G:null})))}m(Cb,G);function Eb(){G.call(thi" +
+    "s,4)}m(Eb,G);Eb.prototype.g=function(a){var b=new D;a=a.g;9==a.nod" +
+    "eType?b.add(a):b.add(a.ownerDocument);return b};Eb.prototype.toStr" +
+    "ing=function(){return\"Root Helper Expression\"};function Fb(){G.cal" +
+    "l(this,4)}m(Fb,G);Fb.prototype.g=function(a){var b=new D;b.add(a.g" +
+    ");return b};Fb.prototype.toString=function(){return\"Context Helper" +
+    " Expression\"};\nfunction Gb(a){return\"/\"==a||\"//\"==a}Cb.prototype.g" +
+    "=function(a){var b=this.s.g(a);if(!(b instanceof D))throw Error(\"F" +
+    "ilter expression must evaluate to nodeset.\");a=this.i;for(var c=0," +
+    "d=a.length;c<d&&b.h;c++){var e=a[c],f=F(b,e.i.F);if(e.o||e.i!=Hb)i" +
+    "f(e.o||e.i!=Ib){var g=f.next();for(b=e.g(new y(g));null!=(g=f.next" +
+    "());)g=e.g(new y(g)),b=fb(b,g)}else g=f.next(),b=e.g(new y(g));els" +
+    "e{for(g=f.next();(b=f.next())&&(!g.contains||g.contains(b))&&b.com" +
+    "pareDocumentPosition(g)&8;g=b);b=e.g(new y(g))}}return b};\nCb.prot" +
+    "otype.toString=function(){var a=\"Path Expression:\"+H(this.s);if(th" +
+    "is.i.length){var b=v(this.i,function(c,d){return c+H(d)},\"Steps:\")" +
+    ";a+=H(b)}return a};function Jb(a,b){this.g=a;this.F=!!b}\nfunction " +
+    "ub(a,b,c){for(c=c||0;c<a.g.length;c++)for(var d=a.g[c],e=F(b),f=b." +
+    "h,g,k=0;g=e.next();k++){var q=a.F?f-k:k+1;g=d.g(new y(g,q,f));if(\"" +
+    "number\"==typeof g)q=q==g;else if(\"string\"==typeof g||\"boolean\"==ty" +
+    "peof g)q=!!g;else if(g instanceof D)q=0<g.h;else throw Error(\"Pred" +
+    "icate.evaluate returned an unexpected type.\");if(!q){q=e;g=q.j;var" +
+    " t=q.g;if(!t)throw Error(\"Next must be called at least once before" +
+    " remove.\");var r=t.g;t=t.next;r?r.next=t:g.g=t;t?t.g=r:g.j=r;g.h--" +
+    ";q.g=null}}return b}\nJb.prototype.toString=function(){return v(thi" +
+    "s.g,function(a,b){return a+H(b)},\"Predicates:\")};function P(a,b,c," +
+    "d){G.call(this,4);this.i=a;this.C=b;this.s=c||new Jb([]);this.I=!!" +
+    "d;b=this.s;b=0<b.g.length?b.g[0].j:null;a.U&&b&&(this.j={name:b.na" +
+    "me,G:b.G});a:{a=this.s;for(b=0;b<a.g.length;b++)if(c=a.g[b],c.o||1" +
+    "==c.u||0==c.u){a=!0;break a}a=!1}this.o=a}m(P,G);\nP.prototype.g=fu" +
+    "nction(a){var b=a.g,c=this.j,d=null,e=null,f=0;c&&(d=c.name,e=c.G?" +
+    "K(c.G,a):null,f=1);if(this.I)if(this.o||this.i!=Kb)if(b=F((new P(L" +
+    "b,new E(\"node\"))).g(a)),c=b.next())for(a=this.A(c,d,e,f);null!=(c=" +
+    "b.next());)a=fb(a,this.A(c,d,e,f));else a=new D;else a=bb(this.C,b" +
+    ",d,e),a=ub(this.s,a,f);else a=this.A(a.g,d,e,f);return a};P.protot" +
+    "ype.A=function(a,b,c,d){a=this.i.B(this.C,a,b,c);return a=ub(this." +
+    "s,a,d)};\nP.prototype.toString=function(){var a=\"Step:\"+H(\"Operator" +
+    ": \"+(this.I?\"//\":\"/\"));this.i.v&&(a+=H(\"Axis: \"+this.i));a+=H(this" +
+    ".C);if(this.s.g.length){var b=v(this.s.g,function(c,d){return c+H(" +
+    "d)},\"Predicates:\");a+=H(b)}return a};function Mb(a,b,c,d){this.v=a" +
+    ";this.B=b;this.F=c;this.U=d}Mb.prototype.toString=function(){retur" +
+    "n this.v};var Nb={};function R(a,b,c,d){if(Nb.hasOwnProperty(a))th"
+  )
+      .append(
+    "row Error(\"Axis already created: \"+a);b=new Mb(a,b,c,!!d);return N" +
+    "b[a]=b}\nR(\"ancestor\",function(a,b){for(var c=new D;b=b.parentNode;" +
+    ")a.g(b)&&gb(c,b);return c},!0);R(\"ancestor-or-self\",function(a,b){" +
+    "var c=new D;do a.g(b)&&gb(c,b);while(b=b.parentNode);return c},!0)" +
+    ";\nvar Db=R(\"attribute\",function(a,b){var c=new D,d=a.j();if(b=b.at" +
+    "tributes)if(a instanceof E&&null===a.getType()||\"*\"==d)for(a=0;d=b" +
+    "[a];a++)c.add(d);else(d=b.getNamedItem(d))&&c.add(d);return c},!1)" +
+    ",Kb=R(\"child\",function(a,b,c,d,e){c=\"string\"===typeof c?c:null;d=\"" +
+    "string\"===typeof d?d:null;e=e||new D;for(b=b.firstChild;b;b=b.next" +
+    "Sibling)C(b,c,d)&&a.g(b)&&e.add(b);return e},!1,!0);R(\"descendant\"" +
+    ",bb,!1,!0);\nvar Lb=R(\"descendant-or-self\",function(a,b,c,d){var e=" +
+    "new D;C(b,c,d)&&a.g(b)&&e.add(b);return bb(a,b,c,d,e)},!1,!0),Hb=R" +
+    "(\"following\",function(a,b,c,d){var e=new D;do for(var f=b;f=f.next" +
+    "Sibling;)C(f,c,d)&&a.g(f)&&e.add(f),e=bb(a,f,c,d,e);while(b=b.pare" +
+    "ntNode);return e},!1,!0);R(\"following-sibling\",function(a,b){for(v" +
+    "ar c=new D;b=b.nextSibling;)a.g(b)&&c.add(b);return c},!1);R(\"name" +
+    "space\",function(){return new D},!1);\nvar Ob=R(\"parent\",function(a," +
+    "b){var c=new D;if(9==b.nodeType)return c;if(2==b.nodeType)return c" +
+    ".add(b.ownerElement),c;b=b.parentNode;a.g(b)&&c.add(b);return c},!" +
+    "1),Ib=R(\"preceding\",function(a,b,c,d){var e=new D,f=[];do f.unshif" +
+    "t(b);while(b=b.parentNode);for(var g=1,k=f.length;g<k;g++){var q=[" +
+    "];for(b=f[g];b=b.previousSibling;)q.unshift(b);for(var t=0,r=q.len" +
+    "gth;t<r;t++)b=q[t],C(b,c,d)&&a.g(b)&&e.add(b),e=bb(a,b,c,d,e)}retu" +
+    "rn e},!0,!0);\nR(\"preceding-sibling\",function(a,b){for(var c=new D;" +
+    "b=b.previousSibling;)a.g(b)&&gb(c,b);return c},!0);var Qb=R(\"self\"" +
+    ",function(a,b){var c=new D;a.g(b)&&c.add(b);return c},!1);function" +
+    " Rb(a){G.call(this,1);this.i=a;this.o=a.o;this.h=a.h}m(Rb,G);Rb.pr" +
+    "ototype.g=function(a){return-I(this.i,a)};Rb.prototype.toString=fu" +
+    "nction(){return\"Unary Expression: -\"+H(this.i)};function Sb(a){G.c" +
+    "all(this,4);this.i=a;nb(this,ya(this.i,function(b){return b.o}));o" +
+    "b(this,ya(this.i,function(b){return b.h}))}m(Sb,G);Sb.prototype.g=" +
+    "function(a){var b=new D;p(this.i,function(c){c=c.g(a);if(!(c insta" +
+    "nceof D))throw Error(\"Path expression must evaluate to NodeSet.\");" +
+    "b=fb(b,c)});return b};Sb.prototype.toString=function(){return v(th" +
+    "is.i,function(a,b){return a+H(b)},\"Union Expression:\")};function T" +
+    "b(a,b){this.g=a;this.h=b}function Ub(a){for(var b,c=[];;){S(a,\"Mis" +
+    "sing right hand side of binary expression.\");b=Vb(a);var d=a.g.nex" +
+    "t();if(!d)break;var e=(d=sb[d]||null)&&d.M;if(!e){a.g.g--;break}fo" +
+    "r(;c.length&&e<=c[c.length-1].M;)b=new pb(c.pop(),c.pop(),b);c.pus" +
+    "h(b,d)}for(;c.length;)b=new pb(c.pop(),c.pop(),b);return b}functio" +
+    "n S(a,b){if($a(a.g))throw Error(b);}function Wb(a,b){a=a.g.next();" +
+    "if(a!=b)throw Error(\"Bad token, expected: \"+b+\" got: \"+a);}\nfuncti" +
+    "on Xb(a){a=a.g.next();if(\")\"!=a)throw Error(\"Bad token: \"+a);}func" +
+    "tion Yb(a){a=a.g.next();if(2>a.length)throw Error(\"Unclosed litera" +
+    "l string\");return new zb(a)}function Zb(a){var b=a.g.next(),c=b.in" +
+    "dexOf(\":\");if(-1==c)return new Ab(b);var d=b.substring(0,c);a=a.h(" +
+    "d);if(!a)throw Error(\"Namespace prefix not declared: \"+d);b=b.subs" +
+    "tr(c+1);return new Ab(b,a)}\nfunction $b(a){var b=[];if(Gb(z(a.g)))" +
+    "{var c=a.g.next();var d=z(a.g);if(\"/\"==c&&($a(a.g)||\".\"!=d&&\"..\"!=" +
+    "d&&\"@\"!=d&&\"*\"!=d&&!/(?![0-9])[\\w]/.test(d)))return new Eb;d=new E" +
+    "b;S(a,\"Missing next location step.\");c=ac(a,c);b.push(c)}else{a:{c" +
+    "=z(a.g);d=c.charAt(0);switch(d){case \"$\":throw Error(\"Variable ref" +
+    "erence not allowed in HTML XPath\");case \"(\":a.g.next();c=Ub(a);S(a" +
+    ",'unclosed \"(\"');Wb(a,\")\");break;case '\"':case \"'\":c=Yb(a);break;d" +
+    "efault:if(isNaN(+c))if(!yb(c)&&/(?![0-9])[\\w]/.test(d)&&\"(\"==z(a.g" +
+    ",\n1)){c=a.g.next();c=xb[c]||null;a.g.next();for(d=[];\")\"!=z(a.g);)" +
+    "{S(a,\"Missing function argument list.\");d.push(Ub(a));if(\",\"!=z(a." +
+    "g))break;a.g.next()}S(a,\"Unclosed function argument list.\");Xb(a);" +
+    "c=new vb(c,d)}else{c=null;break a}else c=new Bb(+a.g.next())}\"[\"==" +
+    "z(a.g)&&(d=new Jb(bc(a)),c=new tb(c,d))}if(c)if(Gb(z(a.g)))d=c;els" +
+    "e return c;else c=ac(a,\"/\"),d=new Fb,b.push(c)}for(;Gb(z(a.g));)c=" +
+    "a.g.next(),S(a,\"Missing next location step.\"),c=ac(a,c),b.push(c);" +
+    "return new Cb(d,b)}\nfunction ac(a,b){if(\"/\"!=b&&\"//\"!=b)throw Erro" +
+    "r('Step op should be \"/\" or \"//\"');if(\".\"==z(a.g)){var c=new P(Qb," +
+    "new E(\"node\"));a.g.next();return c}if(\"..\"==z(a.g))return c=new P(" +
+    "Ob,new E(\"node\")),a.g.next(),c;if(\"@\"==z(a.g)){var d=Db;a.g.next()" +
+    ";S(a,\"Missing attribute name\")}else if(\"::\"==z(a.g,1)){if(!/(?![0-" +
+    "9])[\\w]/.test(z(a.g).charAt(0)))throw Error(\"Bad token: \"+a.g.next" +
+    "());var e=a.g.next();d=Nb[e]||null;if(!d)throw Error(\"No axis with" +
+    " name: \"+e);a.g.next();S(a,\"Missing node name\")}else d=Kb;e=\nz(a.g" +
+    ");if(/(?![0-9])[\\w]/.test(e.charAt(0)))if(\"(\"==z(a.g,1)){if(!yb(e)" +
+    ")throw Error(\"Invalid node type: \"+e);e=a.g.next();if(!yb(e))throw" +
+    " Error(\"Invalid type name: \"+e);Wb(a,\"(\");S(a,\"Bad nodetype\");var " +
+    "f=z(a.g).charAt(0),g=null;if('\"'==f||\"'\"==f)g=Yb(a);S(a,\"Bad nodet" +
+    "ype\");Xb(a);e=new E(e,g)}else e=Zb(a);else if(\"*\"==e)e=Zb(a);else " +
+    "throw Error(\"Bad token: \"+a.g.next());a=new Jb(bc(a),d.F);return c" +
+    "||new P(d,e,a,\"//\"==b)}\nfunction bc(a){for(var b=[];\"[\"==z(a.g);){" +
+    "a.g.next();S(a,\"Missing predicate expression.\");var c=Ub(a);b.push" +
+    "(c);S(a,\"Unclosed predicate expression.\");Wb(a,\"]\")}return b}funct" +
+    "ion Vb(a){if(\"-\"==z(a.g))return a.g.next(),new Rb(Vb(a));var b=$b(" +
+    "a);if(\"|\"!=z(a.g))a=b;else{for(b=[b];\"|\"==a.g.next();)S(a,\"Missing" +
+    " next union location path.\"),b.push($b(a));a.g.g--;a=new Sb(b)}ret" +
+    "urn a};function cc(a,b){if(!a.length)throw Error(\"Empty XPath expr" +
+    "ession.\");a=Xa(a);if($a(a))throw Error(\"Invalid XPath expression.\"" +
+    ");b?\"function\"!==typeof b&&(b=sa(b.lookupNamespaceURI,b)):b=functi" +
+    "on(){return null};var c=Ub(new Tb(a,b));if(!$a(a))throw Error(\"Bad" +
+    " token: \"+a.next());this.evaluate=function(d,e){d=c.g(new y(d));re" +
+    "turn new T(d,e)}}\nfunction T(a,b){if(0==b)if(a instanceof D)b=4;el" +
+    "se if(\"string\"==typeof a)b=2;else if(\"number\"==typeof a)b=1;else i" +
+    "f(\"boolean\"==typeof a)b=3;else throw Error(\"Unexpected evaluation " +
+    "result.\");if(2!=b&&1!=b&&3!=b&&!(a instanceof D))throw Error(\"valu" +
+    "e could not be converted to the specified type\");this.resultType=b" +
+    ";switch(b){case 2:this.stringValue=a instanceof D?ib(a):\"\"+a;break" +
+    ";case 1:this.numberValue=a instanceof D?+ib(a):+a;break;case 3:thi" +
+    "s.booleanValue=a instanceof D?0<a.h:!!a;break;case 4:case 5:case 6" +
+    ":case 7:var c=\nF(a);var d=[];for(var e=c.next();e;e=c.next())d.pus" +
+    "h(e);this.snapshotLength=a.h;this.invalidIteratorState=!1;break;ca" +
+    "se 8:case 9:this.singleNodeValue=hb(a);break;default:throw Error(\"" +
+    "Unknown XPathResult type.\");}var f=0;this.iterateNext=function(){i" +
+    "f(4!=b&&5!=b)throw Error(\"iterateNext called with wrong result typ" +
+    "e\");return f>=d.length?null:d[f++]};this.snapshotItem=function(g){" +
+    "if(6!=b&&7!=b)throw Error(\"snapshotItem called with wrong result t" +
+    "ype\");return g>=d.length||0>g?null:d[g]}}T.ANY_TYPE=0;\nT.NUMBER_TY" +
+    "PE=1;T.STRING_TYPE=2;T.BOOLEAN_TYPE=3;T.UNORDERED_NODE_ITERATOR_TY" +
+    "PE=4;T.ORDERED_NODE_ITERATOR_TYPE=5;T.UNORDERED_NODE_SNAPSHOT_TYPE" +
+    "=6;T.ORDERED_NODE_SNAPSHOT_TYPE=7;T.ANY_UNORDERED_NODE_TYPE=8;T.FI" +
+    "RST_ORDERED_NODE_TYPE=9;function dc(a){this.lookupNamespaceURI=kb(" +
+    "a)}\nfunction ec(a,b){a=a||l;var c=a.document;if(!c.evaluate||b)a.X" +
+    "PathResult=T,c.evaluate=function(d,e,f,g){return(new cc(d,f)).eval" +
+    "uate(e,g)},c.createExpression=function(d,e){return new cc(d,e)},c." +
+    "createNSResolver=function(d){return new dc(d)}}pa(\"wgxpath.install" +
+    "\",ec);var U={};U.J=function(){var a={X:\"http://www.w3.org/2000/svg" +
+    "\"};return function(b){return a[b]||null}}();\nU.A=function(a,b,c){v" +
+    "ar d=w(a);if(!d.documentElement)return null;ec(d?d.parentWindow||d" +
+    ".defaultView:window);try{for(var e=d.createNSResolver?d.createNSRe" +
+    "solver(d.documentElement):U.J,f={},g=d.getElementsByTagName(\"*\"),k" +
+    "=0;k<g.length;++k){var q=g[k],t=q.namespaceURI;if(t&&!f[t]){var r=" +
+    "q.lookupPrefix(t);if(!r){var A=t.match(\".*/(\\\\w+)/?$\");r=A?A[1]:\"x" +
+    "html\"}f[t]=r}}var J={},Q;for(Q in f)J[f[Q]]=Q;e=function(n){return" +
+    " J[n]||null};try{return d.evaluate(b,a,e,c,null)}catch(n){if(\"Type" +
+    "Error\"===n.name)return e=\nd.createNSResolver?d.createNSResolver(d." +
+    "documentElement):U.J,d.evaluate(b,a,e,c,null);throw n;}}catch(n){t" +
+    "hrow new Qa(32,\"Unable to locate an element with the xpath express" +
+    "ion \"+b+\" because of the following error:\\n\"+n);}};U.K=function(a," +
+    "b){if(!a||1!=a.nodeType)throw new Qa(32,'The result of the xpath e" +
+    "xpression \"'+b+'\" is: '+a+\". It should be an element.\");};\nU.S=fun" +
+    "ction(a,b){var c=function(){var d=U.A(b,a,9);return d?d.singleNode" +
+    "Value||null:b.selectSingleNode?(d=w(b),d.setProperty&&d.setPropert" +
+    "y(\"SelectionLanguage\",\"XPath\"),b.selectSingleNode(a)):null}();null" +
+    "!==c&&U.K(c,a);return c};\nU.W=function(a,b){var c=function(){var d" +
+    "=U.A(b,a,7);if(d){for(var e=d.snapshotLength,f=[],g=0;g<e;++g)f.pu" +
+    "sh(d.snapshotItem(g));return f}return b.selectNodes?(d=w(b),d.setP" +
+    "roperty&&d.setProperty(\"SelectionLanguage\",\"XPath\"),b.selectNodes(" +
+    "a)):[]}();p(c,function(d){U.K(d,a)});return c};var fc={aliceblue:\"" +
+    "#f0f8ff\",antiquewhite:\"#faebd7\",aqua:\"#00ffff\",aquamarine:\"#7fffd4" +
+    "\",azure:\"#f0ffff\",beige:\"#f5f5dc\",bisque:\"#ffe4c4\",black:\"#000000\"" +
+    ",blanchedalmond:\"#ffebcd\",blue:\"#0000ff\",blueviolet:\"#8a2be2\",brow" +
+    "n:\"#a52a2a\",burlywood:\"#deb887\",cadetblue:\"#5f9ea0\",chartreuse:\"#7" +
+    "fff00\",chocolate:\"#d2691e\",coral:\"#ff7f50\",cornflowerblue:\"#6495ed" +
+    "\",cornsilk:\"#fff8dc\",crimson:\"#dc143c\",cyan:\"#00ffff\",darkblue:\"#0" +
+    "0008b\",darkcyan:\"#008b8b\",darkgoldenrod:\"#b8860b\",darkgray:\"#a9a9a" +
+    "9\",darkgreen:\"#006400\",\ndarkgrey:\"#a9a9a9\",darkkhaki:\"#bdb76b\",dar" +
+    "kmagenta:\"#8b008b\",darkolivegreen:\"#556b2f\",darkorange:\"#ff8c00\",d" +
+    "arkorchid:\"#9932cc\",darkred:\"#8b0000\",darksalmon:\"#e9967a\",darksea" +
+    "green:\"#8fbc8f\",darkslateblue:\"#483d8b\",darkslategray:\"#2f4f4f\",da" +
+    "rkslategrey:\"#2f4f4f\",darkturquoise:\"#00ced1\",darkviolet:\"#9400d3\"" +
+    ",deeppink:\"#ff1493\",deepskyblue:\"#00bfff\",dimgray:\"#696969\",dimgre" +
+    "y:\"#696969\",dodgerblue:\"#1e90ff\",firebrick:\"#b22222\",floralwhite:\"" +
+    "#fffaf0\",forestgreen:\"#228b22\",fuchsia:\"#ff00ff\",gainsboro:\"#dcdcd" +
+    "c\",\nghostwhite:\"#f8f8ff\",gold:\"#ffd700\",goldenrod:\"#daa520\",gray:\"" +
+    "#808080\",green:\"#008000\",greenyellow:\"#adff2f\",grey:\"#808080\",hone" +
+    "ydew:\"#f0fff0\",hotpink:\"#ff69b4\",indianred:\"#cd5c5c\",indigo:\"#4b00" +
+    "82\",ivory:\"#fffff0\",khaki:\"#f0e68c\",lavender:\"#e6e6fa\",lavenderblu" +
+    "sh:\"#fff0f5\",lawngreen:\"#7cfc00\",lemonchiffon:\"#fffacd\",lightblue:" +
+    "\"#add8e6\",lightcoral:\"#f08080\",lightcyan:\"#e0ffff\",lightgoldenrody" +
+    "ellow:\"#fafad2\",lightgray:\"#d3d3d3\",lightgreen:\"#90ee90\",lightgrey" +
+    ":\"#d3d3d3\",lightpink:\"#ffb6c1\",lightsalmon:\"#ffa07a\",\nlightseagree" +
+    "n:\"#20b2aa\",lightskyblue:\"#87cefa\",lightslategray:\"#778899\",lights" +
+    "lategrey:\"#778899\",lightsteelblue:\"#b0c4de\",lightyellow:\"#ffffe0\"," +
+    "lime:\"#00ff00\",limegreen:\"#32cd32\",linen:\"#faf0e6\",magenta:\"#ff00f" +
+    "f\",maroon:\"#800000\",mediumaquamarine:\"#66cdaa\",mediumblue:\"#0000cd" +
+    "\",mediumorchid:\"#ba55d3\",mediumpurple:\"#9370db\",mediumseagreen:\"#3" +
+    "cb371\",mediumslateblue:\"#7b68ee\",mediumspringgreen:\"#00fa9a\",mediu" +
+    "mturquoise:\"#48d1cc\",mediumvioletred:\"#c71585\",midnightblue:\"#1919" +
+    "70\",mintcream:\"#f5fffa\",mistyrose:\"#ffe4e1\",\nmoccasin:\"#ffe4b5\",na" +
+    "vajowhite:\"#ffdead\",navy:\"#000080\",oldlace:\"#fdf5e6\",olive:\"#80800" +
+    "0\",olivedrab:\"#6b8e23\",orange:\"#ffa500\",orangered:\"#ff4500\",orchid" +
+    ":\"#da70d6\",palegoldenrod:\"#eee8aa\",palegreen:\"#98fb98\",paleturquoi" +
+    "se:\"#afeeee\",palevioletred:\"#db7093\",papayawhip:\"#ffefd5\",peachpuf" +
+    "f:\"#ffdab9\",peru:\"#cd853f\",pink:\"#ffc0cb\",plum:\"#dda0dd\",powderblu" +
+    "e:\"#b0e0e6\",purple:\"#800080\",red:\"#ff0000\",rosybrown:\"#bc8f8f\",roy" +
+    "alblue:\"#4169e1\",saddlebrown:\"#8b4513\",salmon:\"#fa8072\",sandybrown" +
+    ":\"#f4a460\",seagreen:\"#2e8b57\",\nseashell:\"#fff5ee\",sienna:\"#a0522d\"" +
+    ",silver:\"#c0c0c0\",skyblue:\"#87ceeb\",slateblue:\"#6a5acd\",slategray:" +
+    "\"#708090\",slategrey:\"#708090\",snow:\"#fffafa\",springgreen:\"#00ff7f\"" +
+    ",steelblue:\"#4682b4\",tan:\"#d2b48c\",teal:\"#008080\",thistle:\"#d8bfd8" +
+    "\",tomato:\"#ff6347\",turquoise:\"#40e0d0\",violet:\"#ee82ee\",wheat:\"#f5" +
+    "deb3\",white:\"#ffffff\",whitesmoke:\"#f5f5f5\",yellow:\"#ffff00\",yellow" +
+    "green:\"#9acd32\"};var gc=\"backgroundColor borderTopColor borderRigh" +
+    "tColor borderBottomColor borderLeftColor color outlineColor\".split" +
+    "(\" \"),hc=/#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])/,ic=/^#(?:[0-9a" +
+    "-f]{3}){1,2}$/i,jc=/^(?:rgba)?\\((\\d{1,3}),\\s?(\\d{1,3}),\\s?(\\d{1,3}" +
+    "),\\s?(0|1|0\\.\\d*)\\)$/i,kc=/^(?:rgb)?\\((0|[1-9]\\d{0,2}),\\s?(0|[1-9]" +
+    "\\d{0,2}),\\s?(0|[1-9]\\d{0,2})\\)$/i;function lc(a,b){b&&\"string\"!==t" +
+    "ypeof b&&(b=b.toString());return!!a&&1==a.nodeType&&(!b||a.tagName" +
+    ".toUpperCase()==b)};function mc(a){for(a=a.parentNode;a&&1!=a.node" +
+    "Type&&9!=a.nodeType&&11!=a.nodeType;)a=a.parentNode;return lc(a)?a" +
+    ":null}\nfunction V(a,b){b=Ia(b);if(\"float\"==b||\"cssFloat\"==b||\"styl" +
+    "eFloat\"==b)b=\"cssFloat\";a=Pa(a,b)||nc(a,b);if(null===a)a=null;else" +
+    " if(0<=xa(gc,b)){b:{var c=a.match(jc);if(c){b=Number(c[1]);var d=N" +
+    "umber(c[2]),e=Number(c[3]);c=Number(c[4]);if(0<=b&&255>=b&&0<=d&&2" +
+    "55>=d&&0<=e&&255>=e&&0<=c&&1>=c){b=[b,d,e,c];break b}}b=null}if(!b" +
+    ")b:{if(e=a.match(kc))if(b=Number(e[1]),d=Number(e[2]),e=Number(e[3" +
+    "]),0<=b&&255>=b&&0<=d&&255>=d&&0<=e&&255>=e){b=[b,d,e,1];break b}b" +
+    "=null}if(!b)b:{b=a.toLowerCase();d=fc[b.toLowerCase()];\nif(!d&&(d=" +
+    "\"#\"==b.charAt(0)?b:\"#\"+b,4==d.length&&(d=d.replace(hc,\"#$1$1$2$2$3" +
+    "$3\")),!ic.test(d))){b=null;break b}b=[parseInt(d.substr(1,2),16),p" +
+    "arseInt(d.substr(3,2),16),parseInt(d.substr(5,2),16),1]}a=b?\"rgba(" +
+    "\"+b.join(\", \")+\")\":a}return a}function nc(a,b){var c=a.currentStyl" +
+    "e||a.style,d=c[b];void 0===d&&\"function\"===typeof c.getPropertyVal" +
+    "ue&&(d=c.getPropertyValue(b));return\"inherit\"!=d?void 0!==d?d:null" +
+    ":(a=mc(a))?nc(a,b):null}\nfunction oc(a,b){function c(n){function u" +
+    "(ab){return ab==g?!0:0==V(ab,\"display\").lastIndexOf(\"inline\",0)||\"" +
+    "absolute\"==Pb&&\"static\"==V(ab,\"position\")?!1:!0}var Pb=V(n,\"positi" +
+    "on\");if(\"fixed\"==Pb)return t=!0,n==g?null:g;for(n=mc(n);n&&!u(n);)" +
+    "n=mc(n);return n}function d(n){var u=n;if(\"visible\"==q)if(n==g&&k)" +
+    "u=k;else if(n==k)return{x:\"visible\",y:\"visible\"};u={x:V(u,\"overflo" +
+    "w-x\"),y:V(u,\"overflow-y\")};n==g&&(u.x=\"visible\"==u.x?\"auto\":u.x,u." +
+    "y=\"visible\"==u.y?\"auto\":u.y);return u}function e(n){if(n==g){var u" +
+    "=\n(new Na(f)).g;n=u.scrollingElement?u.scrollingElement:u.body||u." +
+    "documentElement;u=u.parentWindow||u.defaultView;n=new Ba(u.pageXOf" +
+    "fset||n.scrollLeft,u.pageYOffset||n.scrollTop)}else n=new Ba(n.scr" +
+    "ollLeft,n.scrollTop);return n}b=pc(a,b);var f=w(a),g=f.documentEle" +
+    "ment,k=f.body,q=V(g,\"overflow\"),t;for(a=c(a);a;a=c(a)){var r=d(a);" +
+    "if(\"visible\"!=r.x||\"visible\"!=r.y){var A=qc(a);if(0==A.width||0==A" +
+    ".height)return\"hidden\";var J=b.g<A.left,Q=b.h<A.top;if(J&&\"hidden\"" +
+    "==r.x||Q&&\"hidden\"==r.y)return\"hidden\";if(J&&\n\"visible\"!=r.x||Q&&\"" +
+    "visible\"!=r.y){J=e(a);Q=b.h<A.top-J.y;if(b.g<A.left-J.x&&\"visible\"" +
+    "!=r.x||Q&&\"visible\"!=r.x)return\"hidden\";b=oc(a);return\"hidden\"==b?" +
+    "\"hidden\":\"scroll\"}J=b.left>=A.left+A.width;A=b.top>=A.top+A.height" +
+    ";if(J&&\"hidden\"==r.x||A&&\"hidden\"==r.y)return\"hidden\";if(J&&\"visib" +
+    "le\"!=r.x||A&&\"visible\"!=r.y){if(t&&(r=e(a),b.left>=g.scrollWidth-r" +
+    ".x||b.g>=g.scrollHeight-r.y))return\"hidden\";b=oc(a);return\"hidden\"" +
+    "==b?\"hidden\":\"scroll\"}}}return\"none\"}\nfunction qc(a){var b=lc(a,\"M" +
+    "AP\");if(b||lc(a,\"AREA\")){var c=b?a:lc(a.parentNode,\"MAP\")?a.parent" +
+    "Node:null,d=null;var e=null;if(c&&c.name&&(d=w(c),d=U.S('/descenda" +
+    "nt::*[@usemap = \"#'+c.name+'\"]',d))&&(e=qc(d),!b&&\"default\"!=a.sha" +
+    "pe.toLowerCase())){b=rc(a);c=Math.min(Math.max(b.left,0),e.width);" +
+    "var f=Math.min(Math.max(b.top,0),e.height);e=new x(c+e.left,f+e.to" +
+    "p,Math.min(b.width,e.width-c),Math.min(b.height,e.height-f))}e={im" +
+    "age:d,rect:e||new x(0,0,0,0)}}else e=null;if(e)return e.rect;if(lc" +
+    "(a,\"HTML\"))return a=\nw(a),a=((a?a.parentWindow||a.defaultView:wind" +
+    "ow)||window).document,a=\"CSS1Compat\"==a.compatMode?a.documentEleme" +
+    "nt:a.body,a=new Ha(a.clientWidth,a.clientHeight),new x(0,0,a.width" +
+    ",a.height);try{var g=a.getBoundingClientRect()}catch(k){return new" +
+    " x(0,0,0,0)}return new x(g.left,g.top,g.right-g.left,g.bottom-g.to" +
+    "p)}\nfunction rc(a){var b=a.shape.toLowerCase();a=a.coords.split(\"," +
+    "\");if(\"rect\"==b&&4==a.length){b=a[0];var c=a[1];return new x(b,c,a" +
+    "[2]-b,a[3]-c)}if(\"circle\"==b&&3==a.length)return b=a[2],new x(a[0]" +
+    "-b,a[1]-b,2*b,2*b);if(\"poly\"==b&&2<a.length){b=a[0];c=a[1];for(var" +
+    " d=b,e=c,f=2;f+1<a.length;f+=2)b=Math.min(b,a[f]),d=Math.max(d,a[f" +
+    "]),c=Math.min(c,a[f+1]),e=Math.max(e,a[f+1]);return new x(b,c,d-b," +
+    "e-c)}return new x(0,0,0,0)}\nfunction pc(a,b){a=qc(a);a=new Oa(a.to" +
+    "p,a.left+a.width,a.top+a.height,a.left);b&&(b=b instanceof x?b:new" +
+    " x(b.x,b.y,1,1),a.left=Math.min(Math.max(a.left+b.left,a.left),a.g" +
+    "),a.top=Math.min(Math.max(a.top+b.top,a.top),a.h),a.g=Math.min(Mat" +
+    "h.max(a.left+b.width,a.left),a.g),a.h=Math.min(Math.max(a.top+b.he" +
+    "ight,a.top),a.h));return a};var sc=Object.freeze||function(a){retu" +
+    "rn a};Ta(4);function tc(a,b){this.g=a[l.Symbol.iterator]();this.h=" +
+    "b}tc.prototype[Symbol.iterator]=function(){return this};tc.prototy" +
+    "pe.next=function(){var a=this.g.next();return{value:a.done?void 0:" +
+    "this.h.call(void 0,a.value),done:a.done}};function uc(a,b){return " +
+    "new tc(a,b)};function vc(){}vc.prototype.next=function(){return wc" +
+    "};var wc=sc({done:!0,value:void 0});vc.prototype.D=function(){retu" +
+    "rn this};function xc(a){if(a instanceof W||a instanceof X||a insta" +
+    "nceof Y)return a;if(\"function\"==typeof a.next)return new W(functio" +
+    "n(){return a});if(\"function\"==typeof a[Symbol.iterator])return new" +
+    " W(function(){return a[Symbol.iterator]()});if(\"function\"==typeof " +
+    "a.D)return new W(function(){return a.D()});throw Error(\"Not an ite" +
+    "rator or iterable.\");}function W(a){this.B=a}W.prototype.D=functio" +
+    "n(){return new X(this.B())};W.prototype[Symbol.iterator]=function(" +
+    "){return new Y(this.B())};W.prototype.h=function(){return new Y(th" +
+    "is.B())};\nfunction X(a){this.g=a}na(X,vc);X.prototype.next=functio" +
+    "n(){return this.g.next()};X.prototype[Symbol.iterator]=function(){" +
+    "return new Y(this.g)};X.prototype.h=function(){return new Y(this.g" +
+    ")};function Y(a){W.call(this,function(){return a});this.g=a}na(Y,W" +
+    ");Y.prototype.next=function(){return this.g.next()};function yc(a," +
+    "b){this.h={};this.g=[];this.j=this.size=0;var c=arguments.length;i" +
+    "f(1<c){if(c%2)throw Error(\"Uneven number of arguments\");for(var d=" +
+    "0;d<c;d+=2)this.set(arguments[d],arguments[d+1])}else if(a)if(a in" +
+    "stanceof yc)for(c=zc(a),d=0;d<c.length;d++)this.set(c[d],a.get(c[d" +
+    "]));else for(d in a)this.set(d,a[d])}function zc(a){Ac(a);return a" +
+    ".g.concat()}h=yc.prototype;h.has=function(a){return Object.prototy" +
+    "pe.hasOwnProperty.call(this.h,a)};\nfunction Ac(a){if(a.size!=a.g.l" +
+    "ength){for(var b=0,c=0;b<a.g.length;){var d=a.g[b];Object.prototyp" +
+    "e.hasOwnProperty.call(a.h,d)&&(a.g[c++]=d);b++}a.g.length=c}if(a.s" +
+    "ize!=a.g.length){var e={};for(c=b=0;b<a.g.length;)d=a.g[b],Object." +
+    "prototype.hasOwnProperty.call(e,d)||(a.g[c++]=d,e[d]=1),b++;a.g.le" +
+    "ngth=c}}h.get=function(a,b){return Object.prototype.hasOwnProperty" +
+    ".call(this.h,a)?this.h[a]:b};\nh.set=function(a,b){Object.prototype" +
+    ".hasOwnProperty.call(this.h,a)||(this.size+=1,this.g.push(a),this." +
+    "j++);this.h[a]=b};h.forEach=function(a,b){for(var c=zc(this),d=0;d" +
+    "<c.length;d++){var e=c[d],f=this.get(e);a.call(b,f,e,this)}};h.key" +
+    "s=function(){return xc(this.D(!0)).h()};h.values=function(){return" +
+    " xc(this.D(!1)).h()};h.entries=function(){var a=this;return uc(thi" +
+    "s.keys(),function(b){return[b,a.get(b)]})};\nh.D=function(a){Ac(thi" +
+    "s);var b=0,c=this.j,d=this,e=new vc;e.next=function(){if(c!=d.j)th" +
+    "row Error(\"The map has changed since the iterator was created\");if" +
+    "(b>=d.g.length)return wc;var f=d.g[b++];return{value:a?f:d.h[f],do" +
+    "ne:!1}};return e};var Bc={};function Z(a,b,c){var d=typeof a;(\"obj" +
+    "ect\"==d&&null!=a||\"function\"==d)&&(a=a.l);a=new Cc(a);!b||b in Bc&" +
+    "&!c||(Bc[b]={key:a,shift:!1},c&&(Bc[c]={key:a,shift:!0}));return a" +
+    "}function Cc(a){this.code=a}Z(8);Z(9);Z(13);var Dc=Z(16),Ec=Z(17)," +
+    "Fc=Z(18);Z(19);Z(20);Z(27);Z(32,\" \");Z(33);Z(34);Z(35);Z(36);Z(37)" +
+    ";Z(38);Z(39);Z(40);Z(44);Z(45);Z(46);Z(48,\"0\",\")\");Z(49,\"1\",\"!\");Z" +
+    "(50,\"2\",\"@\");Z(51,\"3\",\"#\");Z(52,\"4\",\"$\");Z(53,\"5\",\"%\");Z(54,\"6\",\"^" +
+    "\");Z(55,\"7\",\"&\");Z(56,\"8\",\"*\");Z(57,\"9\",\"(\");Z(65,\"a\",\"A\");\nZ(66,\"" +
+    "b\",\"B\");Z(67,\"c\",\"C\");Z(68,\"d\",\"D\");Z(69,\"e\",\"E\");Z(70,\"f\",\"F\");Z(" +
+    "71,\"g\",\"G\");Z(72,\"h\",\"H\");Z(73,\"i\",\"I\");Z(74,\"j\",\"J\");Z(75,\"k\",\"K\"" +
+    ");Z(76,\"l\",\"L\");Z(77,\"m\",\"M\");Z(78,\"n\",\"N\");Z(79,\"o\",\"O\");Z(80,\"p\"" +
+    ",\"P\");Z(81,\"q\",\"Q\");Z(82,\"r\",\"R\");Z(83,\"s\",\"S\");Z(84,\"t\",\"T\");Z(85" +
+    ",\"u\",\"U\");Z(86,\"v\",\"V\");Z(87,\"w\",\"W\");Z(88,\"x\",\"X\");Z(89,\"y\",\"Y\");" +
+    "Z(90,\"z\",\"Z\");var Gc=Z(Ga?{m:91,l:91}:Fa?{m:224,l:91}:{m:0,l:91});" +
+    "Z(Ga?{m:92,l:92}:Fa?{m:224,l:93}:{m:0,l:92});Z(Ga?{m:93,l:93}:Fa?{" +
+    "m:0,l:0}:{m:93,l:null});\nZ({m:96,l:96},\"0\");Z({m:97,l:97},\"1\");Z({" +
+    "m:98,l:98},\"2\");Z({m:99,l:99},\"3\");Z({m:100,l:100},\"4\");Z({m:101,l" +
+    ":101},\"5\");Z({m:102,l:102},\"6\");Z({m:103,l:103},\"7\");Z({m:104,l:10" +
+    "4},\"8\");Z({m:105,l:105},\"9\");Z({m:106,l:106},\"*\");Z({m:107,l:107}," +
+    "\"+\");Z({m:109,l:109},\"-\");Z({m:110,l:110},\".\");Z({m:111,l:111},\"/\"" +
+    ");Z(144);Z(112);Z(113);Z(114);Z(115);Z(116);Z(117);Z(118);Z(119);Z" +
+    "(120);Z(121);Z(122);Z(123);Z({m:107,l:187},\"=\",\"+\");Z(108,\",\");Z({" +
+    "m:109,l:189},\"-\",\"_\");Z(188,\",\",\"<\");Z(190,\".\",\">\");Z(191,\"/\",\"?\")" +
+    ";\nZ(192,\"`\",\"~\");Z(219,\"[\",\"{\");Z(220,\"\\\\\",\"|\");Z(221,\"]\",\"}\");Z({" +
+    "m:59,l:186},\";\",\":\");Z(222,\"'\",'\"');var Hc=new yc;Hc.set(1,Dc);Hc." +
+    "set(2,Ec);Hc.set(4,Fc);Hc.set(8,Gc);(function(a){var b=new yc;p(Ar" +
+    "ray.from(a.keys()),function(c){b.set(a.get(c).code,c)});return b})" +
+    "(Hc);pa(\"_\",function(a,b){var c=oc(a,b);if(\"scroll\"!=c)return\"none" +
+    "\"==c;if(a.scrollIntoView&&(a.scrollIntoView(),\"none\"==oc(a,b)))ret" +
+    "urn!0;c=pc(a,b);for(var d=mc(a);d;d=mc(d)){var e=d,f=qc(e);var g=e" +
+    ";var k=Pa(g,\"borderLeftWidth\");var q=Pa(g,\"borderRightWidth\");var " +
+    "t=Pa(g,\"borderTopWidth\");g=Pa(g,\"borderBottomWidth\");q=new Oa(pars" +
+    "eFloat(t),parseFloat(q),parseFloat(g),parseFloat(k));k=c.left-f.le" +
+    "ft-q.left;f=c.top-f.top-q.top;q=e.clientHeight+c.top-c.h;e.scrollL" +
+    "eft+=Math.min(k,Math.max(k-(e.clientWidth+c.left-\nc.g),0));e.scrol" +
+    "lTop+=Math.min(f,Math.max(f-q,0))}return\"none\"==oc(a,b)});;return " +
+    "this._.apply(null,arguments);}).apply({navigator:typeof window!=\"u" +
+    "ndefined\"?window.navigator:null},arguments);}\n"
+  )
+  .toString();
+  static final String SCROLL_INTO_VIEW_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String SCROLL_INTO_VIEW_ANDROID_original() {
+    return SCROLL_INTO_VIEW_ANDROID.replaceAll("xxx_rpl_lic", SCROLL_INTO_VIEW_ANDROID_license);
+  }
+
+/* field: SEND_KEYS_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String SEND_KEYS_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar h;function aa(a" +
+    "){var b=0;return function(){return b<a.length?{done:!1,value:a[b++" +
+    "]}:{done:!0}}}var ba=\"function\"==typeof Object.defineProperties?Ob" +
+    "ject.defineProperty:function(a,b,c){if(a==Array.prototype||a==Obje" +
+    "ct.prototype)return a;a[b]=c.value;return a};\nfunction ca(a){a=[\"o" +
+    "bject\"==typeof globalThis&&globalThis,a,\"object\"==typeof window&&w" +
+    "indow,\"object\"==typeof self&&self,\"object\"==typeof global&&global]" +
+    ";for(var b=0;b<a.length;++b){var c=a[b];if(c&&c.Math==Math)return " +
+    "c}throw Error(\"Cannot find global object\");}var da=ca(this);functi" +
+    "on ea(a,b){if(b)a:{var c=da;a=a.split(\".\");for(var d=0;d<a.length-" +
+    "1;d++){var e=a[d];if(!(e in c))break a;c=c[e]}a=a[a.length-1];d=c[" +
+    "a];b=b(d);b!=d&&null!=b&&ba(c,a,{configurable:!0,writable:!0,value" +
+    ":b})}}\nea(\"Symbol\",function(a){function b(f){if(this instanceof b)" +
+    "throw new TypeError(\"Symbol is not a constructor\");return new c(d+" +
+    "(f||\"\")+\"_\"+e++,f)}function c(f,g){this.g=f;ba(this,\"description\"," +
+    "{configurable:!0,writable:!0,value:g})}if(a)return a;c.prototype.t" +
+    "oString=function(){return this.g};var d=\"jscomp_symbol_\"+(1E9*Math" +
+    ".random()>>>0)+\"_\",e=0;return b});\nea(\"Symbol.iterator\",function(a" +
+    "){if(a)return a;a=Symbol(\"Symbol.iterator\");for(var b=\"Array Int8A" +
+    "rray Uint8Array Uint8ClampedArray Int16Array Uint16Array Int32Arra" +
+    "y Uint32Array Float32Array Float64Array\".split(\" \"),c=0;c<b.length" +
+    ";c++){var d=da[b[c]];\"function\"===typeof d&&\"function\"!=typeof d.p" +
+    "rototype[a]&&ba(d.prototype,a,{configurable:!0,writable:!0,value:f" +
+    "unction(){return fa(aa(this))}})}return a});function fa(a){a={next" +
+    ":a};a[Symbol.iterator]=function(){return this};return a}\nvar ha=\"f" +
+    "unction\"==typeof Object.create?Object.create:function(a){function " +
+    "b(){}b.prototype=a;return new b},ia;if(\"function\"==typeof Object.s" +
+    "etPrototypeOf)ia=Object.setPrototypeOf;else{var ja;a:{var ka={a:!0" +
+    "},la={};try{la.__proto__=ka;ja=la.a;break a}catch(a){}ja=!1}ia=ja?" +
+    "function(a,b){a.__proto__=b;if(a.__proto__!==b)throw new TypeError" +
+    "(a+\" is not extensible\");return a}:null}var ma=ia;\nfunction na(a,b" +
+    "){a.prototype=ha(b.prototype);a.prototype.constructor=a;if(ma)ma(a" +
+    ",b);else for(var c in b)if(\"prototype\"!=c)if(Object.defineProperti" +
+    "es){var d=Object.getOwnPropertyDescriptor(b,c);d&&Object.definePro" +
+    "perty(a,c,d)}else a[c]=b[c];a.T=b.prototype}function oa(a,b){a ins" +
+    "tanceof String&&(a+=\"\");var c=0,d=!1,e={next:function(){if(!d&&c<a" +
+    ".length){var f=c++;return{value:b(f,a[f]),done:!1}}d=!0;return{don" +
+    "e:!0,value:void 0}}};e[Symbol.iterator]=function(){return e};retur" +
+    "n e}\nea(\"Array.prototype.keys\",function(a){return a?a:function(){r" +
+    "eturn oa(this,function(b){return b})}});ea(\"Array.from\",function(a" +
+    "){return a?a:function(b,c,d){c=null!=c?c:function(k){return k};var" +
+    " e=[],f=\"undefined\"!=typeof Symbol&&Symbol.iterator&&b[Symbol.iter" +
+    "ator];if(\"function\"==typeof f){b=f.call(b);for(var g=0;!(f=b.next(" +
+    ")).done;)e.push(c.call(d,f.value,g++))}else for(f=b.length,g=0;g<f" +
+    ";g++)e.push(c.call(d,b[g],g));return e}});\nea(\"Array.prototype.val" +
+    "ues\",function(a){return a?a:function(){return oa(this,function(b,c" +
+    "){return c})}});var pa=this||self;function qa(a,b){a=a.split(\".\");" +
+    "var c=pa;a[0]in c||\"undefined\"==typeof c.execScript||c.execScript(" +
+    "\"var \"+a[0]);for(var d;a.length&&(d=a.shift());)a.length||void 0==" +
+    "=b?c[d]&&c[d]!==Object.prototype[d]?c=c[d]:c=c[d]={}:c[d]=b}var ra" +
+    "=\"closure_uid_\"+(1E9*Math.random()>>>0),sa=0;function ta(a,b,c){re" +
+    "turn a.call.apply(a.bind,arguments)}\nfunction ua(a,b,c){if(!a)thro" +
+    "w Error();if(2<arguments.length){var d=Array.prototype.slice.call(" +
+    "arguments,2);return function(){var e=Array.prototype.slice.call(ar" +
+    "guments);Array.prototype.unshift.apply(e,d);return a.apply(b,e)}}r" +
+    "eturn function(){return a.apply(b,arguments)}}function va(a,b,c){F" +
+    "unction.prototype.bind&&-1!=Function.prototype.bind.toString().ind" +
+    "exOf(\"native code\")?va=ta:va=ua;return va.apply(null,arguments)}\nf" +
+    "unction wa(a,b){var c=Array.prototype.slice.call(arguments,1);retu" +
+    "rn function(){var d=c.slice();d.push.apply(d,arguments);return a.a" +
+    "pply(this,d)}}function n(a,b){function c(){}c.prototype=b.prototyp" +
+    "e;a.T=b.prototype;a.prototype=new c;a.prototype.constructor=a;a.V=" +
+    "function(d,e,f){for(var g=Array(arguments.length-2),k=2;k<argument" +
+    "s.length;k++)g[k-2]=arguments[k];return b.prototype[e].apply(d,g)}" +
+    "};function xa(a,b){if(Error.captureStackTrace)Error.captureStackTr" +
+    "ace(this,xa);else{var c=Error().stack;c&&(this.stack=c)}a&&(this.m" +
+    "essage=String(a));void 0!==b&&(this.cause=b)}n(xa,Error);xa.protot" +
+    "ype.name=\"CustomError\";function ya(a,b){a=a.split(\"%s\");for(var c=" +
+    "\"\",d=a.length-1,e=0;e<d;e++)c+=a[e]+(e<b.length?b[e]:\"%s\");xa.call" +
+    "(this,c+a[d])}n(ya,xa);ya.prototype.name=\"AssertionError\";function" +
+    " za(a,b,c){if(!a){var d=\"Assertion failed\";if(b){d+=\": \"+b;var e=A" +
+    "rray.prototype.slice.call(arguments,2)}throw new ya(\"\"+d,e||[]);}}" +
+    ";function Aa(a,b){if(\"string\"===typeof a)return\"string\"!==typeof b" +
+    "||1!=b.length?-1:a.indexOf(b,0);for(var c=0;c<a.length;c++)if(c in" +
+    " a&&a[c]===b)return c;return-1}function p(a,b,c){for(var d=a.lengt" +
+    "h,e=\"string\"===typeof a?a.split(\"\"):a,f=0;f<d;f++)f in e&&b.call(c" +
+    ",e[f],f,a)}function Ba(a,b,c){var d=c;p(a,function(e,f){d=b.call(v" +
+    "oid 0,d,e,f,a)});return d}function q(a,b){for(var c=a.length,d=\"st" +
+    "ring\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)if(e in d&&b.call(void " +
+    "0,d[e],e,a))return!0;return!1}\nfunction Ca(a,b){for(var c=a.length" +
+    ",d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)if(e in d&&!b.cal" +
+    "l(void 0,d[e],e,a))return!1;return!0}function Da(a){return Array.p" +
+    "rototype.concat.apply([],arguments)}function Ea(a,b,c){za(null!=a." +
+    "length);return 2>=arguments.length?Array.prototype.slice.call(a,b)" +
+    ":Array.prototype.slice.call(a,b,c)};var Fa=String.prototype.trim?f" +
+    "unction(a){return a.trim()}:function(a){return/^[\\s\\xa0]*([\\s\\S]*?" +
+    ")[\\s\\xa0]*$/.exec(a)[1]};function Ga(a,b){return a<b?-1:a>b?1:0};f" +
+    "unction Ha(){var a=pa.navigator;return a&&(a=a.userAgent)?a:\"\"};/*" +
+    "\n\n Copyright 2014 Software Freedom Conservancy\n\n Licensed under th" +
+    "e Apache License, Version 2.0 (the \"License\");\n you may not use th" +
+    "is file except in compliance with the License.\n You may obtain a c" +
+    "opy of the License at\n\n      http://www.apache.org/licenses/LICENS" +
+    "E-2.0\n\n Unless required by applicable law or agreed to in writing," +
+    " software\n distributed under the License is distributed on an \"AS " +
+    "IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either e" +
+    "xpress or implied.\n See the License for the specific language gove" +
+    "rning permissions and\n limitations under the License.\n*/\nfunction " +
+    "Ia(a){var b=Ja;return Object.prototype.hasOwnProperty.call(b,534)?" +
+    "b[534]:b[534]=a(534)};var Ka=-1!=Ha().indexOf(\"Macintosh\"),La=-1!=" +
+    "Ha().indexOf(\"Windows\"),Ma,Na=\"\",Oa=/WebKit\\/(\\S+)/.exec(Ha());Oa&" +
+    "&(Na=Oa?Oa[1]:\"\");Ma=Na;var Ja={};\nfunction Pa(){return Ia(functio" +
+    "n(){for(var a=0,b=Fa(String(Ma)).split(\".\"),c=Fa(\"534\").split(\".\")" +
+    ",d=Math.max(b.length,c.length),e=0;0==a&&e<d;e++){var f=b[e]||\"\",g" +
+    "=c[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D" +
+    "*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].length&&0==g[0].length)b" +
+    "reak;a=Ga(0==f[1].length?0:parseInt(f[1],10),0==g[1].length?0:pars" +
+    "eInt(g[1],10))||Ga(0==f[2].length,0==g[2].length)||Ga(f[2],g[2]);f" +
+    "=f[3];g=g[3]}while(0==a)}return 0<=a})};function Qa(a,b){this.x=vo" +
+    "id 0!==a?a:0;this.y=void 0!==b?b:0}h=Qa.prototype;h.toString=funct" +
+    "ion(){return\"(\"+this.x+\", \"+this.y+\")\"};h.ceil=function(){this.x=M" +
+    "ath.ceil(this.x);this.y=Math.ceil(this.y);return this};h.floor=fun" +
+    "ction(){this.x=Math.floor(this.x);this.y=Math.floor(this.y);return" +
+    " this};h.round=function(){this.x=Math.round(this.x);this.y=Math.ro" +
+    "und(this.y);return this};h.scale=function(a,b){this.x*=a;this.y*=\"" +
+    "number\"===typeof b?b:a;return this};function Ra(a,b){this.width=a;" +
+    "this.height=b}h=Ra.prototype;h.toString=function(){return\"(\"+this." +
+    "width+\" x \"+this.height+\")\"};h.aspectRatio=function(){return this." +
+    "width/this.height};h.ceil=function(){this.width=Math.ceil(this.wid" +
+    "th);this.height=Math.ceil(this.height);return this};h.floor=functi" +
+    "on(){this.width=Math.floor(this.width);this.height=Math.floor(this" +
+    ".height);return this};h.round=function(){this.width=Math.round(thi" +
+    "s.width);this.height=Math.round(this.height);return this};\nh.scale" +
+    "=function(a,b){this.width*=a;this.height*=\"number\"===typeof b?b:a;" +
+    "return this};function Sa(a){return String(a).replace(/\\-([a-z])/g," +
+    "function(b,c){return c.toUpperCase()})};function Ta(a){for(;a&&1!=" +
+    "a.nodeType;)a=a.previousSibling;return a}function Ua(a,b){if(!a||!" +
+    "b)return!1;if(a.contains&&1==b.nodeType)return a==b||a.contains(b)" +
+    ";if(\"undefined\"!=typeof a.compareDocumentPosition)return a==b||!!(" +
+    "a.compareDocumentPosition(b)&16);for(;b&&a!=b;)b=b.parentNode;retu" +
+    "rn b==a}\nfunction Va(a,b){if(a==b)return 0;if(a.compareDocumentPos" +
+    "ition)return a.compareDocumentPosition(b)&2?1:-1;if(\"sourceIndex\"i" +
+    "n a||a.parentNode&&\"sourceIndex\"in a.parentNode){var c=1==a.nodeTy" +
+    "pe,d=1==b.nodeType;if(c&&d)return a.sourceIndex-b.sourceIndex;var " +
+    "e=a.parentNode,f=b.parentNode;return e==f?Wa(a,b):!c&&Ua(e,b)?-1*X" +
+    "a(a,b):!d&&Ua(f,a)?Xa(b,a):(c?a.sourceIndex:e.sourceIndex)-(d?b.so" +
+    "urceIndex:f.sourceIndex)}d=u(a);c=d.createRange();c.selectNode(a);" +
+    "c.collapse(!0);a=d.createRange();a.selectNode(b);\na.collapse(!0);r" +
+    "eturn c.compareBoundaryPoints(pa.Range.START_TO_END,a)}function Xa" +
+    "(a,b){var c=a.parentNode;if(c==b)return-1;for(;b.parentNode!=c;)b=" +
+    "b.parentNode;return Wa(b,a)}function Wa(a,b){for(;b=b.previousSibl" +
+    "ing;)if(b==a)return-1;return 1}function u(a){za(a,\"Node cannot be " +
+    "null or undefined.\");return 9==a.nodeType?a:a.ownerDocument||a.doc" +
+    "ument}function Ya(a,b,c){a&&!c&&(a=a.parentNode);for(c=0;a;){za(\"p" +
+    "arentNode\"!=a.name);if(b(a))return a;a=a.parentNode;c++}return nul" +
+    "l}\nfunction Za(a){try{var b=a&&a.activeElement;return b&&b.nodeNam" +
+    "e?b:null}catch(c){return null}}function $a(a){this.g=a||pa.documen" +
+    "t||document}$a.prototype.getElementsByTagName=function(a,b){return" +
+    "(b||this.g).getElementsByTagName(String(a))};function ab(a,b,c,d){" +
+    "this.top=a;this.g=b;this.h=c;this.left=d}h=ab.prototype;h.toString" +
+    "=function(){return\"(\"+this.top+\"t, \"+this.g+\"r, \"+this.h+\"b, \"+thi" +
+    "s.left+\"l)\"};h.ceil=function(){this.top=Math.ceil(this.top);this.g" +
+    "=Math.ceil(this.g);this.h=Math.ceil(this.h);this.left=Math.ceil(th" +
+    "is.left);return this};h.floor=function(){this.top=Math.floor(this." +
+    "top);this.g=Math.floor(this.g);this.h=Math.floor(this.h);this.left" +
+    "=Math.floor(this.left);return this};\nh.round=function(){this.top=M" +
+    "ath.round(this.top);this.g=Math.round(this.g);this.h=Math.round(th" +
+    "is.h);this.left=Math.round(this.left);return this};h.scale=functio" +
+    "n(a,b){b=\"number\"===typeof b?b:a;this.left*=a;this.g*=a;this.top*=" +
+    "b;this.h*=b;return this};function w(a,b,c,d){this.left=a;this.top=" +
+    "b;this.width=c;this.height=d}h=w.prototype;h.toString=function(){r" +
+    "eturn\"(\"+this.left+\", \"+this.top+\" - \"+this.width+\"w x \"+this.heig" +
+    "ht+\"h)\"};h.ceil=function(){this.left=Math.ceil(this.left);this.top" +
+    "=Math.ceil(this.top);this.width=Math.ceil(this.width);this.height=" +
+    "Math.ceil(this.height);return this};h.floor=function(){this.left=M" +
+    "ath.floor(this.left);this.top=Math.floor(this.top);this.width=Math" +
+    ".floor(this.width);this.height=Math.floor(this.height);return this" +
+    "};\nh.round=function(){this.left=Math.round(this.left);this.top=Mat" +
+    "h.round(this.top);this.width=Math.round(this.width);this.height=Ma" +
+    "th.round(this.height);return this};h.scale=function(a,b){b=\"number" +
+    "\"===typeof b?b:a;this.left*=a;this.width*=a;this.top*=b;this.heigh" +
+    "t*=b;return this};function bb(a,b){var c=u(a);return c.defaultView" +
+    "&&c.defaultView.getComputedStyle&&(a=c.defaultView.getComputedStyl" +
+    "e(a,null))?a[b]||a.getPropertyValue(b)||\"\":\"\"};var cb=window;funct" +
+    "ion x(a,b){this.code=a;this.g=db[a]||\"unknown error\";this.message=" +
+    "b||\"\";a=this.g.replace(/((?:^|\\s+)[a-z])/g,function(c){return c.to" +
+    "UpperCase().replace(/^[\\s\\xa0]+/g,\"\")});b=a.length-5;if(0>b||a.ind" +
+    "exOf(\"Error\",b)!=b)a+=\"Error\";this.name=a;a=Error(this.message);a." +
+    "name=this.name;this.stack=a.stack||\"\"}n(x,Error);\nvar db={15:\"elem" +
+    "ent not selectable\",11:\"element not visible\",31:\"unknown error\",30" +
+    ":\"unknown error\",24:\"invalid cookie domain\",29:\"invalid element co" +
+    "ordinates\",12:\"invalid element state\",32:\"invalid selector\",51:\"in" +
+    "valid selector\",52:\"invalid selector\",17:\"javascript error\",405:\"u" +
+    "nsupported operation\",34:\"move target out of bounds\",27:\"no such a" +
+    "lert\",7:\"no such element\",8:\"no such frame\",23:\"no such window\",28" +
+    ":\"script timeout\",33:\"session not created\",10:\"stale element refer" +
+    "ence\",21:\"timeout\",25:\"unable to set cookie\",\n26:\"unexpected alert" +
+    " open\",13:\"unknown error\",9:\"unknown command\"};x.prototype.toStrin" +
+    "g=function(){return this.name+\": \"+this.message};function eb(a){re" +
+    "turn(a=a.exec(Ha()))?a[1]:\"\"}eb(/Android\\s+([0-9.]+)/)||eb(/Versio" +
+    "n\\/([0-9.]+)/);/*\n\n The MIT License\n\n Copyright (c) 2007 Cybozu La" +
+    "bs, Inc.\n Copyright (c) 2012 Google Inc.\n\n Permission is hereby gr" +
+    "anted, free of charge, to any person obtaining a copy\n of this sof" +
+    "tware and associated documentation files (the \"Software\"), to\n dea" +
+    "l in the Software without restriction, including without limitatio" +
+    "n the\n rights to use, copy, modify, merge, publish, distribute, su" +
+    "blicense, and/or\n sell copies of the Software, and to permit perso" +
+    "ns to whom the Software is\n furnished to do so, subject to the fol" +
+    "lowing conditions:\n\n The above copyright notice and this permissio" +
+    "n notice shall be included in\n all copies or substantial portions " +
+    "of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRA" +
+    "NTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO" +
+    " THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURP" +
+    "OSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIG" +
+    "HT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, W" +
+    "HETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n FROM," +
+    " OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEA" +
+    "LINGS\n IN THE SOFTWARE.\n*/\nfunction fb(a,b,c){this.g=a;this.j=b||1" +
+    ";this.h=c||1};function gb(a){this.h=a;this.g=0}function hb(a){a=a." +
+    "match(ib);for(var b=0;b<a.length;b++)jb.test(a[b])&&a.splice(b,1);" +
+    "return new gb(a)}var ib=RegExp(\"\\\\$?(?:(?![0-9-])[\\\\w-]+:)?(?![0-9" +
+    "-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[^\\\"]*\\\"|'[" +
+    "^']*'|[!<>]=|\\\\s+|.\",\"g\"),jb=/^\\s/;function y(a,b){return a.h[a.g+" +
+    "(b||0)]}gb.prototype.next=function(){return this.h[this.g++]};func" +
+    "tion kb(a){return a.h.length<=a.g};function z(a){var b=null,c=a.no" +
+    "deType;1==c&&(b=a.textContent,b=void 0==b||null==b?a.innerText:b,b" +
+    "=void 0==b||null==b?\"\":b);if(\"string\"!=typeof b)if(9==c||1==c){a=9" +
+    "==c?a.documentElement:a.firstChild;c=0;var d=[];for(b=\"\";a;){do 1!" +
+    "=a.nodeType&&(b+=a.nodeValue),d[c++]=a;while(a=a.firstChild);for(;" +
+    "c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;return\"\"+b}\nfunc" +
+    "tion lb(a,b,c){if(null===b)return!0;try{if(!a.getAttribute)return!" +
+    "1}catch(d){return!1}return null==c?!!a.getAttribute(b):a.getAttrib" +
+    "ute(b,2)==c}function mb(a,b,c,d,e){return nb.call(null,a,b,\"string" +
+    "\"===typeof c?c:null,\"string\"===typeof d?d:null,e||new A)}\nfunction" +
+    " nb(a,b,c,d,e){b.getElementsByName&&d&&\"name\"==c?(b=b.getElementsB" +
+    "yName(d),p(b,function(f){a.g(f)&&e.add(f)})):b.getElementsByClassN" +
+    "ame&&d&&\"class\"==c?(b=b.getElementsByClassName(d),p(b,function(f){" +
+    "f.className==d&&a.g(f)&&e.add(f)})):a instanceof B?ob(a,b,c,d,e):b" +
+    ".getElementsByTagName&&(b=b.getElementsByTagName(a.j()),p(b,functi" +
+    "on(f){lb(f,c,d)&&e.add(f)}));return e}function ob(a,b,c,d,e){for(b" +
+    "=b.firstChild;b;b=b.nextSibling)lb(b,c,d)&&a.g(b)&&e.add(b),ob(a,b" +
+    ",c,d,e)};function A(){this.j=this.g=null;this.h=0}function pb(a){t" +
+    "his.h=a;this.next=this.g=null}function qb(a,b){if(!a.g)return b;if" +
+    "(!b.g)return a;var c=a.g;b=b.g;for(var d=null,e,f=0;c&&b;)c.h==b.h" +
+    "?(e=c,c=c.next,b=b.next):0<Va(c.h,b.h)?(e=b,b=b.next):(e=c,c=c.nex" +
+    "t),(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;)e.g=d,d=d.next=e,f" +
+    "++,e=e.next;a.j=d;a.h=f;return a}function rb(a,b){b=new pb(b);b.ne" +
+    "xt=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nA.prototype.add=function" +
+    "(a){a=new pb(a);a.g=this.j;this.g?this.j.next=a:this.g=this.j=a;th" +
+    "is.j=a;this.h++};function sb(a){return(a=a.g)?a.h:null}function tb" +
+    "(a){return(a=sb(a))?z(a):\"\"}function C(a,b){return new ub(a,!!b)}f" +
+    "unction ub(a,b){this.j=a;this.h=(this.F=b)?a.j:a.g;this.g=null}ub." +
+    "prototype.next=function(){var a=this.h;if(null==a)return null;var " +
+    "b=this.g=a;this.h=this.F?a.g:a.next;return b.h};function vb(a){swi" +
+    "tch(a.nodeType){case 1:return wa(wb,a);case 9:return vb(a.document" +
+    "Element);case 11:case 10:case 6:case 12:return xb;default:return a" +
+    ".parentNode?vb(a.parentNode):xb}}function xb(){return null}functio" +
+    "n wb(a,b){if(a.prefix==b)return a.namespaceURI||\"http://www.w3.org" +
+    "/1999/xhtml\";var c=a.getAttributeNode(\"xmlns:\"+b);return c&&c.spec" +
+    "ified?c.value||null:a.parentNode&&9!=a.parentNode.nodeType?wb(a.pa" +
+    "rentNode,b):null};function E(a){this.u=a;this.h=this.o=!1;this.j=n" +
+    "ull}function F(a){return\"\\n  \"+a.toString().split(\"\\n\").join(\"\\n  " +
+    "\")}function yb(a,b){a.o=b}function zb(a,b){a.h=b}function G(a,b){a" +
+    "=a.g(b);return a instanceof A?+tb(a):+a}function H(a,b){a=a.g(b);r" +
+    "eturn a instanceof A?tb(a):\"\"+a}function Ab(a,b){a=a.g(b);return a" +
+    " instanceof A?!!a.h:!!a};function Bb(a,b,c){E.call(this,a.u);this." +
+    "i=a;this.s=b;this.D=c;this.o=b.o||c.o;this.h=b.h||c.h;this.i==Cb&&" +
+    "(c.h||c.o||4==c.u||0==c.u||!b.j?b.h||b.o||4==b.u||0==b.u||!c.j||(t" +
+    "his.j={name:c.j.name,G:b}):this.j={name:b.j.name,G:c})}n(Bb,E);\nfu" +
+    "nction Db(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;if(b instanceof A&&c " +
+    "instanceof A){b=C(b);for(d=b.next();d;d=b.next())for(e=C(c),f=e.ne" +
+    "xt();f;f=e.next())if(a(z(d),z(f)))return!0;return!1}if(b instanceo" +
+    "f A||c instanceof A){b instanceof A?(e=b,d=c):(e=c,d=b);f=C(e);for" +
+    "(var g=typeof d,k=f.next();k;k=f.next()){switch(g){case \"number\":k" +
+    "=+z(k);break;case \"boolean\":k=!!z(k);break;case \"string\":k=z(k);br" +
+    "eak;default:throw Error(\"Illegal primitive type for comparison.\");" +
+    "}if(e==b&&a(k,d)||e==c&&a(d,k))return!0}return!1}return e?\n\"boolea" +
+    "n\"==typeof b||\"boolean\"==typeof c?a(!!b,!!c):\"number\"==typeof b||\"" +
+    "number\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}Bb.prototype.g=function" +
+    "(a){return this.i.A(this.s,this.D,a)};Bb.prototype.toString=functi" +
+    "on(){var a=\"Binary Expression: \"+this.i;a+=F(this.s);return a+=F(t" +
+    "his.D)};function Fb(a,b,c,d){this.R=a;this.M=b;this.u=c;this.A=d}F" +
+    "b.prototype.toString=function(){return this.R};var Gb={};\nfunction" +
+    " I(a,b,c,d){if(Gb.hasOwnProperty(a))throw Error(\"Binary operator a" +
+    "lready created: \"+a);a=new Fb(a,b,c,d);return Gb[a.toString()]=a}I" +
+    "(\"div\",6,1,function(a,b,c){return G(a,c)/G(b,c)});I(\"mod\",6,1,func" +
+    "tion(a,b,c){return G(a,c)%G(b,c)});I(\"*\",6,1,function(a,b,c){retur" +
+    "n G(a,c)*G(b,c)});I(\"+\",5,1,function(a,b,c){return G(a,c)+G(b,c)})" +
+    ";I(\"-\",5,1,function(a,b,c){return G(a,c)-G(b,c)});I(\"<\",4,2,functi" +
+    "on(a,b,c){return Db(function(d,e){return d<e},a,b,c)});\nI(\">\",4,2," +
+    "function(a,b,c){return Db(function(d,e){return d>e},a,b,c)});I(\"<=" +
+    "\",4,2,function(a,b,c){return Db(function(d,e){return d<=e},a,b,c)}" +
+    ");I(\">=\",4,2,function(a,b,c){return Db(function(d,e){return d>=e}," +
+    "a,b,c)});var Cb=I(\"=\",3,2,function(a,b,c){return Db(function(d,e){" +
+    "return d==e},a,b,c,!0)});I(\"!=\",3,2,function(a,b,c){return Db(func" +
+    "tion(d,e){return d!=e},a,b,c,!0)});I(\"and\",2,2,function(a,b,c){ret" +
+    "urn Ab(a,c)&&Ab(b,c)});I(\"or\",1,2,function(a,b,c){return Ab(a,c)||" +
+    "Ab(b,c)});function Hb(a,b){if(b.g.length&&4!=a.u)throw Error(\"Prim" +
+    "ary expression must evaluate to nodeset if filter has predicate(s)" +
+    ".\");E.call(this,a.u);this.s=a;this.i=b;this.o=a.o;this.h=a.h}n(Hb," +
+    "E);Hb.prototype.g=function(a){a=this.s.g(a);return Ib(this.i,a)};H" +
+    "b.prototype.toString=function(){var a=\"Filter:\"+F(this.s);return a" +
+    "+=F(this.i)};function Jb(a,b){if(b.length<a.L)throw Error(\"Functio" +
+    "n \"+a.v+\" expects at least\"+a.L+\" arguments, \"+b.length+\" given\");" +
+    "if(null!==a.H&&b.length>a.H)throw Error(\"Function \"+a.v+\" expects " +
+    "at most \"+a.H+\" arguments, \"+b.length+\" given\");a.P&&p(b,function(" +
+    "c,d){if(4!=c.u)throw Error(\"Argument \"+d+\" to function \"+a.v+\" is " +
+    "not of type Nodeset: \"+c);});E.call(this,a.u);this.C=a;this.i=b;yb" +
+    "(this,a.o||q(b,function(c){return c.o}));zb(this,a.O&&!b.length||a" +
+    ".N&&!!b.length||q(b,function(c){return c.h}))}n(Jb,E);\nJb.prototyp" +
+    "e.g=function(a){return this.C.A.apply(null,Da(a,this.i))};Jb.proto" +
+    "type.toString=function(){var a=\"Function: \"+this.C;if(this.i.lengt" +
+    "h){var b=Ba(this.i,function(c,d){return c+F(d)},\"Arguments:\");a+=F" +
+    "(b)}return a};function Kb(a,b,c,d,e,f,g,k){this.v=a;this.u=b;this." +
+    "o=c;this.O=d;this.N=!1;this.A=e;this.L=f;this.H=void 0!==g?g:f;thi" +
+    "s.P=!!k}Kb.prototype.toString=function(){return this.v};var Lb={};" +
+    "\nfunction J(a,b,c,d,e,f,g,k){if(Lb.hasOwnProperty(a))throw Error(\"" +
+    "Function already created: \"+a+\".\");Lb[a]=new Kb(a,b,c,d,e,f,g,k)}J" +
+    "(\"boolean\",2,!1,!1,function(a,b){return Ab(b,a)},1);J(\"ceiling\",1," +
+    "!1,!1,function(a,b){return Math.ceil(G(b,a))},1);J(\"concat\",3,!1,!" +
+    "1,function(a,b){var c=Ea(arguments,1);return Ba(c,function(d,e){re" +
+    "turn d+H(e,a)},\"\")},2,null);J(\"contains\",2,!1,!1,function(a,b,c){b" +
+    "=H(b,a);a=H(c,a);return-1!=b.indexOf(a)},2);J(\"count\",1,!1,!1,func" +
+    "tion(a,b){return b.g(a).h},1,1,!0);\nJ(\"false\",2,!1,!1,function(){r" +
+    "eturn!1},0);J(\"floor\",1,!1,!1,function(a,b){return Math.floor(G(b," +
+    "a))},1);J(\"id\",4,!1,!1,function(a,b){var c=a.g,d=9==c.nodeType?c:c" +
+    ".ownerDocument;a=H(b,a).split(/\\s+/);var e=[];p(a,function(g){g=d." +
+    "getElementById(g);!g||0<=Aa(e,g)||e.push(g)});e.sort(Va);var f=new" +
+    " A;p(e,function(g){f.add(g)});return f},1);J(\"lang\",2,!1,!1,functi" +
+    "on(){return!1},1);J(\"last\",1,!0,!1,function(a){if(1!=arguments.len" +
+    "gth)throw Error(\"Function last expects ()\");return a.h},0);\nJ(\"loc" +
+    "al-name\",3,!1,!0,function(a,b){return(a=b?sb(b.g(a)):a.g)?a.localN" +
+    "ame||a.nodeName.toLowerCase():\"\"},0,1,!0);J(\"name\",3,!1,!0,functio" +
+    "n(a,b){return(a=b?sb(b.g(a)):a.g)?a.nodeName.toLowerCase():\"\"},0,1" +
+    ",!0);J(\"namespace-uri\",3,!0,!1,function(){return\"\"},0,1,!0);J(\"nor" +
+    "malize-space\",3,!1,!0,function(a,b){return(b?H(b,a):z(a.g)).replac" +
+    "e(/[\\s\\xa0]+/g,\" \").replace(/^\\s+|\\s+$/g,\"\")},0,1);J(\"not\",2,!1,!1" +
+    ",function(a,b){return!Ab(b,a)},1);J(\"number\",1,!1,!0,function(a,b)" +
+    "{return b?G(b,a):+z(a.g)},0,1);\nJ(\"position\",1,!0,!1,function(a){r" +
+    "eturn a.j},0);J(\"round\",1,!1,!1,function(a,b){return Math.round(G(" +
+    "b,a))},1);J(\"starts-with\",2,!1,!1,function(a,b,c){b=H(b,a);a=H(c,a" +
+    ");return 0==b.lastIndexOf(a,0)},2);J(\"string\",3,!1,!0,function(a,b" +
+    "){return b?H(b,a):z(a.g)},0,1);J(\"string-length\",1,!1,!0,function(" +
+    "a,b){return(b?H(b,a):z(a.g)).length},0,1);\nJ(\"substring\",3,!1,!1,f" +
+    "unction(a,b,c,d){c=G(c,a);if(isNaN(c)||Infinity==c||-Infinity==c)r" +
+    "eturn\"\";d=d?G(d,a):Infinity;if(isNaN(d)||-Infinity===d)return\"\";c=" +
+    "Math.round(c)-1;var e=Math.max(c,0);a=H(b,a);return Infinity==d?a." +
+    "substring(e):a.substring(e,c+Math.round(d))},2,3);J(\"substring-aft" +
+    "er\",3,!1,!1,function(a,b,c){b=H(b,a);a=H(c,a);c=b.indexOf(a);retur" +
+    "n-1==c?\"\":b.substring(c+a.length)},2);\nJ(\"substring-before\",3,!1,!" +
+    "1,function(a,b,c){b=H(b,a);a=H(c,a);a=b.indexOf(a);return-1==a?\"\":" +
+    "b.substring(0,a)},2);J(\"sum\",1,!1,!1,function(a,b){a=C(b.g(a));b=0" +
+    ";for(var c=a.next();c;c=a.next())b+=+z(c);return b},1,1,!0);J(\"tra" +
+    "nslate\",3,!1,!1,function(a,b,c,d){b=H(b,a);c=H(c,a);var e=H(d,a);a" +
+    "={};for(d=0;d<c.length;d++){var f=c.charAt(d);f in a||(a[f]=e.char" +
+    "At(d))}c=\"\";for(d=0;d<b.length;d++)f=b.charAt(d),c+=f in a?a[f]:f;" +
+    "return c},3);J(\"true\",2,!1,!1,function(){return!0},0);function B(a" +
+    ",b){this.s=a;this.i=void 0!==b?b:null;this.h=null;switch(a){case \"" +
+    "comment\":this.h=8;break;case \"text\":this.h=3;break;case \"processin" +
+    "g-instruction\":this.h=7;break;case \"node\":break;default:throw Erro" +
+    "r(\"Unexpected argument\");}}function Mb(a){return\"comment\"==a||\"tex" +
+    "t\"==a||\"processing-instruction\"==a||\"node\"==a}B.prototype.g=functi" +
+    "on(a){return null===this.h||this.h==a.nodeType};B.prototype.getTyp" +
+    "e=function(){return this.h};B.prototype.j=function(){return this.s" +
+    "};\nB.prototype.toString=function(){var a=\"Kind Test: \"+this.s;null" +
+    "!==this.i&&(a+=F(this.i));return a};function Nb(a){E.call(this,3);" +
+    "this.i=a.substring(1,a.length-1)}n(Nb,E);Nb.prototype.g=function()" +
+    "{return this.i};Nb.prototype.toString=function(){return\"Literal: \"" +
+    "+this.i};function Ob(a,b){this.v=a.toLowerCase();this.h=b?b.toLowe" +
+    "rCase():\"http://www.w3.org/1999/xhtml\"}Ob.prototype.g=function(a){" +
+    "var b=a.nodeType;return 1!=b&&2!=b?!1:\"*\"!=this.v&&this.v!=a.nodeN" +
+    "ame.toLowerCase()?!1:this.h==(a.namespaceURI?a.namespaceURI.toLowe" +
+    "rCase():\"http://www.w3.org/1999/xhtml\")};Ob.prototype.j=function()" +
+    "{return this.v};Ob.prototype.toString=function(){return\"Name Test:" +
+    " \"+(\"http://www.w3.org/1999/xhtml\"==this.h?\"\":this.h+\":\")+this.v};" +
+    "function Pb(a){E.call(this,1);this.i=a}n(Pb,E);Pb.prototype.g=func" +
+    "tion(){return this.i};Pb.prototype.toString=function(){return\"Numb" +
+    "er: \"+this.i};function Qb(a,b){E.call(this,a.u);this.s=a;this.i=b;" +
+    "this.o=a.o;this.h=a.h;1==this.i.length&&(a=this.i[0],a.I||a.i!=Rb|" +
+    "|(a=a.D,\"*\"!=a.j()&&(this.j={name:a.j(),G:null})))}n(Qb,E);functio" +
+    "n Sb(){E.call(this,4)}n(Sb,E);Sb.prototype.g=function(a){var b=new" +
+    " A;a=a.g;9==a.nodeType?b.add(a):b.add(a.ownerDocument);return b};S" +
+    "b.prototype.toString=function(){return\"Root Helper Expression\"};fu" +
+    "nction Tb(){E.call(this,4)}n(Tb,E);Tb.prototype.g=function(a){var " +
+    "b=new A;b.add(a.g);return b};Tb.prototype.toString=function(){retu" +
+    "rn\"Context Helper Expression\"};\nfunction Ub(a){return\"/\"==a||\"//\"=" +
+    "=a}Qb.prototype.g=function(a){var b=this.s.g(a);if(!(b instanceof " +
+    "A))throw Error(\"Filter expression must evaluate to nodeset.\");a=th" +
+    "is.i;for(var c=0,d=a.length;c<d&&b.h;c++){var e=a[c],f=C(b,e.i.F);" +
+    "if(e.o||e.i!=Vb)if(e.o||e.i!=Wb){var g=f.next();for(b=e.g(new fb(g" +
+    "));null!=(g=f.next());)g=e.g(new fb(g)),b=qb(b,g)}else g=f.next()," +
+    "b=e.g(new fb(g));else{for(g=f.next();(b=f.next())&&(!g.contains||g" +
+    ".contains(b))&&b.compareDocumentPosition(g)&8;g=b);b=e.g(new fb(g)" +
+    ")}}return b};\nQb.prototype.toString=function(){var a=\"Path Express" +
+    "ion:\"+F(this.s);if(this.i.length){var b=Ba(this.i,function(c,d){re" +
+    "turn c+F(d)},\"Steps:\");a+=F(b)}return a};function Xb(a,b){this.g=a" +
+    ";this.F=!!b}\nfunction Ib(a,b,c){for(c=c||0;c<a.g.length;c++)for(va" +
+    "r d=a.g[c],e=C(b),f=b.h,g,k=0;g=e.next();k++){var l=a.F?f-k:k+1;g=" +
+    "d.g(new fb(g,l,f));if(\"number\"==typeof g)l=l==g;else if(\"string\"==" +
+    "typeof g||\"boolean\"==typeof g)l=!!g;else if(g instanceof A)l=0<g.h" +
+    ";else throw Error(\"Predicate.evaluate returned an unexpected type." +
+    "\");if(!l){l=e;g=l.j;var m=l.g;if(!m)throw Error(\"Next must be call" +
+    "ed at least once before remove.\");var t=m.g;m=m.next;t?t.next=m:g." +
+    "g=m;m?m.g=t:g.j=t;g.h--;l.g=null}}return b}\nXb.prototype.toString=" +
+    "function(){return Ba(this.g,function(a,b){return a+F(b)},\"Predicat" +
+    "es:\")};function K(a,b,c,d){E.call(this,4);this.i=a;this.D=b;this.s" +
+    "=c||new Xb([]);this.I=!!d;b=this.s;b=0<b.g.length?b.g[0].j:null;a." +
+    "U&&b&&(this.j={name:b.name,G:b.G});a:{a=this.s;for(b=0;b<a.g.lengt" +
+    "h;b++)if(c=a.g[b],c.o||1==c.u||0==c.u){a=!0;break a}a=!1}this.o=a}" +
+    "n(K,E);\nK.prototype.g=function(a){var b=a.g,c=this.j,d=null,e=null"
+  )
+      .append(
+    ",f=0;c&&(d=c.name,e=c.G?H(c.G,a):null,f=1);if(this.I)if(this.o||th" +
+    "is.i!=Yb)if(b=C((new K(Zb,new B(\"node\"))).g(a)),c=b.next())for(a=t" +
+    "his.A(c,d,e,f);null!=(c=b.next());)a=qb(a,this.A(c,d,e,f));else a=" +
+    "new A;else a=mb(this.D,b,d,e),a=Ib(this.s,a,f);else a=this.A(a.g,d" +
+    ",e,f);return a};K.prototype.A=function(a,b,c,d){a=this.i.C(this.D," +
+    "a,b,c);return a=Ib(this.s,a,d)};\nK.prototype.toString=function(){v" +
+    "ar a=\"Step:\"+F(\"Operator: \"+(this.I?\"//\":\"/\"));this.i.v&&(a+=F(\"Ax" +
+    "is: \"+this.i));a+=F(this.D);if(this.s.g.length){var b=Ba(this.s.g," +
+    "function(c,d){return c+F(d)},\"Predicates:\");a+=F(b)}return a};func" +
+    "tion $b(a,b,c,d){this.v=a;this.C=b;this.F=c;this.U=d}$b.prototype." +
+    "toString=function(){return this.v};var ac={};function L(a,b,c,d){i" +
+    "f(ac.hasOwnProperty(a))throw Error(\"Axis already created: \"+a);b=n" +
+    "ew $b(a,b,c,!!d);return ac[a]=b}\nL(\"ancestor\",function(a,b){for(va" +
+    "r c=new A;b=b.parentNode;)a.g(b)&&rb(c,b);return c},!0);L(\"ancesto" +
+    "r-or-self\",function(a,b){var c=new A;do a.g(b)&&rb(c,b);while(b=b." +
+    "parentNode);return c},!0);\nvar Rb=L(\"attribute\",function(a,b){var " +
+    "c=new A,d=a.j();if(b=b.attributes)if(a instanceof B&&null===a.getT" +
+    "ype()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);else(d=b.getNamedItem(d)" +
+    ")&&c.add(d);return c},!1),Yb=L(\"child\",function(a,b,c,d,e){c=\"stri" +
+    "ng\"===typeof c?c:null;d=\"string\"===typeof d?d:null;e=e||new A;for(" +
+    "b=b.firstChild;b;b=b.nextSibling)lb(b,c,d)&&a.g(b)&&e.add(b);retur" +
+    "n e},!1,!0);L(\"descendant\",mb,!1,!0);\nvar Zb=L(\"descendant-or-self" +
+    "\",function(a,b,c,d){var e=new A;lb(b,c,d)&&a.g(b)&&e.add(b);return" +
+    " mb(a,b,c,d,e)},!1,!0),Vb=L(\"following\",function(a,b,c,d){var e=ne" +
+    "w A;do for(var f=b;f=f.nextSibling;)lb(f,c,d)&&a.g(f)&&e.add(f),e=" +
+    "mb(a,f,c,d,e);while(b=b.parentNode);return e},!1,!0);L(\"following-" +
+    "sibling\",function(a,b){for(var c=new A;b=b.nextSibling;)a.g(b)&&c." +
+    "add(b);return c},!1);L(\"namespace\",function(){return new A},!1);\nv" +
+    "ar bc=L(\"parent\",function(a,b){var c=new A;if(9==b.nodeType)return" +
+    " c;if(2==b.nodeType)return c.add(b.ownerElement),c;b=b.parentNode;" +
+    "a.g(b)&&c.add(b);return c},!1),Wb=L(\"preceding\",function(a,b,c,d){" +
+    "var e=new A,f=[];do f.unshift(b);while(b=b.parentNode);for(var g=1" +
+    ",k=f.length;g<k;g++){var l=[];for(b=f[g];b=b.previousSibling;)l.un" +
+    "shift(b);for(var m=0,t=l.length;m<t;m++)b=l[m],lb(b,c,d)&&a.g(b)&&" +
+    "e.add(b),e=mb(a,b,c,d,e)}return e},!0,!0);\nL(\"preceding-sibling\",f" +
+    "unction(a,b){for(var c=new A;b=b.previousSibling;)a.g(b)&&rb(c,b);" +
+    "return c},!0);var cc=L(\"self\",function(a,b){var c=new A;a.g(b)&&c." +
+    "add(b);return c},!1);function dc(a){E.call(this,1);this.i=a;this.o" +
+    "=a.o;this.h=a.h}n(dc,E);dc.prototype.g=function(a){return-G(this.i" +
+    ",a)};dc.prototype.toString=function(){return\"Unary Expression: -\"+" +
+    "F(this.i)};function ec(a){E.call(this,4);this.i=a;yb(this,q(this.i" +
+    ",function(b){return b.o}));zb(this,q(this.i,function(b){return b.h" +
+    "}))}n(ec,E);ec.prototype.g=function(a){var b=new A;p(this.i,functi" +
+    "on(c){c=c.g(a);if(!(c instanceof A))throw Error(\"Path expression m" +
+    "ust evaluate to NodeSet.\");b=qb(b,c)});return b};ec.prototype.toSt" +
+    "ring=function(){return Ba(this.i,function(a,b){return a+F(b)},\"Uni" +
+    "on Expression:\")};function fc(a,b){this.g=a;this.h=b}function gc(a" +
+    "){for(var b,c=[];;){M(a,\"Missing right hand side of binary express" +
+    "ion.\");b=hc(a);var d=a.g.next();if(!d)break;var e=(d=Gb[d]||null)&" +
+    "&d.M;if(!e){a.g.g--;break}for(;c.length&&e<=c[c.length-1].M;)b=new" +
+    " Bb(c.pop(),c.pop(),b);c.push(b,d)}for(;c.length;)b=new Bb(c.pop()" +
+    ",c.pop(),b);return b}function M(a,b){if(kb(a.g))throw Error(b);}fu" +
+    "nction ic(a,b){a=a.g.next();if(a!=b)throw Error(\"Bad token, expect" +
+    "ed: \"+b+\" got: \"+a);}\nfunction jc(a){a=a.g.next();if(\")\"!=a)throw " +
+    "Error(\"Bad token: \"+a);}function kc(a){a=a.g.next();if(2>a.length)" +
+    "throw Error(\"Unclosed literal string\");return new Nb(a)}function l" +
+    "c(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c)return new Ob(b);v" +
+    "ar d=b.substring(0,c);a=a.h(d);if(!a)throw Error(\"Namespace prefix" +
+    " not declared: \"+d);b=b.substr(c+1);return new Ob(b,a)}\nfunction m" +
+    "c(a){var b=[];if(Ub(y(a.g))){var c=a.g.next();var d=y(a.g);if(\"/\"=" +
+    "=c&&(kb(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&!/(?![0-9])[\\w]/.te" +
+    "st(d)))return new Sb;d=new Sb;M(a,\"Missing next location step.\");c" +
+    "=nc(a,c);b.push(c)}else{a:{c=y(a.g);d=c.charAt(0);switch(d){case \"" +
+    "$\":throw Error(\"Variable reference not allowed in HTML XPath\");cas" +
+    "e \"(\":a.g.next();c=gc(a);M(a,'unclosed \"(\"');ic(a,\")\");break;case " +
+    "'\"':case \"'\":c=kc(a);break;default:if(isNaN(+c))if(!Mb(c)&&/(?![0-" +
+    "9])[\\w]/.test(d)&&\"(\"==y(a.g,\n1)){c=a.g.next();c=Lb[c]||null;a.g.n" +
+    "ext();for(d=[];\")\"!=y(a.g);){M(a,\"Missing function argument list.\"" +
+    ");d.push(gc(a));if(\",\"!=y(a.g))break;a.g.next()}M(a,\"Unclosed func" +
+    "tion argument list.\");jc(a);c=new Jb(c,d)}else{c=null;break a}else" +
+    " c=new Pb(+a.g.next())}\"[\"==y(a.g)&&(d=new Xb(oc(a)),c=new Hb(c,d)" +
+    ")}if(c)if(Ub(y(a.g)))d=c;else return c;else c=nc(a,\"/\"),d=new Tb,b" +
+    ".push(c)}for(;Ub(y(a.g));)c=a.g.next(),M(a,\"Missing next location " +
+    "step.\"),c=nc(a,c),b.push(c);return new Qb(d,b)}\nfunction nc(a,b){i" +
+    "f(\"/\"!=b&&\"//\"!=b)throw Error('Step op should be \"/\" or \"//\"');if(" +
+    "\".\"==y(a.g)){var c=new K(cc,new B(\"node\"));a.g.next();return c}if(" +
+    "\"..\"==y(a.g))return c=new K(bc,new B(\"node\")),a.g.next(),c;if(\"@\"=" +
+    "=y(a.g)){var d=Rb;a.g.next();M(a,\"Missing attribute name\")}else if" +
+    "(\"::\"==y(a.g,1)){if(!/(?![0-9])[\\w]/.test(y(a.g).charAt(0)))throw " +
+    "Error(\"Bad token: \"+a.g.next());var e=a.g.next();d=ac[e]||null;if(" +
+    "!d)throw Error(\"No axis with name: \"+e);a.g.next();M(a,\"Missing no" +
+    "de name\")}else d=Yb;e=\ny(a.g);if(/(?![0-9])[\\w]/.test(e.charAt(0))" +
+    ")if(\"(\"==y(a.g,1)){if(!Mb(e))throw Error(\"Invalid node type: \"+e);" +
+    "e=a.g.next();if(!Mb(e))throw Error(\"Invalid type name: \"+e);ic(a,\"" +
+    "(\");M(a,\"Bad nodetype\");var f=y(a.g).charAt(0),g=null;if('\"'==f||\"" +
+    "'\"==f)g=kc(a);M(a,\"Bad nodetype\");jc(a);e=new B(e,g)}else e=lc(a);" +
+    "else if(\"*\"==e)e=lc(a);else throw Error(\"Bad token: \"+a.g.next());" +
+    "a=new Xb(oc(a),d.F);return c||new K(d,e,a,\"//\"==b)}\nfunction oc(a)" +
+    "{for(var b=[];\"[\"==y(a.g);){a.g.next();M(a,\"Missing predicate expr" +
+    "ession.\");var c=gc(a);b.push(c);M(a,\"Unclosed predicate expression" +
+    ".\");ic(a,\"]\")}return b}function hc(a){if(\"-\"==y(a.g))return a.g.ne" +
+    "xt(),new dc(hc(a));var b=mc(a);if(\"|\"!=y(a.g))a=b;else{for(b=[b];\"" +
+    "|\"==a.g.next();)M(a,\"Missing next union location path.\"),b.push(mc" +
+    "(a));a.g.g--;a=new ec(b)}return a};function pc(a,b){if(!a.length)t" +
+    "hrow Error(\"Empty XPath expression.\");a=hb(a);if(kb(a))throw Error" +
+    "(\"Invalid XPath expression.\");b?\"function\"!==typeof b&&(b=va(b.loo" +
+    "kupNamespaceURI,b)):b=function(){return null};var c=gc(new fc(a,b)" +
+    ");if(!kb(a))throw Error(\"Bad token: \"+a.next());this.evaluate=func" +
+    "tion(d,e){d=c.g(new fb(d));return new N(d,e)}}\nfunction N(a,b){if(" +
+    "0==b)if(a instanceof A)b=4;else if(\"string\"==typeof a)b=2;else if(" +
+    "\"number\"==typeof a)b=1;else if(\"boolean\"==typeof a)b=3;else throw " +
+    "Error(\"Unexpected evaluation result.\");if(2!=b&&1!=b&&3!=b&&!(a in" +
+    "stanceof A))throw Error(\"value could not be converted to the speci" +
+    "fied type\");this.resultType=b;switch(b){case 2:this.stringValue=a " +
+    "instanceof A?tb(a):\"\"+a;break;case 1:this.numberValue=a instanceof" +
+    " A?+tb(a):+a;break;case 3:this.booleanValue=a instanceof A?0<a.h:!" +
+    "!a;break;case 4:case 5:case 6:case 7:var c=\nC(a);var d=[];for(var " +
+    "e=c.next();e;e=c.next())d.push(e);this.snapshotLength=a.h;this.inv" +
+    "alidIteratorState=!1;break;case 8:case 9:this.singleNodeValue=sb(a" +
+    ");break;default:throw Error(\"Unknown XPathResult type.\");}var f=0;" +
+    "this.iterateNext=function(){if(4!=b&&5!=b)throw Error(\"iterateNext" +
+    " called with wrong result type\");return f>=d.length?null:d[f++]};t" +
+    "his.snapshotItem=function(g){if(6!=b&&7!=b)throw Error(\"snapshotIt" +
+    "em called with wrong result type\");return g>=d.length||0>g?null:d[" +
+    "g]}}N.ANY_TYPE=0;\nN.NUMBER_TYPE=1;N.STRING_TYPE=2;N.BOOLEAN_TYPE=3" +
+    ";N.UNORDERED_NODE_ITERATOR_TYPE=4;N.ORDERED_NODE_ITERATOR_TYPE=5;N" +
+    ".UNORDERED_NODE_SNAPSHOT_TYPE=6;N.ORDERED_NODE_SNAPSHOT_TYPE=7;N.A" +
+    "NY_UNORDERED_NODE_TYPE=8;N.FIRST_ORDERED_NODE_TYPE=9;function qc(a" +
+    "){this.lookupNamespaceURI=vb(a)}\nfunction rc(a,b){a=a||pa;var c=a." +
+    "document;if(!c.evaluate||b)a.XPathResult=N,c.evaluate=function(d,e" +
+    ",f,g){return(new pc(d,f)).evaluate(e,g)},c.createExpression=functi" +
+    "on(d,e){return new pc(d,e)},c.createNSResolver=function(d){return " +
+    "new qc(d)}}qa(\"wgxpath.install\",rc);var O={};O.J=function(){var a=" +
+    "{X:\"http://www.w3.org/2000/svg\"};return function(b){return a[b]||n" +
+    "ull}}();\nO.A=function(a,b,c){var d=u(a);if(!d.documentElement)retu" +
+    "rn null;rc(d?d.parentWindow||d.defaultView:window);try{for(var e=d" +
+    ".createNSResolver?d.createNSResolver(d.documentElement):O.J,f={},g" +
+    "=d.getElementsByTagName(\"*\"),k=0;k<g.length;++k){var l=g[k],m=l.na" +
+    "mespaceURI;if(m&&!f[m]){var t=l.lookupPrefix(m);if(!t){var D=m.mat" +
+    "ch(\".*/(\\\\w+)/?$\");t=D?D[1]:\"xhtml\"}f[m]=t}}var P={},Z;for(Z in f)" +
+    "P[f[Z]]=Z;e=function(r){return P[r]||null};try{return d.evaluate(b" +
+    ",a,e,c,null)}catch(r){if(\"TypeError\"===r.name)return e=\nd.createNS" +
+    "Resolver?d.createNSResolver(d.documentElement):O.J,d.evaluate(b,a," +
+    "e,c,null);throw r;}}catch(r){throw new x(32,\"Unable to locate an e" +
+    "lement with the xpath expression \"+b+\" because of the following er" +
+    "ror:\\n\"+r);}};O.K=function(a,b){if(!a||1!=a.nodeType)throw new x(3" +
+    "2,'The result of the xpath expression \"'+b+'\" is: '+a+\". It should" +
+    " be an element.\");};\nO.S=function(a,b){var c=function(){var d=O.A(" +
+    "b,a,9);return d?d.singleNodeValue||null:b.selectSingleNode?(d=u(b)" +
+    ",d.setProperty&&d.setProperty(\"SelectionLanguage\",\"XPath\"),b.selec" +
+    "tSingleNode(a)):null}();null!==c&&O.K(c,a);return c};\nO.W=function" +
+    "(a,b){var c=function(){var d=O.A(b,a,7);if(d){for(var e=d.snapshot" +
+    "Length,f=[],g=0;g<e;++g)f.push(d.snapshotItem(g));return f}return " +
+    "b.selectNodes?(d=u(b),d.setProperty&&d.setProperty(\"SelectionLangu" +
+    "age\",\"XPath\"),b.selectNodes(a)):[]}();p(c,function(d){O.K(d,a)});r" +
+    "eturn c};var sc={aliceblue:\"#f0f8ff\",antiquewhite:\"#faebd7\",aqua:\"" +
+    "#00ffff\",aquamarine:\"#7fffd4\",azure:\"#f0ffff\",beige:\"#f5f5dc\",bisq" +
+    "ue:\"#ffe4c4\",black:\"#000000\",blanchedalmond:\"#ffebcd\",blue:\"#0000f" +
+    "f\",blueviolet:\"#8a2be2\",brown:\"#a52a2a\",burlywood:\"#deb887\",cadetb" +
+    "lue:\"#5f9ea0\",chartreuse:\"#7fff00\",chocolate:\"#d2691e\",coral:\"#ff7" +
+    "f50\",cornflowerblue:\"#6495ed\",cornsilk:\"#fff8dc\",crimson:\"#dc143c\"" +
+    ",cyan:\"#00ffff\",darkblue:\"#00008b\",darkcyan:\"#008b8b\",darkgoldenro" +
+    "d:\"#b8860b\",darkgray:\"#a9a9a9\",darkgreen:\"#006400\",\ndarkgrey:\"#a9a" +
+    "9a9\",darkkhaki:\"#bdb76b\",darkmagenta:\"#8b008b\",darkolivegreen:\"#55" +
+    "6b2f\",darkorange:\"#ff8c00\",darkorchid:\"#9932cc\",darkred:\"#8b0000\"," +
+    "darksalmon:\"#e9967a\",darkseagreen:\"#8fbc8f\",darkslateblue:\"#483d8b" +
+    "\",darkslategray:\"#2f4f4f\",darkslategrey:\"#2f4f4f\",darkturquoise:\"#" +
+    "00ced1\",darkviolet:\"#9400d3\",deeppink:\"#ff1493\",deepskyblue:\"#00bf" +
+    "ff\",dimgray:\"#696969\",dimgrey:\"#696969\",dodgerblue:\"#1e90ff\",fireb" +
+    "rick:\"#b22222\",floralwhite:\"#fffaf0\",forestgreen:\"#228b22\",fuchsia" +
+    ":\"#ff00ff\",gainsboro:\"#dcdcdc\",\nghostwhite:\"#f8f8ff\",gold:\"#ffd700" +
+    "\",goldenrod:\"#daa520\",gray:\"#808080\",green:\"#008000\",greenyellow:\"" +
+    "#adff2f\",grey:\"#808080\",honeydew:\"#f0fff0\",hotpink:\"#ff69b4\",india" +
+    "nred:\"#cd5c5c\",indigo:\"#4b0082\",ivory:\"#fffff0\",khaki:\"#f0e68c\",la" +
+    "vender:\"#e6e6fa\",lavenderblush:\"#fff0f5\",lawngreen:\"#7cfc00\",lemon" +
+    "chiffon:\"#fffacd\",lightblue:\"#add8e6\",lightcoral:\"#f08080\",lightcy" +
+    "an:\"#e0ffff\",lightgoldenrodyellow:\"#fafad2\",lightgray:\"#d3d3d3\",li" +
+    "ghtgreen:\"#90ee90\",lightgrey:\"#d3d3d3\",lightpink:\"#ffb6c1\",lightsa" +
+    "lmon:\"#ffa07a\",\nlightseagreen:\"#20b2aa\",lightskyblue:\"#87cefa\",lig" +
+    "htslategray:\"#778899\",lightslategrey:\"#778899\",lightsteelblue:\"#b0" +
+    "c4de\",lightyellow:\"#ffffe0\",lime:\"#00ff00\",limegreen:\"#32cd32\",lin" +
+    "en:\"#faf0e6\",magenta:\"#ff00ff\",maroon:\"#800000\",mediumaquamarine:\"" +
+    "#66cdaa\",mediumblue:\"#0000cd\",mediumorchid:\"#ba55d3\",mediumpurple:" +
+    "\"#9370db\",mediumseagreen:\"#3cb371\",mediumslateblue:\"#7b68ee\",mediu" +
+    "mspringgreen:\"#00fa9a\",mediumturquoise:\"#48d1cc\",mediumvioletred:\"" +
+    "#c71585\",midnightblue:\"#191970\",mintcream:\"#f5fffa\",mistyrose:\"#ff" +
+    "e4e1\",\nmoccasin:\"#ffe4b5\",navajowhite:\"#ffdead\",navy:\"#000080\",old" +
+    "lace:\"#fdf5e6\",olive:\"#808000\",olivedrab:\"#6b8e23\",orange:\"#ffa500" +
+    "\",orangered:\"#ff4500\",orchid:\"#da70d6\",palegoldenrod:\"#eee8aa\",pal" +
+    "egreen:\"#98fb98\",paleturquoise:\"#afeeee\",palevioletred:\"#db7093\",p" +
+    "apayawhip:\"#ffefd5\",peachpuff:\"#ffdab9\",peru:\"#cd853f\",pink:\"#ffc0" +
+    "cb\",plum:\"#dda0dd\",powderblue:\"#b0e0e6\",purple:\"#800080\",red:\"#ff0" +
+    "000\",rosybrown:\"#bc8f8f\",royalblue:\"#4169e1\",saddlebrown:\"#8b4513\"" +
+    ",salmon:\"#fa8072\",sandybrown:\"#f4a460\",seagreen:\"#2e8b57\",\nseashel" +
+    "l:\"#fff5ee\",sienna:\"#a0522d\",silver:\"#c0c0c0\",skyblue:\"#87ceeb\",sl" +
+    "ateblue:\"#6a5acd\",slategray:\"#708090\",slategrey:\"#708090\",snow:\"#f" +
+    "ffafa\",springgreen:\"#00ff7f\",steelblue:\"#4682b4\",tan:\"#d2b48c\",tea" +
+    "l:\"#008080\",thistle:\"#d8bfd8\",tomato:\"#ff6347\",turquoise:\"#40e0d0\"" +
+    ",violet:\"#ee82ee\",wheat:\"#f5deb3\",white:\"#ffffff\",whitesmoke:\"#f5f" +
+    "5f5\",yellow:\"#ffff00\",yellowgreen:\"#9acd32\"};var tc=\"backgroundCol" +
+    "or borderTopColor borderRightColor borderBottomColor borderLeftCol" +
+    "or color outlineColor\".split(\" \"),uc=/#([0-9a-fA-F])([0-9a-fA-F])(" +
+    "[0-9a-fA-F])/,vc=/^#(?:[0-9a-f]{3}){1,2}$/i,wc=/^(?:rgba)?\\((\\d{1," +
+    "3}),\\s?(\\d{1,3}),\\s?(\\d{1,3}),\\s?(0|1|0\\.\\d*)\\)$/i,xc=/^(?:rgb)?\\(" +
+    "(0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2})\\)$/i;func" +
+    "tion yc(a){return(a=a.getAttributeNode(\"tabindex\"))&&a.specified?a" +
+    ".value:null}var zc=RegExp(\"[;]+(?=(?:(?:[^\\\"]*\\\"){2})*[^\\\"]*$)(?=(" +
+    "?:(?:[^']*'){2})*[^']*$)(?=(?:[^()]*\\\\([^()]*\\\\))*[^()]*$)\");funct" +
+    "ion Ac(a){var b=[];p(a.split(zc),function(c){var d=c.indexOf(\":\");" +
+    "0<d&&(c=[c.slice(0,d),c.slice(d+1)],2==c.length&&b.push(c[0].toLow" +
+    "erCase(),\":\",c[1],\";\"))});b=b.join(\"\");return b=\";\"==b.charAt(b.le" +
+    "ngth-1)?b:b+\";\"}\nfunction Q(a,b){b&&\"string\"!==typeof b&&(b=b.toSt" +
+    "ring());return!!a&&1==a.nodeType&&(!b||a.tagName.toUpperCase()==b)" +
+    "};function Bc(a){return Cc(a)&&Dc(a)&&\"none\"!=R(a,\"pointer-events\"" +
+    ")}var Fc=\"A AREA BUTTON INPUT LABEL SELECT TEXTAREA\".split(\" \");fu" +
+    "nction Gc(a){return q(Fc,function(b){return Q(a,b)})||null!=yc(a)&" +
+    "&0<=Number(a.tabIndex)||Hc(a)}var Ic=\"BUTTON INPUT OPTGROUP OPTION" +
+    " SELECT TEXTAREA\".split(\" \");\nfunction Dc(a){return q(Ic,function(" +
+    "b){return Q(a,b)})?a.disabled?!1:a.parentNode&&1==a.parentNode.nod" +
+    "eType&&Q(a,\"OPTGROUP\")||Q(a,\"OPTION\")?Dc(a.parentNode):!Ya(a,funct" +
+    "ion(b){var c=b.parentNode;if(c&&Q(c,\"FIELDSET\")&&c.disabled){if(!Q" +
+    "(b,\"LEGEND\"))return!0;for(;b=void 0!==b.previousElementSibling?b.p" +
+    "reviousElementSibling:Ta(b.previousSibling);)if(Q(b,\"LEGEND\"))retu" +
+    "rn!0}return!1},!0):!0}var Jc=\"text search tel url email password n" +
+    "umber\".split(\" \");\nfunction Kc(a,b){return Q(a,\"INPUT\")?a.type.toL" +
+    "owerCase()==b:!1}function Lc(a){function b(c){return\"inherit\"==c.c" +
+    "ontentEditable?(c=Mc(c))?b(c):!1:\"true\"==c.contentEditable}return " +
+    "void 0===a.contentEditable?!1:void 0===a.isContentEditable?b(a):a." +
+    "isContentEditable}\nfunction Hc(a){return((Q(a,\"TEXTAREA\")?!0:Q(a,\"" +
+    "INPUT\")?0<=Aa(Jc,a.type.toLowerCase()):Lc(a)?!0:!1)||(Q(a,\"INPUT\")" +
+    "?\"file\"==a.type.toLowerCase():!1)||Kc(a,\"range\")||Kc(a,\"date\")||Kc" +
+    "(a,\"month\")||Kc(a,\"week\")||Kc(a,\"time\")||Kc(a,\"datetime-local\")||K" +
+    "c(a,\"color\"))&&!a.readOnly}function Mc(a){for(a=a.parentNode;a&&1!" +
+    "=a.nodeType&&9!=a.nodeType&&11!=a.nodeType;)a=a.parentNode;return " +
+    "Q(a)?a:null}\nfunction R(a,b){b=Sa(b);if(\"float\"==b||\"cssFloat\"==b|" +
+    "|\"styleFloat\"==b)b=\"cssFloat\";a=bb(a,b)||Nc(a,b);if(null===a)a=nul" +
+    "l;else if(0<=Aa(tc,b)){b:{var c=a.match(wc);if(c){b=Number(c[1]);v" +
+    "ar d=Number(c[2]),e=Number(c[3]);c=Number(c[4]);if(0<=b&&255>=b&&0" +
+    "<=d&&255>=d&&0<=e&&255>=e&&0<=c&&1>=c){b=[b,d,e,c];break b}}b=null" +
+    "}if(!b)b:{if(e=a.match(xc))if(b=Number(e[1]),d=Number(e[2]),e=Numb" +
+    "er(e[3]),0<=b&&255>=b&&0<=d&&255>=d&&0<=e&&255>=e){b=[b,d,e,1];bre" +
+    "ak b}b=null}if(!b)b:{b=a.toLowerCase();d=sc[b.toLowerCase()];\nif(!" +
+    "d&&(d=\"#\"==b.charAt(0)?b:\"#\"+b,4==d.length&&(d=d.replace(uc,\"#$1$1" +
+    "$2$2$3$3\")),!vc.test(d))){b=null;break b}b=[parseInt(d.substr(1,2)" +
+    ",16),parseInt(d.substr(3,2),16),parseInt(d.substr(5,2),16),1]}a=b?" +
+    "\"rgba(\"+b.join(\", \")+\")\":a}return a}function Nc(a,b){var c=a.curre" +
+    "ntStyle||a.style,d=c[b];void 0===d&&\"function\"===typeof c.getPrope" +
+    "rtyValue&&(d=c.getPropertyValue(b));return\"inherit\"!=d?void 0!==d?" +
+    "d:null:(a=Mc(a))?Nc(a,b):null}\nfunction Oc(a,b,c){function d(g){va" +
+    "r k=Pc(g);return 0<k.height&&0<k.width?!0:Q(g,\"PATH\")&&(0<k.height" +
+    "||0<k.width)?(g=R(g,\"stroke-width\"),!!g&&0<parseInt(g,10)):\"hidden" +
+    "\"!=R(g,\"overflow\")&&q(g.childNodes,function(l){return 3==l.nodeTyp" +
+    "e||Q(l)&&d(l)})}function e(g){return\"hidden\"==Qc(g)&&Ca(g.childNod" +
+    "es,function(k){return!Q(k)||e(k)||!d(k)})}if(!Q(a))throw Error(\"Ar" +
+    "gument to isShown must be of type Element\");if(Q(a,\"BODY\"))return!" +
+    "0;if(Q(a,\"OPTION\")||Q(a,\"OPTGROUP\"))return a=Ya(a,function(g){retu" +
+    "rn Q(g,\n\"SELECT\")}),!!a&&Oc(a,!0,c);var f=Rc(a);if(f)return!!f.ima" +
+    "ge&&0<f.rect.width&&0<f.rect.height&&Oc(f.image,b,c);if(Q(a,\"INPUT" +
+    "\")&&\"hidden\"==a.type.toLowerCase()||Q(a,\"NOSCRIPT\"))return!1;f=R(a" +
+    ",\"visibility\");return\"collapse\"!=f&&\"hidden\"!=f&&c(a)&&(b||0!=Sc(a" +
+    "))&&d(a)?!e(a):!1}\nfunction Cc(a){function b(c){if(Q(c)&&\"none\"==R" +
+    "(c,\"display\"))return!1;var d;(d=c.parentNode)&&d.shadowRoot&&void " +
+    "0!==c.assignedSlot?d=c.assignedSlot?c.assignedSlot.parentNode:null" +
+    ":c.getDestinationInsertionPoints&&(c=c.getDestinationInsertionPoin" +
+    "ts(),0<c.length&&(d=c[c.length-1]));return!d||9!=d.nodeType&&11!=d" +
+    ".nodeType?!!d&&b(d):!0}return Oc(a,!0,b)}\nfunction Qc(a){function " +
+    "b(r){function v(Eb){return Eb==g?!0:0==R(Eb,\"display\").lastIndexOf" +
+    "(\"inline\",0)||\"absolute\"==Ec&&\"static\"==R(Eb,\"position\")?!1:!0}var" +
+    " Ec=R(r,\"position\");if(\"fixed\"==Ec)return m=!0,r==g?null:g;for(r=M" +
+    "c(r);r&&!v(r);)r=Mc(r);return r}function c(r){var v=r;if(\"visible\"" +
+    "==l)if(r==g&&k)v=k;else if(r==k)return{x:\"visible\",y:\"visible\"};v=" +
+    "{x:R(v,\"overflow-x\"),y:R(v,\"overflow-y\")};r==g&&(v.x=\"visible\"==v." +
+    "x?\"auto\":v.x,v.y=\"visible\"==v.y?\"auto\":v.y);return v}function d(r)" +
+    "{if(r==g){var v=\n(new $a(f)).g;r=v.scrollingElement?v.scrollingEle" +
+    "ment:v.body||v.documentElement;v=v.parentWindow||v.defaultView;r=n" +
+    "ew Qa(v.pageXOffset||r.scrollLeft,v.pageYOffset||r.scrollTop)}else" +
+    " r=new Qa(r.scrollLeft,r.scrollTop);return r}var e=Tc(a),f=u(a),g=" +
+    "f.documentElement,k=f.body,l=R(g,\"overflow\"),m;for(a=b(a);a;a=b(a)" +
+    "){var t=c(a);if(\"visible\"!=t.x||\"visible\"!=t.y){var D=Pc(a);if(0==" +
+    "D.width||0==D.height)return\"hidden\";var P=e.g<D.left,Z=e.h<D.top;i" +
+    "f(P&&\"hidden\"==t.x||Z&&\"hidden\"==t.y)return\"hidden\";if(P&&\n\"visibl" +
+    "e\"!=t.x||Z&&\"visible\"!=t.y){P=d(a);Z=e.h<D.top-P.y;if(e.g<D.left-P" +
+    ".x&&\"visible\"!=t.x||Z&&\"visible\"!=t.x)return\"hidden\";e=Qc(a);retur" +
+    "n\"hidden\"==e?\"hidden\":\"scroll\"}P=e.left>=D.left+D.width;D=e.top>=D" +
+    ".top+D.height;if(P&&\"hidden\"==t.x||D&&\"hidden\"==t.y)return\"hidden\"" +
+    ";if(P&&\"visible\"!=t.x||D&&\"visible\"!=t.y){if(m&&(t=d(a),e.left>=g." +
+    "scrollWidth-t.x||e.g>=g.scrollHeight-t.y))return\"hidden\";e=Qc(a);r" +
+    "eturn\"hidden\"==e?\"hidden\":\"scroll\"}}}return\"none\"}\nfunction Pc(a){" +
+    "var b=Rc(a);if(b)return b.rect;if(Q(a,\"HTML\"))return a=u(a),a=((a?" +
+    "a.parentWindow||a.defaultView:window)||window).document,a=\"CSS1Com" +
+    "pat\"==a.compatMode?a.documentElement:a.body,a=new Ra(a.clientWidth" +
+    ",a.clientHeight),new w(0,0,a.width,a.height);try{var c=a.getBoundi" +
+    "ngClientRect()}catch(d){return new w(0,0,0,0)}return new w(c.left," +
+    "c.top,c.right-c.left,c.bottom-c.top)}\nfunction Rc(a){var b=Q(a,\"MA" +
+    "P\");if(!b&&!Q(a,\"AREA\"))return null;var c=b?a:Q(a.parentNode,\"MAP\"" +
+    ")?a.parentNode:null,d=null,e=null;c&&c.name&&(d=u(c),d=O.S('/desce" +
+    "ndant::*[@usemap = \"#'+c.name+'\"]',d))&&(e=Pc(d),b||\"default\"==a.s" +
+    "hape.toLowerCase()||(a=Uc(a),b=Math.min(Math.max(a.left,0),e.width" +
+    "),c=Math.min(Math.max(a.top,0),e.height),e=new w(b+e.left,c+e.top," +
+    "Math.min(a.width,e.width-b),Math.min(a.height,e.height-c))));retur" +
+    "n{image:d,rect:e||new w(0,0,0,0)}}\nfunction Uc(a){var b=a.shape.to" +
+    "LowerCase();a=a.coords.split(\",\");if(\"rect\"==b&&4==a.length){b=a[0" +
+    "];var c=a[1];return new w(b,c,a[2]-b,a[3]-c)}if(\"circle\"==b&&3==a." +
+    "length)return b=a[2],new w(a[0]-b,a[1]-b,2*b,2*b);if(\"poly\"==b&&2<" +
+    "a.length){b=a[0];c=a[1];for(var d=b,e=c,f=2;f+1<a.length;f+=2)b=Ma" +
+    "th.min(b,a[f]),d=Math.max(d,a[f]),c=Math.min(c,a[f+1]),e=Math.max(" +
+    "e,a[f+1]);return new w(b,c,d-b,e-c)}return new w(0,0,0,0)}function" +
+    " Tc(a){a=Pc(a);return new ab(a.top,a.left+a.width,a.top+a.height,a" +
+    ".left)}\nfunction Sc(a){var b=1,c=R(a,\"opacity\");c&&(b=Number(c));(" +
+    "a=Mc(a))&&(b*=Sc(a));return b};function Vc(){this.g=cb.document.do" +
+    "cumentElement;var a=Za(u(this.g));a&&Wc(this,a)}function Wc(a,b){a" +
+    ".g=b;Q(b,\"OPTION\")&&Ya(b,function(c){return Q(c,\"SELECT\")})}functi" +
+    "on Xc(a){var b=Ya(a.g,function(c){return!!c&&Q(c)&&Gc(c)},!0);b=b|" +
+    "|a.g;a=Za(u(b));if(b==a)return!1;if(a&&\"function\"===typeof a.blur&" +
+    "&!Q(a,\"BODY\"))try{a.blur()}catch(c){throw c;}return\"function\"===ty" +
+    "peof b.focus?(b.focus(),!0):!1}function Yc(a){return Q(a,\"FORM\")}\n" +
+    "function Zc(a){if(!Yc(a))throw new x(12,\"Element is not a form, so" +
+    " could not submit.\");S(a,$c)&&(Q(a.submit)?a.constructor.prototype" +
+    ".submit.call(a):a.submit())};var ad=Object.freeze||function(a){ret" +
+    "urn a};function T(a,b,c){this.g=a;this.h=b;this.j=c}T.prototype.cr" +
+    "eate=function(a){a=u(a).createEvent(\"HTMLEvents\");a.initEvent(this" +
+    ".g,this.h,this.j);return a};T.prototype.toString=function(){return" +
+    " this.g};function bd(a,b,c){T.call(this,a,b,c)}n(bd,T);bd.prototyp" +
+    "e.create=function(a,b){a=u(a).createEvent(\"Events\");a.initEvent(th" +
+    "is.g,this.h,this.j);a.altKey=b.altKey;a.ctrlKey=b.ctrlKey;a.metaKe" +
+    "y=b.metaKey;a.shiftKey=b.shiftKey;a.keyCode=b.charCode||b.keyCode;" +
+    "a.charCode=this==cd?a.keyCode:0;return a};\nvar dd=new T(\"blur\",!1," +
+    "!1),ed=new T(\"change\",!0,!1),fd=new T(\"focus\",!1,!1),gd=new T(\"inp" +
+    "ut\",!0,!1),$c=new T(\"submit\",!0,!0),hd=new T(\"textInput\",!0,!0),id" +
+    "=new bd(\"keydown\",!0,!0),cd=new bd(\"keypress\",!0,!0),jd=new bd(\"ke" +
+    "yup\",!0,!0);function S(a,b,c){b=b.create(a,c);\"isTrusted\"in b||(b." +
+    "isTrusted=!1);return a.dispatchEvent(b)};function kd(a,b){ld(a)&&(" +
+    "a.selectionStart=b)}function U(a,b){var c=0,d=0;ld(a)&&(c=a.select" +
+    "ionStart,d=b?-1:a.selectionEnd);return[c,d]}function md(a,b){ld(a)" +
+    "&&(a.selectionEnd=b)}function nd(a,b){ld(a)&&(a.selectionStart=b,a" +
+    ".selectionEnd=b)}function od(a,b){if(ld(a)){var c=a.value,d=a.sele" +
+    "ctionStart;a.value=c.slice(0,d)+b+c.slice(a.selectionEnd);a.select" +
+    "ionStart=d;a.selectionEnd=d+b.length}else throw Error(\"Cannot set " +
+    "the selection end\");}\nfunction ld(a){try{return\"number\"==typeof a." +
+    "selectionStart}catch(b){return!1}};function pd(a,b){this.g=a[pa.Sy" +
+    "mbol.iterator]();this.h=b}pd.prototype[Symbol.iterator]=function()" +
+    "{return this};pd.prototype.next=function(){var a=this.g.next();ret" +
+    "urn{value:a.done?void 0:this.h.call(void 0,a.value),done:a.done}};" +
+    "function qd(a,b){return new pd(a,b)};function rd(){}rd.prototype.n" +
+    "ext=function(){return sd};var sd=ad({done:!0,value:void 0});rd.pro" +
+    "totype.B=function(){return this};function td(a){if(a instanceof V|" +
+    "|a instanceof ud||a instanceof vd)return a;if(\"function\"==typeof a" +
+    ".next)return new V(function(){return a});if(\"function\"==typeof a[S" +
+    "ymbol.iterator])return new V(function(){return a[Symbol.iterator](" +
+    ")});if(\"function\"==typeof a.B)return new V(function(){return a.B()" +
+    "});throw Error(\"Not an iterator or iterable.\");}function V(a){this" +
+    ".C=a}V.prototype.B=function(){return new ud(this.C())};V.prototype" +
+    "[Symbol.iterator]=function(){return new vd(this.C())};V.prototype." +
+    "h=function(){return new vd(this.C())};\nfunction ud(a){this.g=a}na(" +
+    "ud,rd);ud.prototype.next=function(){return this.g.next()};ud.proto" +
+    "type[Symbol.iterator]=function(){return new vd(this.g)};ud.prototy" +
+    "pe.h=function(){return new vd(this.g)};function vd(a){V.call(this," +
+    "function(){return a});this.g=a}na(vd,V);vd.prototype.next=function" +
+    "(){return this.g.next()};function wd(a,b){this.h={};this.g=[];this" +
+    ".j=this.size=0;var c=arguments.length;if(1<c){if(c%2)throw Error(\"" +
+    "Uneven number of arguments\");for(var d=0;d<c;d+=2)this.set(argumen" +
+    "ts[d],arguments[d+1])}else if(a)if(a instanceof wd)for(c=xd(a),d=0" +
+    ";d<c.length;d++)this.set(c[d],a.get(c[d]));else for(d in a)this.se" +
+    "t(d,a[d])}function xd(a){yd(a);return a.g.concat()}h=wd.prototype;" +
+    "h.has=function(a){return zd(this.h,a)};\nfunction yd(a){if(a.size!=" +
+    "a.g.length){for(var b=0,c=0;b<a.g.length;){var d=a.g[b];zd(a.h,d)&" +
+    "&(a.g[c++]=d);b++}a.g.length=c}if(a.size!=a.g.length){var e={};for" +
+    "(c=b=0;b<a.g.length;)d=a.g[b],zd(e,d)||(a.g[c++]=d,e[d]=1),b++;a.g" +
+    ".length=c}}h.get=function(a,b){return zd(this.h,a)?this.h[a]:b};h." +
+    "set=function(a,b){zd(this.h,a)||(this.size+=1,this.g.push(a),this." +
+    "j++);this.h[a]=b};h.forEach=function(a,b){for(var c=xd(this),d=0;d" +
+    "<c.length;d++){var e=c[d],f=this.get(e);a.call(b,f,e,this)}};h.key" +
+    "s=function(){return td(this.B(!0)).h()};\nh.values=function(){retur" +
+    "n td(this.B(!1)).h()};h.entries=function(){var a=this;return qd(th" +
+    "is.keys(),function(b){return[b,a.get(b)]})};h.B=function(a){yd(thi" +
+    "s);var b=0,c=this.j,d=this,e=new rd;e.next=function(){if(c!=d.j)th" +
+    "row Error(\"The map has changed since the iterator was created\");if" +
+    "(b>=d.g.length)return sd;var f=d.g[b++];return{value:a?f:d.h[f],do" +
+    "ne:!1}};return e};function zd(a,b){return Object.prototype.hasOwnP" +
+    "roperty.call(a,b)};function Ad(){this.g=new wd;this.size=0}functio" +
+    "n Bd(a){var b=typeof a;return\"object\"==b&&a||\"function\"==b?\"o\"+(Ob" +
+    "ject.prototype.hasOwnProperty.call(a,ra)&&a[ra]||(a[ra]=++sa)):b.s" +
+    "lice(0,1)+a}Ad.prototype.add=function(a){this.g.set(Bd(a),a);this." +
+    "size=this.g.size};Ad.prototype.has=function(a){a=Bd(a);return this" +
+    ".g.has(a)};Ad.prototype.values=function(){return this.g.values()};" +
+    "Ad.prototype.B=function(){return this.g.B(!1)};Ad.prototype[Symbol" +
+    ".iterator]=function(){return this.values()};function Cd(a){Vc.call" +
+    "(this);this.i=Hc(this.g);this.h=0;this.j=new Ad;a&&(p(a.pressed,fu" +
+    "nction(b){Dd(this,b,!0)},this),this.h=a.currentPos||0)}n(Cd,Vc);va" +
+    "r Ed={};function W(a,b,c){var d=typeof a;(\"object\"==d&&null!=a||\"f" +
+    "unction\"==d)&&(a=a.l);a=new Fd(a,b,c);!b||b in Ed&&!c||(Ed[b]={key" +
+    ":a,shift:!1},c&&(Ed[c]={key:a,shift:!0}));return a}function Fd(a,b" +
+    ",c){this.code=a;this.g=b||null;this.h=c||this.g}var Gd=W(8),Hd=W(9" +
+    "),Id=W(13),X=W(16),Jd=W(17),Kd=W(18),Ld=W(19);W(20);\nvar Md=W(27)," +
+    "Nd=W(32,\" \"),Od=W(33),Pd=W(34),Qd=W(35),Rd=W(36),Sd=W(37),Td=W(38)" +
+    ",Ud=W(39),Vd=W(40);W(44);var Wd=W(45),Xd=W(46);W(48,\"0\",\")\");W(49," +
+    "\"1\",\"!\");W(50,\"2\",\"@\");W(51,\"3\",\"#\");W(52,\"4\",\"$\");W(53,\"5\",\"%\");W" +
+    "(54,\"6\",\"^\");W(55,\"7\",\"&\");W(56,\"8\",\"*\");W(57,\"9\",\"(\");W(65,\"a\",\"A" +
+    "\");W(66,\"b\",\"B\");W(67,\"c\",\"C\");W(68,\"d\",\"D\");W(69,\"e\",\"E\");W(70,\"f" +
+    "\",\"F\");W(71,\"g\",\"G\");W(72,\"h\",\"H\");W(73,\"i\",\"I\");W(74,\"j\",\"J\");W(7" +
+    "5,\"k\",\"K\");W(76,\"l\",\"L\");W(77,\"m\",\"M\");W(78,\"n\",\"N\");W(79,\"o\",\"O\")" +
+    ";W(80,\"p\",\"P\");W(81,\"q\",\"Q\");\nW(82,\"r\",\"R\");W(83,\"s\",\"S\");W(84,\"t\"" +
+    ",\"T\");W(85,\"u\",\"U\");W(86,\"v\",\"V\");W(87,\"w\",\"W\");W(88,\"x\",\"X\");W(89" +
+    ",\"y\",\"Y\");W(90,\"z\",\"Z\");var Yd=W(La?{m:91,l:91}:Ka?{m:224,l:91}:{m" +
+    ":0,l:91});W(La?{m:92,l:92}:Ka?{m:224,l:93}:{m:0,l:92});W(La?{m:93," +
+    "l:93}:Ka?{m:0,l:0}:{m:93,l:null});\nvar Zd=W({m:96,l:96},\"0\"),$d=W(" +
+    "{m:97,l:97},\"1\"),ae=W({m:98,l:98},\"2\"),be=W({m:99,l:99},\"3\"),ce=W(" +
+    "{m:100,l:100},\"4\"),de=W({m:101,l:101},\"5\"),ee=W({m:102,l:102},\"6\")" +
+    ",fe=W({m:103,l:103},\"7\"),ge=W({m:104,l:104},\"8\"),he=W({m:105,l:105" +
+    "},\"9\"),ie=W({m:106,l:106},\"*\"),je=W({m:107,l:107},\"+\"),ke=W({m:109"
+  )
+      .append(
+    ",l:109},\"-\"),le=W({m:110,l:110},\".\"),me=W({m:111,l:111},\"/\");W(144" +
+    ");\nvar ne=W(112),oe=W(113),pe=W(114),qe=W(115),re=W(116),se=W(117)" +
+    ",te=W(118),ue=W(119),ve=W(120),we=W(121),xe=W(122),ye=W(123),ze=W(" +
+    "{m:107,l:187},\"=\",\"+\"),Ae=W(108,\",\");W({m:109,l:189},\"-\",\"_\");W(18" +
+    "8,\",\",\"<\");W(190,\".\",\">\");W(191,\"/\",\"?\");W(192,\"`\",\"~\");W(219,\"[\"," +
+    "\"{\");W(220,\"\\\\\",\"|\");W(221,\"]\",\"}\");var Be=W({m:59,l:186},\";\",\":\")" +
+    ";W(222,\"'\",'\"');var Ce=[Kd,Jd,Yd,X],De=new wd;De.set(1,X);De.set(2" +
+    ",Jd);De.set(4,Kd);De.set(8,Yd);\nvar Ee=function(a){var b=new wd;p(" +
+    "Array.from(a.keys()),function(c){b.set(a.get(c).code,c)});return b" +
+    "}(De);function Dd(a,b,c){0<=Aa(Ce,b)&&Ee.get(b.code);c?a.j.add(b):" +
+    "(a=a.j,b=Bd(b),c=a.g,zd(c.h,b)&&(delete c.h[b],--c.size,c.j++,c.g." +
+    "length>2*c.size&&yd(c)),a.size=a.g.size)}function Y(a,b){return a." +
+    "j.has(b)}\nfunction Fe(a,b){if(0<=Aa(Ce,b)&&Y(a,b))throw new x(13,\"" +
+    "Cannot press a modifier key that is already pressed.\");var c=null!" +
+    "==b.code&&Ge(a,id,b);if(c&&(!b.g&&b!=Id||Ge(a,cd,b,!c))&&c&&(He(a," +
+    "b),a.i))if(b.g){c=Ie(a,b);var d=U(a.g,!0)[0]+1;Je(a.g)?(od(a.g,c)," +
+    "kd(a.g,d)):a.g.value+=c;S(a.g,hd);S(a.g,gd);a.h=d}else switch(b){c" +
+    "ase Id:S(a.g,hd);Q(a.g,\"TEXTAREA\")&&(c=U(a.g,!0)[0]+1,Je(a.g)?(od(" +
+    "a.g,\"\\n\"),kd(a.g,c)):a.g.value+=\"\\n\",S(a.g,gd),a.h=c);break;case G" +
+    "d:case Xd:Ke(a.g);c=U(a.g,!1);c[0]==c[1]&&(b==Gd?\n(kd(a.g,c[1]-1)," +
+    "md(a.g,c[1])):md(a.g,c[1]+1));c=U(a.g,!1);c=!(c[0]==a.g.value.leng" +
+    "th||0==c[1]);od(a.g,\"\");c&&S(a.g,gd);c=U(a.g,!1);a.h=c[1];break;ca" +
+    "se Sd:case Ud:Ke(a.g);c=a.g;var e=U(c,!0)[0],f=U(c,!1)[1],g=d=0;b=" +
+    "=Sd?Y(a,X)?a.h==e?(d=Math.max(e-1,0),g=f,e=d):(d=e,e=g=f-1):e=e==f" +
+    "?Math.max(e-1,0):e:Y(a,X)?a.h==f?(d=e,e=g=Math.min(f+1,c.value.len" +
+    "gth)):(d=e+1,g=f,e=d):e=e==f?Math.min(f+1,c.value.length):f;Y(a,X)" +
+    "?(kd(c,d),md(c,g)):nd(c,e);a.h=e;break;case Rd:case Qd:Ke(a.g),c=a" +
+    ".g,d=U(c,!0)[0],g=U(c,!1)[1],\nb==Rd?(Y(a,X)?(kd(c,0),md(c,a.h==d?g" +
+    ":d)):nd(c,0),a.h=0):(Y(a,X)?(a.h==d&&kd(c,g),md(c,c.value.length))" +
+    ":nd(c,c.value.length),a.h=c.value.length)}Dd(a,b,!0)}function He(a" +
+    ",b){b==Id&&Q(a.g,\"INPUT\")&&(a=Ya(a.g,Yc,!0))&&(b=a.getElementsByTa" +
+    "gName(\"input\"),!q(b,function(c){a:{if(Q(c,\"INPUT\")){var d=c.type.t" +
+    "oLowerCase();if(\"submit\"==d||\"image\"==d){c=!0;break a}}if(Q(c,\"BUT" +
+    "TON\")&&(d=c.type.toLowerCase(),\"submit\"==d)){c=!0;break a}c=!1}ret" +
+    "urn c})&&1!=b.length&&Pa()||Zc(a))}\nfunction Le(a,b){if(!Y(a,b))th" +
+    "row new x(13,\"Cannot release a key that is not pressed. (\"+b.code+" +
+    "\")\");null!==b.code&&Ge(a,jd,b);Dd(a,b,!1)}function Ie(a,b){if(!b.g" +
+    ")throw new x(13,\"not a character key\");return Y(a,X)?b.h:b.g}\nfunc" +
+    "tion Ke(a){try{if(null!==a.selectionStart)return}catch(b){if(-1!=b" +
+    ".message.indexOf(\"does not support selection.\"))throw Error(b.mess" +
+    "age+\" (For more information, see https://code.google.com/p/chromiu" +
+    "m/issues/detail?id=330456)\");throw b;}throw Error(\"Element does no" +
+    "t support selection\");}function Je(a){try{Ke(a)}catch(b){return!1}" +
+    "return!0}\nfunction Ge(a,b,c,d){if(null===c.code)throw new x(13,\"Ke" +
+    "y must have a keycode to be fired.\");c={altKey:Y(a,Kd),ctrlKey:Y(a" +
+    ",Jd),metaKey:Y(a,Yd),shiftKey:Y(a,X),keyCode:c.code,charCode:c.g&&" +
+    "b==cd?Ie(a,c).charCodeAt(0):0,preventDefault:!!d};return S(a.g,b,c" +
+    ")}function Me(a,b){Wc(a,b);a.i=Hc(b);var c=Xc(a);a.i&&c&&(nd(b,b.v" +
+    "alue.length),a.h=b.value.length)};function Ne(a,b,c,d){function e(" +
+    "k){\"string\"===typeof k?p(k.split(\"\"),function(l){if(1!=l.length)th" +
+    "row new x(13,\"Argument not a single character: \"+l);var m=Ed[l];m|" +
+    "|(m=l.toUpperCase(),m=W(m.charCodeAt(0),l.toLowerCase(),m),m={key:" +
+    "m,shift:l!=m.g});l=m;m=Y(f,X);l.shift&&!m&&Fe(f,X);Fe(f,l.key);Le(" +
+    "f,l.key);l.shift&&!m&&Le(f,X)}):0<=Aa(Ce,k)?Y(f,k)?Le(f,k):Fe(f,k)" +
+    ":(Fe(f,k),Le(f,k))}if(a!=Za(u(a))){if(!Bc(a))throw new x(12,\"Eleme" +
+    "nt is not currently interactable and may not be manipulated\");Oe(a" +
+    ")}var f=\nc||new Cd;Me(f,a);if(\"date\"==a.type){c=Array.isArray(b)?b" +
+    "=b.join(\"\"):b;var g=/\\d{4}-\\d{2}-\\d{2}/;if(c.match(g)){S(a,fd);a.v" +
+    "alue=c.match(g)[0];S(a,ed);S(a,dd);return}}Array.isArray(b)?p(b,e)" +
+    ":e(b);d||p(Ce,function(k){Y(f,k)&&Le(f,k)})}\nfunction Oe(a){if(\"sc" +
+    "roll\"==Qc(a)){if(a.scrollIntoView&&(a.scrollIntoView(),\"none\"==Qc(" +
+    "a)))return;for(var b=Tc(a),c=Mc(a);c;c=Mc(c)){var d=c,e=Pc(d);var " +
+    "f=d;var g=bb(f,\"borderLeftWidth\");var k=bb(f,\"borderRightWidth\");v" +
+    "ar l=bb(f,\"borderTopWidth\");f=bb(f,\"borderBottomWidth\");k=new ab(p" +
+    "arseFloat(l),parseFloat(k),parseFloat(f),parseFloat(g));g=b.left-e" +
+    ".left-k.left;e=b.top-e.top-k.top;k=d.clientHeight+b.top-b.h;d.scro" +
+    "llLeft+=Math.min(g,Math.max(g-(d.clientWidth+b.left-b.g),0));d.scr" +
+    "ollTop+=Math.min(e,\nMath.max(e-k,0))}Qc(a)}};function Pe(a,b,c,d){" +
+    "function e(){return{persist:f,keys:[]}}var f=!!d,g=[],k=e();g.push" +
+    "(k);p(b,function(l){p(l.split(\"\"),function(m){if(\"\\ue000\"<=m&&\"\\ue" +
+    "03d\">=m){var t=Qe[m];if(null===t)g.push(k=e()),f&&(k.persist=!1,g." +
+    "push(k=e()));else if(void 0!==t)k.keys.push(t);else throw Error(\"U" +
+    "nsupported WebDriver key: \\\\u\"+m.charCodeAt(0).toString(16));}else" +
+    " switch(m){case \"\\n\":k.keys.push(Id);break;case \"\\t\":k.keys.push(H" +
+    "d);break;case \"\\b\":k.keys.push(Gd);break;default:k.keys.push(m)}})" +
+    "});p(g,function(l){Ne(a,\nl.keys,c,l.persist)})}\nvar Qe={\"\\ue000\":n" +
+    "ull,\"\\ue003\":Gd,\"\\ue004\":Hd,\"\\ue006\":Id,\"\\ue007\":Id,\"\\ue008\":X,\"\\u" +
+    "e009\":Jd,\"\\ue00a\":Kd,\"\\ue00b\":Ld,\"\\ue00c\":Md,\"\\ue00d\":Nd,\"\\ue00e\":" +
+    "Od,\"\\ue00f\":Pd,\"\\ue010\":Qd,\"\\ue011\":Rd,\"\\ue012\":Sd,\"\\ue013\":Td,\"\\u" +
+    "e014\":Ud,\"\\ue015\":Vd,\"\\ue016\":Wd,\"\\ue017\":Xd,\"\\ue018\":Be,\"\\ue019\":" +
+    "ze,\"\\ue01a\":Zd,\"\\ue01b\":$d,\"\\ue01c\":ae,\"\\ue01d\":be,\"\\ue01e\":ce,\"\\u" +
+    "e01f\":de,\"\\ue020\":ee,\"\\ue021\":fe,\"\\ue022\":ge,\"\\ue023\":he,\"\\ue024\":" +
+    "ie,\"\\ue025\":je,\"\\ue027\":ke,\"\\ue028\":le,\"\\ue029\":me,\"\\ue026\":Ae,\"\\u" +
+    "e031\":ne,\"\\ue032\":oe,\n\"\\ue033\":pe,\"\\ue034\":qe,\"\\ue035\":re,\"\\ue036\"" +
+    ":se,\"\\ue037\":te,\"\\ue038\":ue,\"\\ue039\":ve,\"\\ue03a\":we,\"\\ue03b\":xe,\"\\" +
+    "ue03c\":ye,\"\\ue03d\":Yd};qa(\"_\",function(a,b,c,d){c=new Cd(c);a||(a=" +
+    "Za(u(document)));if(!a)throw Error(\"No element to send keys to\");P" +
+    "e(a,b,c,d);return{pressed:Array.from(c.j.values()),currentPos:c.h}" +
+    "});;return this._.apply(null,arguments);}).apply({navigator:typeof" +
+    " window!=\"undefined\"?window.navigator:null},arguments);}\n"
+  )
+  .toString();
+  static final String SEND_KEYS_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String SEND_KEYS_ANDROID_original() {
+    return SEND_KEYS_ANDROID.replaceAll("xxx_rpl_lic", SEND_KEYS_ANDROID_license);
+  }
+
+/* field: ACTIVE_ELEMENT_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String ACTIVE_ELEMENT_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar k=this||self;fu" +
+    "nction aa(a,b){a=a.split(\".\");var c=k;a[0]in c||\"undefined\"==typeo" +
+    "f c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d=a" +
+    ".shift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]?c" +
+    "=c[d]:c=c[d]={}:c[d]=b}function ba(a,b,c){return a.call.apply(a.bi" +
+    "nd,arguments)}\nfunction ca(a,b,c){if(!a)throw Error();if(2<argumen" +
+    "ts.length){var d=Array.prototype.slice.call(arguments,2);return fu" +
+    "nction(){var e=Array.prototype.slice.call(arguments);Array.prototy" +
+    "pe.unshift.apply(e,d);return a.apply(b,e)}}return function(){retur" +
+    "n a.apply(b,arguments)}}function l(a,b,c){Function.prototype.bind&" +
+    "&-1!=Function.prototype.bind.toString().indexOf(\"native code\")?l=b" +
+    "a:l=ca;return l.apply(null,arguments)}\nfunction da(a,b){var c=Arra" +
+    "y.prototype.slice.call(arguments,1);return function(){var d=c.slic" +
+    "e();d.push.apply(d,arguments);return a.apply(this,d)}}function m(a" +
+    ",b){function c(){}c.prototype=b.prototype;a.O=b.prototype;a.protot" +
+    "ype=new c;a.prototype.constructor=a;a.N=function(d,e,f){for(var g=" +
+    "Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=argume" +
+    "nts[h];return b.prototype[e].apply(d,g)}};function n(a,b){if(Error" +
+    ".captureStackTrace)Error.captureStackTrace(this,n);else{var c=Erro" +
+    "r().stack;c&&(this.stack=c)}a&&(this.message=String(a));void 0!==b" +
+    "&&(this.cause=b)}m(n,Error);n.prototype.name=\"CustomError\";functio" +
+    "n ea(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length-1,e=0;e<d;e++)c+" +
+    "=a[e]+(e<b.length?b[e]:\"%s\");n.call(this,c+a[d])}m(ea,n);ea.protot" +
+    "ype.name=\"AssertionError\";function fa(a,b,c){if(!a){var d=\"Asserti" +
+    "on failed\";if(b){d+=\": \"+b;var e=Array.prototype.slice.call(argume" +
+    "nts,2)}throw new ea(\"\"+d,e||[]);}};function p(a,b){for(var c=a.len" +
+    "gth,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)e in d&&b.call" +
+    "(void 0,d[e],e,a)}function q(a,b,c){var d=c;p(a,function(e,f){d=b." +
+    "call(void 0,d,e,f,a)});return d}function r(a,b){for(var c=a.length" +
+    ",d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)if(e in d&&b.call" +
+    "(void 0,d[e],e,a))return!0;return!1}function ha(a){return Array.pr" +
+    "ototype.concat.apply([],arguments)}\nfunction ia(a,b,c){fa(null!=a." +
+    "length);return 2>=arguments.length?Array.prototype.slice.call(a,b)" +
+    ":Array.prototype.slice.call(a,b,c)};var ja=String.prototype.trim?f" +
+    "unction(a){return a.trim()}:function(a){return/^[\\s\\xa0]*([\\s\\S]*?" +
+    ")[\\s\\xa0]*$/.exec(a)[1]};function ka(a,b){return a<b?-1:a>b?1:0};f" +
+    "unction la(){var a=k.navigator;return a&&(a=a.userAgent)?a:\"\"};fun" +
+    "ction ma(a,b){if(!a||!b)return!1;if(a.contains&&1==b.nodeType)retu" +
+    "rn a==b||a.contains(b);if(\"undefined\"!=typeof a.compareDocumentPos" +
+    "ition)return a==b||!!(a.compareDocumentPosition(b)&16);for(;b&&a!=" +
+    "b;)b=b.parentNode;return b==a}\nfunction na(a,b){if(a==b)return 0;i" +
+    "f(a.compareDocumentPosition)return a.compareDocumentPosition(b)&2?" +
+    "1:-1;if(\"sourceIndex\"in a||a.parentNode&&\"sourceIndex\"in a.parentN" +
+    "ode){var c=1==a.nodeType,d=1==b.nodeType;if(c&&d)return a.sourceIn" +
+    "dex-b.sourceIndex;var e=a.parentNode,f=b.parentNode;return e==f?oa" +
+    "(a,b):!c&&ma(e,b)?-1*pa(a,b):!d&&ma(f,a)?pa(b,a):(c?a.sourceIndex:" +
+    "e.sourceIndex)-(d?b.sourceIndex:f.sourceIndex)}fa(a,\"Node cannot b" +
+    "e null or undefined.\");d=9==a.nodeType?a:a.ownerDocument||a.docume" +
+    "nt;c=\nd.createRange();c.selectNode(a);c.collapse(!0);a=d.createRan" +
+    "ge();a.selectNode(b);a.collapse(!0);return c.compareBoundaryPoints" +
+    "(k.Range.START_TO_END,a)}function pa(a,b){var c=a.parentNode;if(c=" +
+    "=b)return-1;for(;b.parentNode!=c;)b=b.parentNode;return oa(b,a)}fu" +
+    "nction oa(a,b){for(;b=b.previousSibling;)if(b==a)return-1;return 1" +
+    "};function qa(a){return(a=a.exec(la()))?a[1]:\"\"}qa(/Android\\s+([0-" +
+    "9.]+)/)||qa(/Version\\/([0-9.]+)/);/*\n\n Copyright 2014 Software Fre" +
+    "edom Conservancy\n\n Licensed under the Apache License, Version 2.0 " +
+    "(the \"License\");\n you may not use this file except in compliance w" +
+    "ith the License.\n You may obtain a copy of the License at\n\n      h" +
+    "ttp://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by app" +
+    "licable law or agreed to in writing, software\n distributed under t" +
+    "he License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES" +
+    " OR CONDITIONS OF ANY KIND, either express or implied.\n See the Li" +
+    "cense for the specific language governing permissions and\n limitat" +
+    "ions under the License.\n*/\nfunction ra(a){var b=0,c=ja(String(sa))" +
+    ".split(\".\");a=ja(String(a)).split(\".\");for(var d=Math.max(c.length" +
+    ",a.length),e=0;0==b&&e<d;e++){var f=c[e]||\"\",g=a[e]||\"\";do{f=/(\\d*" +
+    ")(\\D*)(.*)/.exec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\"" +
+    ",\"\",\"\",\"\"];if(0==f[0].length&&0==g[0].length)break;b=ka(0==f[1].le" +
+    "ngth?0:parseInt(f[1],10),0==g[1].length?0:parseInt(g[1],10))||ka(0" +
+    "==f[2].length,0==g[2].length)||ka(f[2],g[2]);f=f[3];g=g[3]}while(0" +
+    "==b)}}var ta=/Android\\s+([0-9\\.]+)/.exec(la()),sa=ta?ta[1]:\"0\";ra(" +
+    "2.3);\nra(4);/*\n\n The MIT License\n\n Copyright (c) 2007 Cybozu Labs," +
+    " Inc.\n Copyright (c) 2012 Google Inc.\n\n Permission is hereby grant" +
+    "ed, free of charge, to any person obtaining a copy\n of this softwa" +
+    "re and associated documentation files (the \"Software\"), to\n deal i" +
+    "n the Software without restriction, including without limitation t" +
+    "he\n rights to use, copy, modify, merge, publish, distribute, subli" +
+    "cense, and/or\n sell copies of the Software, and to permit persons " +
+    "to whom the Software is\n furnished to do so, subject to the follow" +
+    "ing conditions:\n\n The above copyright notice and this permission n" +
+    "otice shall be included in\n all copies or substantial portions of " +
+    "the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY" +
+    " OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMITED TO TH" +
+    "E WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR PURPOSE" +
+    " AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR COPYRIGHT " +
+    "HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILITY, WHET" +
+    "HER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n FROM, OU" +
+    "T OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALIN" +
+    "GS\n IN THE SOFTWARE.\n*/\nfunction u(a,b,c){this.g=a;this.j=b||1;thi" +
+    "s.h=c||1};function ua(a){this.h=a;this.g=0}function va(a){a=a.matc" +
+    "h(wa);for(var b=0;b<a.length;b++)xa.test(a[b])&&a.splice(b,1);retu" +
+    "rn new ua(a)}var wa=RegExp(\"\\\\$?(?:(?![0-9-])[\\\\w-]+:)?(?![0-9-])[" +
+    "\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[^\\\"]*\\\"|'[^']*" +
+    "'|[!<>]=|\\\\s+|.\",\"g\"),xa=/^\\s/;function v(a,b){return a.h[a.g+(b||" +
+    "0)]}ua.prototype.next=function(){return this.h[this.g++]};function" +
+    " w(a){return a.h.length<=a.g};function x(a){var b=null,c=a.nodeTyp" +
+    "e;1==c&&(b=a.textContent,b=void 0==b||null==b?a.innerText:b,b=void" +
+    " 0==b||null==b?\"\":b);if(\"string\"!=typeof b)if(9==c||1==c){a=9==c?a" +
+    ".documentElement:a.firstChild;c=0;var d=[];for(b=\"\";a;){do 1!=a.no" +
+    "deType&&(b+=a.nodeValue),d[c++]=a;while(a=a.firstChild);for(;c&&!(" +
+    "a=d[--c].nextSibling););}}else b=a.nodeValue;return\"\"+b}\nfunction " +
+    "z(a,b,c){if(null===b)return!0;try{if(!a.getAttribute)return!1}catc" +
+    "h(d){return!1}return null==c?!!a.getAttribute(b):a.getAttribute(b," +
+    "2)==c}function A(a,b,c,d,e){return ya.call(null,a,b,\"string\"===typ" +
+    "eof c?c:null,\"string\"===typeof d?d:null,e||new B)}\nfunction ya(a,b" +
+    ",c,d,e){b.getElementsByName&&d&&\"name\"==c?(b=b.getElementsByName(d" +
+    "),p(b,function(f){a.g(f)&&e.add(f)})):b.getElementsByClassName&&d&" +
+    "&\"class\"==c?(b=b.getElementsByClassName(d),p(b,function(f){f.class" +
+    "Name==d&&a.g(f)&&e.add(f)})):a instanceof C?za(a,b,c,d,e):b.getEle" +
+    "mentsByTagName&&(b=b.getElementsByTagName(a.j()),p(b,function(f){z" +
+    "(f,c,d)&&e.add(f)}));return e}function za(a,b,c,d,e){for(b=b.first" +
+    "Child;b;b=b.nextSibling)z(b,c,d)&&a.g(b)&&e.add(b),za(a,b,c,d,e)};" +
+    "function B(){this.j=this.g=null;this.h=0}function Aa(a){this.h=a;t" +
+    "his.next=this.g=null}function Ba(a,b){if(!a.g)return b;if(!b.g)ret" +
+    "urn a;var c=a.g;b=b.g;for(var d=null,e,f=0;c&&b;)c.h==b.h?(e=c,c=c" +
+    ".next,b=b.next):0<na(c.h,b.h)?(e=b,b=b.next):(e=c,c=c.next),(e.g=d" +
+    ")?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;)e.g=d,d=d.next=e,f++,e=e.ne" +
+    "xt;a.j=d;a.h=f;return a}function Ca(a,b){b=new Aa(b);b.next=a.g;a." +
+    "j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nB.prototype.add=function(a){a=new" +
+    " Aa(a);a.g=this.j;this.g?this.j.next=a:this.g=this.j=a;this.j=a;th" +
+    "is.h++};function D(a){return(a=a.g)?a.h:null}function E(a){return(" +
+    "a=D(a))?x(a):\"\"}function F(a,b){return new Da(a,!!b)}function Da(a" +
+    ",b){this.j=a;this.h=(this.A=b)?a.j:a.g;this.g=null}Da.prototype.ne" +
+    "xt=function(){var a=this.h;if(null==a)return null;var b=this.g=a;t" +
+    "his.h=this.A?a.g:a.next;return b.h};function Ea(a){switch(a.nodeTy" +
+    "pe){case 1:return da(Fa,a);case 9:return Ea(a.documentElement);cas" +
+    "e 11:case 10:case 6:case 12:return Ga;default:return a.parentNode?" +
+    "Ea(a.parentNode):Ga}}function Ga(){return null}function Fa(a,b){if" +
+    "(a.prefix==b)return a.namespaceURI||\"http://www.w3.org/1999/xhtml\"" +
+    ";var c=a.getAttributeNode(\"xmlns:\"+b);return c&&c.specified?c.valu" +
+    "e||null:a.parentNode&&9!=a.parentNode.nodeType?Fa(a.parentNode,b):" +
+    "null};function G(a){this.o=a;this.h=this.l=!1;this.j=null}function" +
+    " H(a){return\"\\n  \"+a.toString().split(\"\\n\").join(\"\\n  \")}function " +
+    "Ha(a,b){a.l=b}function Ia(a,b){a.h=b}function I(a,b){a=a.g(b);retu" +
+    "rn a instanceof B?+E(a):+a}function J(a,b){a=a.g(b);return a insta" +
+    "nceof B?E(a):\"\"+a}function L(a,b){a=a.g(b);return a instanceof B?!" +
+    "!a.h:!!a};function M(a,b,c){G.call(this,a.o);this.i=a;this.m=b;thi" +
+    "s.v=c;this.l=b.l||c.l;this.h=b.h||c.h;this.i==Ja&&(c.h||c.l||4==c." +
+    "o||0==c.o||!b.j?b.h||b.l||4==b.o||0==b.o||!c.j||(this.j={name:c.j." +
+    "name,B:b}):this.j={name:b.j.name,B:c})}m(M,G);\nfunction N(a,b,c,d," +
+    "e){b=b.g(d);c=c.g(d);var f;if(b instanceof B&&c instanceof B){b=F(" +
+    "b);for(d=b.next();d;d=b.next())for(e=F(c),f=e.next();f;f=e.next())" +
+    "if(a(x(d),x(f)))return!0;return!1}if(b instanceof B||c instanceof " +
+    "B){b instanceof B?(e=b,d=c):(e=c,d=b);f=F(e);for(var g=typeof d,h=" +
+    "f.next();h;h=f.next()){switch(g){case \"number\":h=+x(h);break;case " +
+    "\"boolean\":h=!!x(h);break;case \"string\":h=x(h);break;default:throw " +
+    "Error(\"Illegal primitive type for comparison.\");}if(e==b&&a(h,d)||" +
+    "e==c&&a(d,h))return!0}return!1}return e?\n\"boolean\"==typeof b||\"boo" +
+    "lean\"==typeof c?a(!!b,!!c):\"number\"==typeof b||\"number\"==typeof c?" +
+    "a(+b,+c):a(b,c):a(+b,+c)}M.prototype.g=function(a){return this.i.u" +
+    "(this.m,this.v,a)};M.prototype.toString=function(){var a=\"Binary E" +
+    "xpression: \"+this.i;a+=H(this.m);return a+=H(this.v)};function Ka(" +
+    "a,b,c,d){this.L=a;this.H=b;this.o=c;this.u=d}Ka.prototype.toString" +
+    "=function(){return this.L};var La={};\nfunction O(a,b,c,d){if(La.ha" +
+    "sOwnProperty(a))throw Error(\"Binary operator already created: \"+a)" +
+    ";a=new Ka(a,b,c,d);return La[a.toString()]=a}O(\"div\",6,1,function(" +
+    "a,b,c){return I(a,c)/I(b,c)});O(\"mod\",6,1,function(a,b,c){return I" +
+    "(a,c)%I(b,c)});O(\"*\",6,1,function(a,b,c){return I(a,c)*I(b,c)});O(" +
+    "\"+\",5,1,function(a,b,c){return I(a,c)+I(b,c)});O(\"-\",5,1,function(" +
+    "a,b,c){return I(a,c)-I(b,c)});O(\"<\",4,2,function(a,b,c){return N(f" +
+    "unction(d,e){return d<e},a,b,c)});\nO(\">\",4,2,function(a,b,c){retur" +
+    "n N(function(d,e){return d>e},a,b,c)});O(\"<=\",4,2,function(a,b,c){" +
+    "return N(function(d,e){return d<=e},a,b,c)});O(\">=\",4,2,function(a" +
+    ",b,c){return N(function(d,e){return d>=e},a,b,c)});var Ja=O(\"=\",3," +
+    "2,function(a,b,c){return N(function(d,e){return d==e},a,b,c,!0)});" +
+    "O(\"!=\",3,2,function(a,b,c){return N(function(d,e){return d!=e},a,b" +
+    ",c,!0)});O(\"and\",2,2,function(a,b,c){return L(a,c)&&L(b,c)});O(\"or" +
+    "\",1,2,function(a,b,c){return L(a,c)||L(b,c)});function P(a,b){if(b" +
+    ".g.length&&4!=a.o)throw Error(\"Primary expression must evaluate to" +
+    " nodeset if filter has predicate(s).\");G.call(this,a.o);this.m=a;t" +
+    "his.i=b;this.l=a.l;this.h=a.h}m(P,G);P.prototype.g=function(a){a=t" +
+    "his.m.g(a);return Ma(this.i,a)};P.prototype.toString=function(){va" +
+    "r a=\"Filter:\"+H(this.m);return a+=H(this.i)};function Q(a,b){if(b." +
+    "length<a.G)throw Error(\"Function \"+a.s+\" expects at least\"+a.G+\" a" +
+    "rguments, \"+b.length+\" given\");if(null!==a.D&&b.length>a.D)throw E" +
+    "rror(\"Function \"+a.s+\" expects at most \"+a.D+\" arguments, \"+b.leng" +
+    "th+\" given\");a.K&&p(b,function(c,d){if(4!=c.o)throw Error(\"Argumen" +
+    "t \"+d+\" to function \"+a.s+\" is not of type Nodeset: \"+c);});G.call" +
+    "(this,a.o);this.C=a;this.i=b;Ha(this,a.l||r(b,function(c){return c" +
+    ".l}));Ia(this,a.J&&!b.length||a.I&&!!b.length||r(b,function(c){ret" +
+    "urn c.h}))}m(Q,G);\nQ.prototype.g=function(a){return this.C.u.apply" +
+    "(null,ha(a,this.i))};Q.prototype.toString=function(){var a=\"Functi" +
+    "on: \"+this.C;if(this.i.length){var b=q(this.i,function(c,d){return" +
+    " c+H(d)},\"Arguments:\");a+=H(b)}return a};function Na(a,b,c,d,e,f,g" +
+    ",h){this.s=a;this.o=b;this.l=c;this.J=d;this.I=!1;this.u=e;this.G=" +
+    "f;this.D=void 0!==g?g:f;this.K=!!h}Na.prototype.toString=function(" +
+    "){return this.s};var Oa={};\nfunction R(a,b,c,d,e,f,g,h){if(Oa.hasO" +
+    "wnProperty(a))throw Error(\"Function already created: \"+a+\".\");Oa[a" +
+    "]=new Na(a,b,c,d,e,f,g,h)}R(\"boolean\",2,!1,!1,function(a,b){return" +
+    " L(b,a)},1);R(\"ceiling\",1,!1,!1,function(a,b){return Math.ceil(I(b" +
+    ",a))},1);R(\"concat\",3,!1,!1,function(a,b){var c=ia(arguments,1);re" +
+    "turn q(c,function(d,e){return d+J(e,a)},\"\")},2,null);R(\"contains\"," +
+    "2,!1,!1,function(a,b,c){b=J(b,a);a=J(c,a);return-1!=b.indexOf(a)}," +
+    "2);R(\"count\",1,!1,!1,function(a,b){return b.g(a).h},1,1,!0);\nR(\"fa" +
+    "lse\",2,!1,!1,function(){return!1},0);R(\"floor\",1,!1,!1,function(a," +
+    "b){return Math.floor(I(b,a))},1);R(\"id\",4,!1,!1,function(a,b){var " +
+    "c=a.g,d=9==c.nodeType?c:c.ownerDocument;a=J(b,a).split(/\\s+/);var " +
+    "e=[];p(a,function(g){g=d.getElementById(g);var h;if(!(h=!g)){a:if(" +
+    "\"string\"===typeof e)h=\"string\"!==typeof g||1!=g.length?-1:e.indexO" +
+    "f(g,0);else{for(h=0;h<e.length;h++)if(h in e&&e[h]===g)break a;h=-" +
+    "1}h=0<=h}h||e.push(g)});e.sort(na);var f=new B;p(e,function(g){f.a" +
+    "dd(g)});return f},1);\nR(\"lang\",2,!1,!1,function(){return!1},1);R(\"" +
+    "last\",1,!0,!1,function(a){if(1!=arguments.length)throw Error(\"Func" +
+    "tion last expects ()\");return a.h},0);R(\"local-name\",3,!1,!0,funct" +
+    "ion(a,b){return(a=b?D(b.g(a)):a.g)?a.localName||a.nodeName.toLower" +
+    "Case():\"\"},0,1,!0);R(\"name\",3,!1,!0,function(a,b){return(a=b?D(b.g" +
+    "(a)):a.g)?a.nodeName.toLowerCase():\"\"},0,1,!0);R(\"namespace-uri\",3" +
+    ",!0,!1,function(){return\"\"},0,1,!0);\nR(\"normalize-space\",3,!1,!0,f" +
+    "unction(a,b){return(b?J(b,a):x(a.g)).replace(/[\\s\\xa0]+/g,\" \").rep" +
+    "lace(/^\\s+|\\s+$/g,\"\")},0,1);R(\"not\",2,!1,!1,function(a,b){return!L" +
+    "(b,a)},1);R(\"number\",1,!1,!0,function(a,b){return b?I(b,a):+x(a.g)" +
+    "},0,1);R(\"position\",1,!0,!1,function(a){return a.j},0);R(\"round\",1" +
+    ",!1,!1,function(a,b){return Math.round(I(b,a))},1);R(\"starts-with\"" +
+    ",2,!1,!1,function(a,b,c){b=J(b,a);a=J(c,a);return 0==b.lastIndexOf" +
+    "(a,0)},2);R(\"string\",3,!1,!0,function(a,b){return b?J(b,a):x(a.g)}" +
+    ",0,1);\nR(\"string-length\",1,!1,!0,function(a,b){return(b?J(b,a):x(a" +
+    ".g)).length},0,1);R(\"substring\",3,!1,!1,function(a,b,c,d){c=I(c,a)" +
+    ";if(isNaN(c)||Infinity==c||-Infinity==c)return\"\";d=d?I(d,a):Infini" +
+    "ty;if(isNaN(d)||-Infinity===d)return\"\";c=Math.round(c)-1;var e=Mat" +
+    "h.max(c,0);a=J(b,a);return Infinity==d?a.substring(e):a.substring(" +
+    "e,c+Math.round(d))},2,3);R(\"substring-after\",3,!1,!1,function(a,b," +
+    "c){b=J(b,a);a=J(c,a);c=b.indexOf(a);return-1==c?\"\":b.substring(c+a" +
+    ".length)},2);\nR(\"substring-before\",3,!1,!1,function(a,b,c){b=J(b,a" +
+    ");a=J(c,a);a=b.indexOf(a);return-1==a?\"\":b.substring(0,a)},2);R(\"s" +
+    "um\",1,!1,!1,function(a,b){a=F(b.g(a));b=0;for(var c=a.next();c;c=a" +
+    ".next())b+=+x(c);return b},1,1,!0);R(\"translate\",3,!1,!1,function(" +
+    "a,b,c,d){b=J(b,a);c=J(c,a);var e=J(d,a);a={};for(d=0;d<c.length;d+" +
+    "+){var f=c.charAt(d);f in a||(a[f]=e.charAt(d))}c=\"\";for(d=0;d<b.l" +
+    "ength;d++)f=b.charAt(d),c+=f in a?a[f]:f;return c},3);R(\"true\",2,!" +
+    "1,!1,function(){return!0},0);function C(a,b){this.m=a;this.i=void " +
+    "0!==b?b:null;this.h=null;switch(a){case \"comment\":this.h=8;break;c" +
+    "ase \"text\":this.h=3;break;case \"processing-instruction\":this.h=7;b" +
+    "reak;case \"node\":break;default:throw Error(\"Unexpected argument\");" +
+    "}}function Pa(a){return\"comment\"==a||\"text\"==a||\"processing-instru" +
+    "ction\"==a||\"node\"==a}C.prototype.g=function(a){return null===this." +
+    "h||this.h==a.nodeType};C.prototype.getType=function(){return this." +
+    "h};C.prototype.j=function(){return this.m};\nC.prototype.toString=f" +
+    "unction(){var a=\"Kind Test: \"+this.m;null!==this.i&&(a+=H(this.i))" +
+    ";return a};function S(a){G.call(this,3);this.i=a.substring(1,a.len" +
+    "gth-1)}m(S,G);S.prototype.g=function(){return this.i};S.prototype." +
+    "toString=function(){return\"Literal: \"+this.i};function T(a,b){this" +
+    ".s=a.toLowerCase();this.h=b?b.toLowerCase():\"http://www.w3.org/199" +
+    "9/xhtml\"}T.prototype.g=function(a){var b=a.nodeType;return 1!=b&&2" +
+    "!=b?!1:\"*\"!=this.s&&this.s!=a.nodeName.toLowerCase()?!1:this.h==(a" +
+    ".namespaceURI?a.namespaceURI.toLowerCase():\"http://www.w3.org/1999" +
+    "/xhtml\")};T.prototype.j=function(){return this.s};T.prototype.toSt" +
+    "ring=function(){return\"Name Test: \"+(\"http://www.w3.org/1999/xhtml" +
+    "\"==this.h?\"\":this.h+\":\")+this.s};function U(a){G.call(this,1);this" +
+    ".i=a}m(U,G);U.prototype.g=function(){return this.i};U.prototype.to" +
+    "String=function(){return\"Number: \"+this.i};function Qa(a,b){G.call" +
+    "(this,a.o);this.m=a;this.i=b;this.l=a.l;this.h=a.h;1==this.i.lengt" +
+    "h&&(a=this.i[0],a.F||a.i!=Ra||(a=a.v,\"*\"!=a.j()&&(this.j={name:a.j" +
+    "(),B:null})))}m(Qa,G);function V(){G.call(this,4)}m(V,G);V.prototy" +
+    "pe.g=function(a){var b=new B;a=a.g;9==a.nodeType?b.add(a):b.add(a." +
+    "ownerDocument);return b};V.prototype.toString=function(){return\"Ro" +
+    "ot Helper Expression\"};function Sa(){G.call(this,4)}m(Sa,G);Sa.pro" +
+    "totype.g=function(a){var b=new B;b.add(a.g);return b};Sa.prototype" +
+    ".toString=function(){return\"Context Helper Expression\"};\nfunction " +
+    "Ta(a){return\"/\"==a||\"//\"==a}Qa.prototype.g=function(a){var b=this." +
+    "m.g(a);if(!(b instanceof B))throw Error(\"Filter expression must ev" +
+    "aluate to nodeset.\");a=this.i;for(var c=0,d=a.length;c<d&&b.h;c++)" +
+    "{var e=a[c],f=F(b,e.i.A);if(e.l||e.i!=Ua)if(e.l||e.i!=Va){var g=f." +
+    "next();for(b=e.g(new u(g));null!=(g=f.next());)g=e.g(new u(g)),b=B" +
+    "a(b,g)}else g=f.next(),b=e.g(new u(g));else{for(g=f.next();(b=f.ne" +
+    "xt())&&(!g.contains||g.contains(b))&&b.compareDocumentPosition(g)&" +
+    "8;g=b);b=e.g(new u(g))}}return b};\nQa.prototype.toString=function(" +
+    "){var a=\"Path Expression:\"+H(this.m);if(this.i.length){var b=q(thi" +
+    "s.i,function(c,d){return c+H(d)},\"Steps:\");a+=H(b)}return a};funct" +
+    "ion Wa(a,b){this.g=a;this.A=!!b}\nfunction Ma(a,b,c){for(c=c||0;c<a" +
+    ".g.length;c++)for(var d=a.g[c],e=F(b),f=b.h,g,h=0;g=e.next();h++){" +
+    "var t=a.A?f-h:h+1;g=d.g(new u(g,t,f));if(\"number\"==typeof g)t=t==g" +
+    ";else if(\"string\"==typeof g||\"boolean\"==typeof g)t=!!g;else if(g i" +
+    "nstanceof B)t=0<g.h;else throw Error(\"Predicate.evaluate returned " +
+    "an unexpected type.\");if(!t){t=e;g=t.j;var y=t.g;if(!y)throw Error" +
+    "(\"Next must be called at least once before remove.\");var K=y.g;y=y" +
+    ".next;K?K.next=y:g.g=y;y?y.g=K:g.j=K;g.h--;t.g=null}}return b}\nWa." +
+    "prototype.toString=function(){return q(this.g,function(a,b){return" +
+    " a+H(b)},\"Predicates:\")};function W(a,b,c,d){G.call(this,4);this.i" +
+    "=a;this.v=b;this.m=c||new Wa([]);this.F=!!d;b=this.m;b=0<b.g.lengt" +
+    "h?b.g[0].j:null;a.M&&b&&(this.j={name:b.name,B:b.B});a:{a=this.m;f" +
+    "or(b=0;b<a.g.length;b++)if(c=a.g[b],c.l||1==c.o||0==c.o){a=!0;brea" +
+    "k a}a=!1}this.l=a}m(W,G);\nW.prototype.g=function(a){var b=a.g,c=th" +
+    "is.j,d=null,e=null,f=0;c&&(d=c.name,e=c.B?J(c.B,a):null,f=1);if(th" +
+    "is.F)if(this.l||this.i!=Xa)if(b=F((new W(Ya,new C(\"node\"))).g(a))," +
+    "c=b.next())for(a=this.u(c,d,e,f);null!=(c=b.next());)a=Ba(a,this.u" +
+    "(c,d,e,f));else a=new B;else a=A(this.v,b,d,e),a=Ma(this.m,a,f);el" +
+    "se a=this.u(a.g,d,e,f);return a};W.prototype.u=function(a,b,c,d){a" +
+    "=this.i.C(this.v,a,b,c);return a=Ma(this.m,a,d)};\nW.prototype.toSt" +
+    "ring=function(){var a=\"Step:\"+H(\"Operator: \"+(this.F?\"//\":\"/\"));th" +
+    "is.i.s&&(a+=H(\"Axis: \"+this.i));a+=H(this.v);if(this.m.g.length){v" +
+    "ar b=q(this.m.g,function(c,d){return c+H(d)},\"Predicates:\");a+=H(b" +
+    ")}return a};function Za(a,b,c,d){this.s=a;this.C=b;this.A=c;this.M" +
+    "=d}Za.prototype.toString=function(){return this.s};var $a={};funct" +
+    "ion X(a,b,c,d){if($a.hasOwnProperty(a))throw Error(\"Axis already c" +
+    "reated: \"+a);b=new Za(a,b,c,!!d);return $a[a]=b}\nX(\"ancestor\",func" +
+    "tion(a,b){for(var c=new B;b=b.parentNode;)a.g(b)&&Ca(c,b);return c" +
+    "},!0);X(\"ancestor-or-self\",function(a,b){var c=new B;do a.g(b)&&Ca" +
+    "(c,b);while(b=b.parentNode);return c},!0);\nvar Ra=X(\"attribute\",fu" +
+    "nction(a,b){var c=new B,d=a.j();if(b=b.attributes)if(a instanceof " +
+    "C&&null===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);else(d=b" +
+    ".getNamedItem(d))&&c.add(d);return c},!1),Xa=X(\"child\",function(a," +
+    "b,c,d,e){c=\"string\"===typeof c?c:null;d=\"string\"===typeof d?d:null" +
+    ";e=e||new B;for(b=b.firstChild;b;b=b.nextSibling)z(b,c,d)&&a.g(b)&" +
+    "&e.add(b);return e},!1,!0);X(\"descendant\",A,!1,!0);\nvar Ya=X(\"desc" +
+    "endant-or-self\",function(a,b,c,d){var e=new B;z(b,c,d)&&a.g(b)&&e." +
+    "add(b);return A(a,b,c,d,e)},!1,!0),Ua=X(\"following\",function(a,b,c" +
+    ",d){var e=new B;do for(var f=b;f=f.nextSibling;)z(f,c,d)&&a.g(f)&&" +
+    "e.add(f),e=A(a,f,c,d,e);while(b=b.parentNode);return e},!1,!0);X(\"" +
+    "following-sibling\",function(a,b){for(var c=new B;b=b.nextSibling;)" +
+    "a.g(b)&&c.add(b);return c},!1);X(\"namespace\",function(){return new" +
+    " B},!1);\nvar ab=X(\"parent\",function(a,b){var c=new B;if(9==b.nodeT" +
+    "ype)return c;if(2==b.nodeType)return c.add(b.ownerElement),c;b=b.p" +
+    "arentNode;a.g(b)&&c.add(b);return c},!1),Va=X(\"preceding\",function" +
+    "(a,b,c,d){var e=new B,f=[];do f.unshift(b);while(b=b.parentNode);f" +
+    "or(var g=1,h=f.length;g<h;g++){var t=[];for(b=f[g];b=b.previousSib" +
+    "ling;)t.unshift(b);for(var y=0,K=t.length;y<K;y++)b=t[y],z(b,c,d)&" +
+    "&a.g(b)&&e.add(b),e=A(a,b,c,d,e)}return e},!0,!0);\nX(\"preceding-si" +
+    "bling\",function(a,b){for(var c=new B;b=b.previousSibling;)a.g(b)&&" +
+    "Ca(c,b);return c},!0);var bb=X(\"self\",function(a,b){var c=new B;a." +
+    "g(b)&&c.add(b);return c},!1);function cb(a){G.call(this,1);this.i=" +
+    "a;this.l=a.l;this.h=a.h}m(cb,G);cb.prototype.g=function(a){return-" +
+    "I(this.i,a)};cb.prototype.toString=function(){return\"Unary Express" +
+    "ion: -\"+H(this.i)};function db(a){G.call(this,4);this.i=a;Ha(this," +
+    "r(this.i,function(b){return b.l}));Ia(this,r(this.i,function(b){re" +
+    "turn b.h}))}m(db,G);db.prototype.g=function(a){var b=new B;p(this." +
+    "i,function(c){c=c.g(a);if(!(c instanceof B))throw Error(\"Path expr" +
+    "ession must evaluate to NodeSet.\");b=Ba(b,c)});return b};db.protot" +
+    "ype.toString=function(){return q(this.i,function(a,b){return a+H(b" +
+    ")},\"Union Expression:\")};function eb(a,b){this.g=a;this.h=b}functi" +
+    "on fb(a){for(var b,c=[];;){Y(a,\"Missing right hand side of binary " +
+    "expression.\");b=gb(a);var d=a.g.next();if(!d)break;var e=(d=La[d]|" +
+    "|null)&&d.H;if(!e){a.g.g--;break}for(;c.length&&e<=c[c.length-1].H" +
+    ";)b=new M(c.pop(),c.pop(),b);c.push(b,d)}for(;c.length;)b=new M(c." +
+    "pop(),c.pop(),b);return b}function Y(a,b){if(w(a.g))throw Error(b)" +
+    ";}function hb(a,b){a=a.g.next();if(a!=b)throw Error(\"Bad token, ex" +
+    "pected: \"+b+\" got: \"+a);}\nfunction ib(a){a=a.g.next();if(\")\"!=a)th" +
+    "row Error(\"Bad token: \"+a);}function jb(a){a=a.g.next();if(2>a.len" +
+    "gth)throw Error(\"Unclosed literal string\");return new S(a)}functio" +
+    "n kb(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c)return new T(b)" +
+    ";var d=b.substring(0,c);a=a.h(d);if(!a)throw Error(\"Namespace pref" +
+    "ix not declared: \"+d);b=b.substr(c+1);return new T(b,a)}\nfunction " +
+    "lb(a){var b=[];if(Ta(v(a.g))){var c=a.g.next();var d=v(a.g);if(\"/\"" +
+    "==c&&(w(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&!/(?![0-9])[\\w]/.te" +
+    "st(d)))return new V;d=new V;Y(a,\"Missing next location step.\");c=m" +
+    "b(a,c);b.push(c)}else{a:{c=v(a.g);d=c.charAt(0);switch(d){case \"$\"" +
+    ":throw Error(\"Variable reference not allowed in HTML XPath\");case " +
+    "\"(\":a.g.next();c=fb(a);Y(a,'unclosed \"(\"');hb(a,\")\");break;case '\"" +
+    "':case \"'\":c=jb(a);break;default:if(isNaN(+c))if(!Pa(c)&&/(?![0-9]" +
+    ")[\\w]/.test(d)&&\"(\"==v(a.g,1)){c=\na.g.next();c=Oa[c]||null;a.g.nex" +
+    "t();for(d=[];\")\"!=v(a.g);){Y(a,\"Missing function argument list.\");" +
+    "d.push(fb(a));if(\",\"!=v(a.g))break;a.g.next()}Y(a,\"Unclosed functi" +
+    "on argument list.\");ib(a);c=new Q(c,d)}else{c=null;break a}else c=" +
+    "new U(+a.g.next())}\"[\"==v(a.g)&&(d=new Wa(nb(a)),c=new P(c,d))}if(" +
+    "c)if(Ta(v(a.g)))d=c;else return c;else c=mb(a,\"/\"),d=new Sa,b.push" +
+    "(c)}for(;Ta(v(a.g));)c=a.g.next(),Y(a,\"Missing next location step." +
+    "\"),c=mb(a,c),b.push(c);return new Qa(d,b)}\nfunction mb(a,b){if(\"/\"" +
+    "!=b&&\"//\"!=b)throw Error('Step op should be \"/\" or \"//\"');if(\".\"==" +
+    "v(a.g)){var c=new W(bb,new C(\"node\"));a.g.next();return c}if(\"..\"=" +
+    "=v(a.g))return c=new W(ab,new C(\"node\")),a.g.next(),c;if(\"@\"==v(a." +
+    "g)){var d=Ra;a.g.next();Y(a,\"Missing attribute name\")}else if(\"::\"" +
+    "==v(a.g,1)){if(!/(?![0-9])[\\w]/.test(v(a.g).charAt(0)))throw Error" +
+    "(\"Bad token: \"+a.g.next());var e=a.g.next();d=$a[e]||null;if(!d)th" +
+    "row Error(\"No axis with name: \"+e);a.g.next();Y(a,\"Missing node na" +
+    "me\")}else d=Xa;e=\nv(a.g);if(/(?![0-9])[\\w]/.test(e.charAt(0)))if(\"" +
+    "(\"==v(a.g,1)){if(!Pa(e))throw Error(\"Invalid node type: \"+e);e=a.g" +
+    ".next();if(!Pa(e))throw Error(\"Invalid type name: \"+e);hb(a,\"(\");Y" +
+    "(a,\"Bad nodetype\");var f=v(a.g).charAt(0),g=null;if('\"'==f||\"'\"==f" +
+    ")g=jb(a);Y(a,\"Bad nodetype\");ib(a);e=new C(e,g)}else e=kb(a);else " +
+    "if(\"*\"==e)e=kb(a);else throw Error(\"Bad token: \"+a.g.next());a=new" +
+    " Wa(nb(a),d.A);return c||new W(d,e,a,\"//\"==b)}\nfunction nb(a){for(" +
+    "var b=[];\"[\"==v(a.g);){a.g.next();Y(a,\"Missing predicate expressio" +
+    "n.\");var c=fb(a);b.push(c);Y(a,\"Unclosed predicate expression.\");h" +
+    "b(a,\"]\")}return b}function gb(a){if(\"-\"==v(a.g))return a.g.next()," +
+    "new cb(gb(a));var b=lb(a);if(\"|\"!=v(a.g))a=b;else{for(b=[b];\"|\"==a" +
+    ".g.next();)Y(a,\"Missing next union location path.\"),b.push(lb(a));" +
+    "a.g.g--;a=new db(b)}return a};function ob(a,b){if(!a.length)throw " +
+    "Error(\"Empty XPath expression.\");a=va(a);if(w(a))throw Error(\"Inva" +
+    "lid XPath expression.\");b?\"function\"!==typeof b&&(b=l(b.lookupName" +
+    "spaceURI,b)):b=function(){return null};var c=fb(new eb(a,b));if(!w" +
+    "(a))throw Error(\"Bad token: \"+a.next());this.evaluate=function(d,e" +
+    "){d=c.g(new u(d));return new Z(d,e)}}\nfunction Z(a,b){if(0==b)if(a" +
+    " instanceof B)b=4;else if(\"string\"==typeof a)b=2;else if(\"number\"=" +
+    "=typeof a)b=1;else if(\"boolean\"==typeof a)b=3;else throw Error(\"Un" +
+    "expected evaluation result.\");if(2!=b&&1!=b&&3!=b&&!(a instanceof " +
+    "B))throw Error(\"value could not be converted to the specified type" +
+    "\");this.resultType=b;switch(b){case 2:this.stringValue=a instanceo" +
+    "f B?E(a):\"\"+a;break;case 1:this.numberValue=a instanceof B?+E(a):+" +
+    "a;break;case 3:this.booleanValue=a instanceof B?0<a.h:!!a;break;ca" +
+    "se 4:case 5:case 6:case 7:var c=\nF(a);var d=[];for(var e=c.next();" +
+    "e;e=c.next())d.push(e);this.snapshotLength=a.h;this.invalidIterato" +
+    "rState=!1;break;case 8:case 9:this.singleNodeValue=D(a);break;defa" +
+    "ult:throw Error(\"Unknown XPathResult type.\");}var f=0;this.iterate" +
+    "Next=function(){if(4!=b&&5!=b)throw Error(\"iterateNext called with" +
+    " wrong result type\");return f>=d.length?null:d[f++]};this.snapshot" +
+    "Item=function(g){if(6!=b&&7!=b)throw Error(\"snapshotItem called wi" +
+    "th wrong result type\");return g>=d.length||0>g?null:d[g]}}Z.ANY_TY" +
+    "PE=0;\nZ.NUMBER_TYPE=1;Z.STRING_TYPE=2;Z.BOOLEAN_TYPE=3;Z.UNORDERED" +
+    "_NODE_ITERATOR_TYPE=4;Z.ORDERED_NODE_ITERATOR_TYPE=5;Z.UNORDERED_N" +
+    "ODE_SNAPSHOT_TYPE=6;Z.ORDERED_NODE_SNAPSHOT_TYPE=7;Z.ANY_UNORDERED"
+  )
+      .append(
+    "_NODE_TYPE=8;Z.FIRST_ORDERED_NODE_TYPE=9;function pb(a){this.looku" +
+    "pNamespaceURI=Ea(a)}\naa(\"wgxpath.install\",function(a,b){a=a||k;var" +
+    " c=a.document;if(!c.evaluate||b)a.XPathResult=Z,c.evaluate=functio" +
+    "n(d,e,f,g){return(new ob(d,f)).evaluate(e,g)},c.createExpression=f" +
+    "unction(d,e){return new ob(d,e)},c.createNSResolver=function(d){re" +
+    "turn new pb(d)}});aa(\"_\",function(){return document.activeElement|" +
+    "|document.body});;return this._.apply(null,arguments);}).apply({na" +
+    "vigator:typeof window!=\"undefined\"?window.navigator:null},argument" +
+    "s);}\n"
+  )
+  .toString();
+  static final String ACTIVE_ELEMENT_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String ACTIVE_ELEMENT_ANDROID_original() {
+    return ACTIVE_ELEMENT_ANDROID.replaceAll("xxx_rpl_lic", ACTIVE_ELEMENT_ANDROID_license);
+  }
+
+/* field: FRAME_BY_ID_OR_NAME_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String FRAME_BY_ID_OR_NAME_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar aa=this||self;f" +
+    "unction ba(a,b){a=a.split(\".\");var c=aa;a[0]in c||\"undefined\"==typ" +
+    "eof c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d" +
+    "=a.shift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]" +
+    "?c=c[d]:c=c[d]={}:c[d]=b}function ca(a,b,c){return a.call.apply(a." +
+    "bind,arguments)}\nfunction da(a,b,c){if(!a)throw Error();if(2<argum" +
+    "ents.length){var d=Array.prototype.slice.call(arguments,2);return " +
+    "function(){var e=Array.prototype.slice.call(arguments);Array.proto" +
+    "type.unshift.apply(e,d);return a.apply(b,e)}}return function(){ret" +
+    "urn a.apply(b,arguments)}}function ea(a,b,c){Function.prototype.bi" +
+    "nd&&-1!=Function.prototype.bind.toString().indexOf(\"native code\")?" +
+    "ea=ca:ea=da;return ea.apply(null,arguments)}\nfunction fa(a,b){var " +
+    "c=Array.prototype.slice.call(arguments,1);return function(){var d=" +
+    "c.slice();d.push.apply(d,arguments);return a.apply(this,d)}}functi" +
+    "on k(a,b){function c(){}c.prototype=b.prototype;a.X=b.prototype;a." +
+    "prototype=new c;a.prototype.constructor=a;a.W=function(d,e,f){for(" +
+    "var g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=" +
+    "arguments[h];return b.prototype[e].apply(d,g)}};function ha(a,b){i" +
+    "f(Error.captureStackTrace)Error.captureStackTrace(this,ha);else{va" +
+    "r c=Error().stack;c&&(this.stack=c)}a&&(this.message=String(a));vo" +
+    "id 0!==b&&(this.cause=b)}k(ha,Error);ha.prototype.name=\"CustomErro" +
+    "r\";var ia;function ja(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length" +
+    "-1,e=0;e<d;e++)c+=a[e]+(e<b.length?b[e]:\"%s\");ha.call(this,c+a[d])" +
+    "}k(ja,ha);ja.prototype.name=\"AssertionError\";function ka(a,b,c){if" +
+    "(!a){var d=\"Assertion failed\";if(b){d+=\": \"+b;var e=Array.prototyp" +
+    "e.slice.call(arguments,2)}throw new ja(\"\"+d,e||[]);}};function la(" +
+    "a,b){if(\"string\"===typeof a)return\"string\"!==typeof b||1!=b.length" +
+    "?-1:a.indexOf(b,0);for(var c=0;c<a.length;c++)if(c in a&&a[c]===b)" +
+    "return c;return-1}function n(a,b){for(var c=a.length,d=\"string\"===" +
+    "typeof a?a.split(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[e],e,a)" +
+    "}function ma(a,b){for(var c=a.length,d=[],e=0,f=\"string\"===typeof " +
+    "a?a.split(\"\"):a,g=0;g<c;g++)if(g in f){var h=f[g];b.call(void 0,h," +
+    "g,a)&&(d[e++]=h)}return d}\nfunction t(a,b,c){var d=c;n(a,function(" +
+    "e,f){d=b.call(void 0,d,e,f,a)});return d}function na(a,b){for(var " +
+    "c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)if(e in" +
+    " d&&b.call(void 0,d[e],e,a))return!0;return!1}function oa(a,b){for" +
+    "(var c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)if" +
+    "(e in d&&!b.call(void 0,d[e],e,a))return!1;return!0}\nfunction pa(a" +
+    ",b){a:{for(var c=a.length,d=\"string\"===typeof a?a.split(\"\"):a,e=0;" +
+    "e<c;e++)if(e in d&&b.call(void 0,d[e],e,a)){b=e;break a}b=-1}retur" +
+    "n 0>b?null:\"string\"===typeof a?a.charAt(b):a[b]}function qa(a){ret" +
+    "urn Array.prototype.concat.apply([],arguments)}function ra(a,b,c){" +
+    "ka(null!=a.length);return 2>=arguments.length?Array.prototype.slic" +
+    "e.call(a,b):Array.prototype.slice.call(a,b,c)};/*\n\n Copyright 2014" +
+    " Software Freedom Conservancy\n\n Licensed under the Apache License," +
+    " Version 2.0 (the \"License\");\n you may not use this file except in" +
+    " compliance with the License.\n You may obtain a copy of the Licens" +
+    "e at\n\n      http://www.apache.org/licenses/LICENSE-2.0\n\n Unless re" +
+    "quired by applicable law or agreed to in writing, software\n distri" +
+    "buted under the License is distributed on an \"AS IS\" BASIS,\n WITHO" +
+    "UT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied" +
+    ".\n See the License for the specific language governing permissions" +
+    " and\n limitations under the License.\n*/\nfunction sa(a){var b=a.len" +
+    "gth-1;return 0<=b&&a.indexOf(\" \",b)==b}var u=String.prototype.trim" +
+    "?function(a){return a.trim()}:function(a){return/^[\\s\\xa0]*([\\s\\S]" +
+    "*?)[\\s\\xa0]*$/.exec(a)[1]};function ta(a,b){return a<b?-1:a>b?1:0}" +
+    ";function ua(){var a=aa.navigator;return a&&(a=a.userAgent)?a:\"\"};" +
+    "function v(a,b){this.x=void 0!==a?a:0;this.y=void 0!==b?b:0}v.prot" +
+    "otype.toString=function(){return\"(\"+this.x+\", \"+this.y+\")\"};v.prot" +
+    "otype.ceil=function(){this.x=Math.ceil(this.x);this.y=Math.ceil(th" +
+    "is.y);return this};v.prototype.floor=function(){this.x=Math.floor(" +
+    "this.x);this.y=Math.floor(this.y);return this};v.prototype.round=f" +
+    "unction(){this.x=Math.round(this.x);this.y=Math.round(this.y);retu" +
+    "rn this};function w(a,b){this.width=a;this.height=b}w.prototype.to" +
+    "String=function(){return\"(\"+this.width+\" x \"+this.height+\")\"};w.pr" +
+    "ototype.aspectRatio=function(){return this.width/this.height};w.pr" +
+    "ototype.ceil=function(){this.width=Math.ceil(this.width);this.heig" +
+    "ht=Math.ceil(this.height);return this};w.prototype.floor=function(" +
+    "){this.width=Math.floor(this.width);this.height=Math.floor(this.he" +
+    "ight);return this};\nw.prototype.round=function(){this.width=Math.r" +
+    "ound(this.width);this.height=Math.round(this.height);return this};" +
+    "function va(a){return String(a).replace(/\\-([a-z])/g,function(b,c)" +
+    "{return c.toUpperCase()})};function x(a){return a?new wa(z(a)):ia|" +
+    "|(ia=new wa)}function xa(a,b){return\"string\"===typeof b?a.getEleme" +
+    "ntById(b):b}function ya(a){for(;a&&1!=a.nodeType;)a=a.previousSibl" +
+    "ing;return a}function za(a,b){if(!a||!b)return!1;if(a.contains&&1=" +
+    "=b.nodeType)return a==b||a.contains(b);if(\"undefined\"!=typeof a.co" +
+    "mpareDocumentPosition)return a==b||!!(a.compareDocumentPosition(b)" +
+    "&16);for(;b&&a!=b;)b=b.parentNode;return b==a}\nfunction Aa(a,b){if" +
+    "(a==b)return 0;if(a.compareDocumentPosition)return a.compareDocume" +
+    "ntPosition(b)&2?1:-1;if(\"sourceIndex\"in a||a.parentNode&&\"sourceIn" +
+    "dex\"in a.parentNode){var c=1==a.nodeType,d=1==b.nodeType;if(c&&d)r" +
+    "eturn a.sourceIndex-b.sourceIndex;var e=a.parentNode,f=b.parentNod" +
+    "e;return e==f?Ba(a,b):!c&&za(e,b)?-1*Ca(a,b):!d&&za(f,a)?Ca(b,a):(" +
+    "c?a.sourceIndex:e.sourceIndex)-(d?b.sourceIndex:f.sourceIndex)}d=z" +
+    "(a);c=d.createRange();c.selectNode(a);c.collapse(!0);a=d.createRan" +
+    "ge();a.selectNode(b);\na.collapse(!0);return c.compareBoundaryPoint" +
+    "s(aa.Range.START_TO_END,a)}function Ca(a,b){var c=a.parentNode;if(" +
+    "c==b)return-1;for(;b.parentNode!=c;)b=b.parentNode;return Ba(b,a)}" +
+    "function Ba(a,b){for(;b=b.previousSibling;)if(b==a)return-1;return" +
+    " 1}function z(a){ka(a,\"Node cannot be null or undefined.\");return " +
+    "9==a.nodeType?a:a.ownerDocument||a.document}\nfunction Da(a){try{va" +
+    "r b;if(!(b=a.contentWindow)){if(a.contentDocument){var c=a.content" +
+    "Document;var d=c?c.parentWindow||c.defaultView:window}else d=null;" +
+    "b=d}return b}catch(e){}return null}function Ea(a,b){a&&(a=a.parent" +
+    "Node);for(var c=0;a;){ka(\"parentNode\"!=a.name);if(b(a))return a;a=" +
+    "a.parentNode;c++}return null}function wa(a){this.g=a||aa.document|" +
+    "|document}wa.prototype.getElementsByTagName=function(a,b){return(b" +
+    "||this.g).getElementsByTagName(String(a))};\nfunction A(a,b,c,d){a=" +
+    "d||a.g;var e=b&&\"*\"!=b?String(b).toUpperCase():\"\";if(a.querySelect" +
+    "orAll&&a.querySelector&&(e||c))c=a.querySelectorAll(e+(c?\".\"+c:\"\")" +
+    ");else if(c&&a.getElementsByClassName)if(b=a.getElementsByClassNam" +
+    "e(c),e){a={};for(var f=d=0,g;g=b[f];f++)e==g.nodeName&&(a[d++]=g);" +
+    "a.length=d;c=a}else c=b;else if(b=a.getElementsByTagName(e||\"*\"),c" +
+    "){a={};for(f=d=0;g=b[f];f++){e=g.className;var h;if(h=\"function\"==" +
+    "typeof e.split)h=0<=la(e.split(/\\s+/),c);h&&(a[d++]=g)}a.length=d;" +
+    "c=a}else c=b;return c}\n;var Fa=window;function B(a,b){this.code=a;" +
+    "this.g=Ga[a]||\"unknown error\";this.message=b||\"\";a=this.g.replace(" +
+    "/((?:^|\\s+)[a-z])/g,function(c){return c.toUpperCase().replace(/^[" +
+    "\\s\\xa0]+/g,\"\")});b=a.length-5;if(0>b||a.indexOf(\"Error\",b)!=b)a+=\"" +
+    "Error\";this.name=a;a=Error(this.message);a.name=this.name;this.sta" +
+    "ck=a.stack||\"\"}k(B,Error);\nvar Ga={15:\"element not selectable\",11:" +
+    "\"element not visible\",31:\"unknown error\",30:\"unknown error\",24:\"in" +
+    "valid cookie domain\",29:\"invalid element coordinates\",12:\"invalid " +
+    "element state\",32:\"invalid selector\",51:\"invalid selector\",52:\"inv" +
+    "alid selector\",17:\"javascript error\",405:\"unsupported operation\",3" +
+    "4:\"move target out of bounds\",27:\"no such alert\",7:\"no such elemen" +
+    "t\",8:\"no such frame\",23:\"no such window\",28:\"script timeout\",33:\"s" +
+    "ession not created\",10:\"stale element reference\",21:\"timeout\",25:\"" +
+    "unable to set cookie\",\n26:\"unexpected alert open\",13:\"unknown erro" +
+    "r\",9:\"unknown command\"};B.prototype.toString=function(){return thi" +
+    "s.name+\": \"+this.message};var Ha={F:function(a){return!(!a.querySe" +
+    "lectorAll||!a.querySelector)},A:function(a,b){if(!a)throw new B(32" +
+    ",\"No class name specified\");a=u(a);if(-1!==a.indexOf(\" \"))throw ne" +
+    "w B(32,\"Compound class names not permitted\");if(Ha.F(b))try{return" +
+    " b.querySelector(\".\"+a.replace(/\\./g,\"\\\\.\"))||null}catch(c){throw " +
+    "new B(32,\"An invalid or illegal class name was specified\");}a=A(x(" +
+    "b),\"*\",a,b);return a.length?a[0]:null},u:function(a,b){if(!a)throw" +
+    " new B(32,\"No class name specified\");a=u(a);if(-1!==a.indexOf(\" \")" +
+    ")throw new B(32,\n\"Compound class names not permitted\");if(Ha.F(b))" +
+    "try{return b.querySelectorAll(\".\"+a.replace(/\\./g,\"\\\\.\"))}catch(c)" +
+    "{throw new B(32,\"An invalid or illegal class name was specified\");" +
+    "}return A(x(b),\"*\",a,b)}};function Ia(a){return(a=a.exec(ua()))?a[" +
+    "1]:\"\"}Ia(/Android\\s+([0-9.]+)/)||Ia(/Version\\/([0-9.]+)/);function" +
+    " Ja(a){var b=0,c=u(String(Ka)).split(\".\");a=u(String(a)).split(\".\"" +
+    ");for(var d=Math.max(c.length,a.length),e=0;0==b&&e<d;e++){var f=c" +
+    "[e]||\"\",g=a[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\",\"\",\"\"];g=" +
+    "/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].length&&0==g[0]" +
+    ".length)break;b=ta(0==f[1].length?0:parseInt(f[1],10),0==g[1].leng" +
+    "th?0:parseInt(g[1],10))||ta(0==f[2].length,0==g[2].length)||ta(f[2" +
+    "],g[2]);f=f[3];g=g[3]}while(0==b)}}var La=/Android\\s+([0-9\\.]+)/.e" +
+    "xec(ua()),Ka=La?La[1]:\"0\";Ja(2.3);\nJa(4);var Ma={A:function(a,b){i" +
+    "f(!a)throw new B(32,\"No selector specified\");a=u(a);try{var c=b.qu" +
+    "erySelector(a)}catch(d){throw new B(32,\"An invalid or illegal sele" +
+    "ctor was specified\");}return c&&1==c.nodeType?c:null},u:function(a" +
+    ",b){if(!a)throw new B(32,\"No selector specified\");a=u(a);try{retur" +
+    "n b.querySelectorAll(a)}catch(c){throw new B(32,\"An invalid or ill" +
+    "egal selector was specified\");}}};function Na(a,b,c,d){this.top=a;" +
+    "this.g=b;this.h=c;this.left=d}Na.prototype.toString=function(){ret" +
+    "urn\"(\"+this.top+\"t, \"+this.g+\"r, \"+this.h+\"b, \"+this.left+\"l)\"};Na" +
+    ".prototype.ceil=function(){this.top=Math.ceil(this.top);this.g=Mat" +
+    "h.ceil(this.g);this.h=Math.ceil(this.h);this.left=Math.ceil(this.l" +
+    "eft);return this};Na.prototype.floor=function(){this.top=Math.floo" +
+    "r(this.top);this.g=Math.floor(this.g);this.h=Math.floor(this.h);th" +
+    "is.left=Math.floor(this.left);return this};\nNa.prototype.round=fun" +
+    "ction(){this.top=Math.round(this.top);this.g=Math.round(this.g);th" +
+    "is.h=Math.round(this.h);this.left=Math.round(this.left);return thi" +
+    "s};function C(a,b,c,d){this.left=a;this.top=b;this.width=c;this.he" +
+    "ight=d}C.prototype.toString=function(){return\"(\"+this.left+\", \"+th" +
+    "is.top+\" - \"+this.width+\"w x \"+this.height+\"h)\"};C.prototype.ceil=" +
+    "function(){this.left=Math.ceil(this.left);this.top=Math.ceil(this." +
+    "top);this.width=Math.ceil(this.width);this.height=Math.ceil(this.h" +
+    "eight);return this};\nC.prototype.floor=function(){this.left=Math.f" +
+    "loor(this.left);this.top=Math.floor(this.top);this.width=Math.floo" +
+    "r(this.width);this.height=Math.floor(this.height);return this};C.p" +
+    "rototype.round=function(){this.left=Math.round(this.left);this.top" +
+    "=Math.round(this.top);this.width=Math.round(this.width);this.heigh" +
+    "t=Math.round(this.height);return this};/*\n\n The MIT License\n\n Copy" +
+    "right (c) 2007 Cybozu Labs, Inc.\n Copyright (c) 2012 Google Inc.\n\n" +
+    " Permission is hereby granted, free of charge, to any person obtai" +
+    "ning a copy\n of this software and associated documentation files (" +
+    "the \"Software\"), to\n deal in the Software without restriction, inc" +
+    "luding without limitation the\n rights to use, copy, modify, merge," +
+    " publish, distribute, sublicense, and/or\n sell copies of the Softw" +
+    "are, and to permit persons to whom the Software is\n furnished to d" +
+    "o so, subject to the following conditions:\n\n The above copyright n" +
+    "otice and this permission notice shall be included in\n all copies " +
+    "or substantial portions of the Software.\n\n THE SOFTWARE IS PROVIDE" +
+    "D \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCL" +
+    "UDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNE" +
+    "SS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL" +
+    " THE\n AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGE" +
+    "S OR OTHER\n LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR O" +
+    "THERWISE, ARISING\n FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE" +
+    " OR THE USE OR OTHER DEALINGS\n IN THE SOFTWARE.\n*/\nfunction D(a,b," +
+    "c){this.g=a;this.j=b||1;this.h=c||1};function Oa(a){this.h=a;this." +
+    "g=0}function Pa(a){a=a.match(Qa);for(var b=0;b<a.length;b++)Ra.tes" +
+    "t(a[b])&&a.splice(b,1);return new Oa(a)}var Qa=RegExp(\"\\\\$?(?:(?![" +
+    "0-9-])[\\\\w-]+:)?(?![0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)" +
+    "?|\\\\.\\\\d+|\\\"[^\\\"]*\\\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),Ra=/^\\s/;function" +
+    " E(a,b){return a.h[a.g+(b||0)]}Oa.prototype.next=function(){return" +
+    " this.h[this.g++]};function Sa(a){return a.h.length<=a.g};function" +
+    " F(a){var b=null,c=a.nodeType;1==c&&(b=a.textContent,b=void 0==b||" +
+    "null==b?a.innerText:b,b=void 0==b||null==b?\"\":b);if(\"string\"!=type" +
+    "of b)if(9==c||1==c){a=9==c?a.documentElement:a.firstChild;c=0;var " +
+    "d=[];for(b=\"\";a;){do 1!=a.nodeType&&(b+=a.nodeValue),d[c++]=a;whil" +
+    "e(a=a.firstChild);for(;c&&!(a=d[--c].nextSibling););}}else b=a.nod" +
+    "eValue;return\"\"+b}\nfunction G(a,b,c){if(null===b)return!0;try{if(!" +
+    "a.getAttribute)return!1}catch(d){return!1}return null==c?!!a.getAt" +
+    "tribute(b):a.getAttribute(b,2)==c}function Ta(a,b,c,d,e){return Ua" +
+    ".call(null,a,b,\"string\"===typeof c?c:null,\"string\"===typeof d?d:nu" +
+    "ll,e||new H)}\nfunction Ua(a,b,c,d,e){b.getElementsByName&&d&&\"name" +
+    "\"==c?(b=b.getElementsByName(d),n(b,function(f){a.g(f)&&e.add(f)}))" +
+    ":b.getElementsByClassName&&d&&\"class\"==c?(b=b.getElementsByClassNa" +
+    "me(d),n(b,function(f){f.className==d&&a.g(f)&&e.add(f)})):a instan" +
+    "ceof I?Va(a,b,c,d,e):b.getElementsByTagName&&(b=b.getElementsByTag" +
+    "Name(a.j()),n(b,function(f){G(f,c,d)&&e.add(f)}));return e}functio" +
+    "n Va(a,b,c,d,e){for(b=b.firstChild;b;b=b.nextSibling)G(b,c,d)&&a.g" +
+    "(b)&&e.add(b),Va(a,b,c,d,e)};function H(){this.j=this.g=null;this." +
+    "h=0}function Wa(a){this.h=a;this.next=this.g=null}function Xa(a,b)" +
+    "{if(!a.g)return b;if(!b.g)return a;var c=a.g;b=b.g;for(var d=null," +
+    "e,f=0;c&&b;)c.h==b.h?(e=c,c=c.next,b=b.next):0<Aa(c.h,b.h)?(e=b,b=" +
+    "b.next):(e=c,c=c.next),(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e" +
+    ";)e.g=d,d=d.next=e,f++,e=e.next;a.j=d;a.h=f;return a}function Ya(a" +
+    ",b){b=new Wa(b);b.next=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nH.pr" +
+    "ototype.add=function(a){a=new Wa(a);a.g=this.j;this.g?this.j.next=" +
+    "a:this.g=this.j=a;this.j=a;this.h++};function Za(a){return(a=a.g)?" +
+    "a.h:null}function ab(a){return(a=Za(a))?F(a):\"\"}function J(a,b){re" +
+    "turn new bb(a,!!b)}function bb(a,b){this.j=a;this.h=(this.C=b)?a.j" +
+    ":a.g;this.g=null}bb.prototype.next=function(){var a=this.h;if(null" +
+    "==a)return null;var b=this.g=a;this.h=this.C?a.g:a.next;return b.h" +
+    "};function cb(a){switch(a.nodeType){case 1:return fa(db,a);case 9:" +
+    "return cb(a.documentElement);case 11:case 10:case 6:case 12:return" +
+    " eb;default:return a.parentNode?cb(a.parentNode):eb}}function eb()" +
+    "{return null}function db(a,b){if(a.prefix==b)return a.namespaceURI" +
+    "||\"http://www.w3.org/1999/xhtml\";var c=a.getAttributeNode(\"xmlns:\"" +
+    "+b);return c&&c.specified?c.value||null:a.parentNode&&9!=a.parentN" +
+    "ode.nodeType?db(a.parentNode,b):null};function K(a){this.o=a;this." +
+    "h=this.l=!1;this.j=null}function M(a){return\"\\n  \"+a.toString().sp" +
+    "lit(\"\\n\").join(\"\\n  \")}function fb(a,b){a.l=b}function gb(a,b){a.h" +
+    "=b}function N(a,b){a=a.g(b);return a instanceof H?+ab(a):+a}functi" +
+    "on O(a,b){a=a.g(b);return a instanceof H?ab(a):\"\"+a}function hb(a," +
+    "b){a=a.g(b);return a instanceof H?!!a.h:!!a};function ib(a,b,c){K." +
+    "call(this,a.o);this.i=a;this.m=b;this.B=c;this.l=b.l||c.l;this.h=b" +
+    ".h||c.h;this.i==jb&&(c.h||c.l||4==c.o||0==c.o||!b.j?b.h||b.l||4==b" +
+    ".o||0==b.o||!c.j||(this.j={name:c.j.name,D:b}):this.j={name:b.j.na" +
+    "me,D:c})}k(ib,K);\nfunction kb(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;i" +
+    "f(b instanceof H&&c instanceof H){b=J(b);for(d=b.next();d;d=b.next" +
+    "())for(e=J(c),f=e.next();f;f=e.next())if(a(F(d),F(f)))return!0;ret" +
+    "urn!1}if(b instanceof H||c instanceof H){b instanceof H?(e=b,d=c):" +
+    "(e=c,d=b);f=J(e);for(var g=typeof d,h=f.next();h;h=f.next()){switc" +
+    "h(g){case \"number\":h=+F(h);break;case \"boolean\":h=!!F(h);break;cas" +
+    "e \"string\":h=F(h);break;default:throw Error(\"Illegal primitive typ" +
+    "e for comparison.\");}if(e==b&&a(h,d)||e==c&&a(d,h))return!0}return" +
+    "!1}return e?\n\"boolean\"==typeof b||\"boolean\"==typeof c?a(!!b,!!c):\"" +
+    "number\"==typeof b||\"number\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}ib." +
+    "prototype.g=function(a){return this.i.v(this.m,this.B,a)};ib.proto" +
+    "type.toString=function(){var a=\"Binary Expression: \"+this.i;a+=M(t" +
+    "his.m);return a+=M(this.B)};function lb(a,b,c,d){this.U=a;this.N=b" +
+    ";this.o=c;this.v=d}lb.prototype.toString=function(){return this.U}" +
+    ";var mb={};\nfunction P(a,b,c,d){if(mb.hasOwnProperty(a))throw Erro" +
+    "r(\"Binary operator already created: \"+a);a=new lb(a,b,c,d);return " +
+    "mb[a.toString()]=a}P(\"div\",6,1,function(a,b,c){return N(a,c)/N(b,c" +
+    ")});P(\"mod\",6,1,function(a,b,c){return N(a,c)%N(b,c)});P(\"*\",6,1,f" +
+    "unction(a,b,c){return N(a,c)*N(b,c)});P(\"+\",5,1,function(a,b,c){re" +
+    "turn N(a,c)+N(b,c)});P(\"-\",5,1,function(a,b,c){return N(a,c)-N(b,c" +
+    ")});P(\"<\",4,2,function(a,b,c){return kb(function(d,e){return d<e}," +
+    "a,b,c)});\nP(\">\",4,2,function(a,b,c){return kb(function(d,e){return" +
+    " d>e},a,b,c)});P(\"<=\",4,2,function(a,b,c){return kb(function(d,e){" +
+    "return d<=e},a,b,c)});P(\">=\",4,2,function(a,b,c){return kb(functio" +
+    "n(d,e){return d>=e},a,b,c)});var jb=P(\"=\",3,2,function(a,b,c){retu" +
+    "rn kb(function(d,e){return d==e},a,b,c,!0)});P(\"!=\",3,2,function(a" +
+    ",b,c){return kb(function(d,e){return d!=e},a,b,c,!0)});P(\"and\",2,2" +
+    ",function(a,b,c){return hb(a,c)&&hb(b,c)});P(\"or\",1,2,function(a,b" +
+    ",c){return hb(a,c)||hb(b,c)});function nb(a,b){if(b.g.length&&4!=a" +
+    ".o)throw Error(\"Primary expression must evaluate to nodeset if fil" +
+    "ter has predicate(s).\");K.call(this,a.o);this.m=a;this.i=b;this.l=" +
+    "a.l;this.h=a.h}k(nb,K);nb.prototype.g=function(a){a=this.m.g(a);re" +
+    "turn ob(this.i,a)};nb.prototype.toString=function(){var a=\"Filter:" +
+    "\"+M(this.m);return a+=M(this.i)};function pb(a,b){if(b.length<a.M)" +
+    "throw Error(\"Function \"+a.s+\" expects at least\"+a.M+\" arguments, \"" +
+    "+b.length+\" given\");if(null!==a.H&&b.length>a.H)throw Error(\"Funct" +
+    "ion \"+a.s+\" expects at most \"+a.H+\" arguments, \"+b.length+\" given\"" +
+    ");a.T&&n(b,function(c,d){if(4!=c.o)throw Error(\"Argument \"+d+\" to " +
+    "function \"+a.s+\" is not of type Nodeset: \"+c);});K.call(this,a.o);" +
+    "this.G=a;this.i=b;fb(this,a.l||na(b,function(c){return c.l}));gb(t" +
+    "his,a.S&&!b.length||a.R&&!!b.length||na(b,function(c){return c.h})" +
+    ")}\nk(pb,K);pb.prototype.g=function(a){return this.G.v.apply(null,q" +
+    "a(a,this.i))};pb.prototype.toString=function(){var a=\"Function: \"+" +
+    "this.G;if(this.i.length){var b=t(this.i,function(c,d){return c+M(d" +
+    ")},\"Arguments:\");a+=M(b)}return a};function qb(a,b,c,d,e,f,g,h){th" +
+    "is.s=a;this.o=b;this.l=c;this.S=d;this.R=!1;this.v=e;this.M=f;this" +
+    ".H=void 0!==g?g:f;this.T=!!h}qb.prototype.toString=function(){retu" +
+    "rn this.s};var rb={};\nfunction Q(a,b,c,d,e,f,g,h){if(rb.hasOwnProp" +
+    "erty(a))throw Error(\"Function already created: \"+a+\".\");rb[a]=new " +
+    "qb(a,b,c,d,e,f,g,h)}Q(\"boolean\",2,!1,!1,function(a,b){return hb(b," +
+    "a)},1);Q(\"ceiling\",1,!1,!1,function(a,b){return Math.ceil(N(b,a))}" +
+    ",1);Q(\"concat\",3,!1,!1,function(a,b){var c=ra(arguments,1);return " +
+    "t(c,function(d,e){return d+O(e,a)},\"\")},2,null);Q(\"contains\",2,!1," +
+    "!1,function(a,b,c){b=O(b,a);a=O(c,a);return-1!=b.indexOf(a)},2);Q(" +
+    "\"count\",1,!1,!1,function(a,b){return b.g(a).h},1,1,!0);\nQ(\"false\"," +
+    "2,!1,!1,function(){return!1},0);Q(\"floor\",1,!1,!1,function(a,b){re" +
+    "turn Math.floor(N(b,a))},1);Q(\"id\",4,!1,!1,function(a,b){var c=a.g" +
+    ",d=9==c.nodeType?c:c.ownerDocument;a=O(b,a).split(/\\s+/);var e=[];" +
+    "n(a,function(g){g=d.getElementById(g);!g||0<=la(e,g)||e.push(g)});" +
+    "e.sort(Aa);var f=new H;n(e,function(g){f.add(g)});return f},1);Q(\"" +
+    "lang\",2,!1,!1,function(){return!1},1);Q(\"last\",1,!0,!1,function(a)" +
+    "{if(1!=arguments.length)throw Error(\"Function last expects ()\");re" +
+    "turn a.h},0);\nQ(\"local-name\",3,!1,!0,function(a,b){return(a=b?Za(b" +
+    ".g(a)):a.g)?a.localName||a.nodeName.toLowerCase():\"\"},0,1,!0);Q(\"n" +
+    "ame\",3,!1,!0,function(a,b){return(a=b?Za(b.g(a)):a.g)?a.nodeName.t" +
+    "oLowerCase():\"\"},0,1,!0);Q(\"namespace-uri\",3,!0,!1,function(){retu" +
+    "rn\"\"},0,1,!0);Q(\"normalize-space\",3,!1,!0,function(a,b){return(b?O" +
+    "(b,a):F(a.g)).replace(/[\\s\\xa0]+/g,\" \").replace(/^\\s+|\\s+$/g,\"\")}," +
+    "0,1);Q(\"not\",2,!1,!1,function(a,b){return!hb(b,a)},1);Q(\"number\",1" +
+    ",!1,!0,function(a,b){return b?N(b,a):+F(a.g)},0,1);\nQ(\"position\",1" +
+    ",!0,!1,function(a){return a.j},0);Q(\"round\",1,!1,!1,function(a,b){" +
+    "return Math.round(N(b,a))},1);Q(\"starts-with\",2,!1,!1,function(a,b" +
+    ",c){b=O(b,a);a=O(c,a);return 0==b.lastIndexOf(a,0)},2);Q(\"string\"," +
+    "3,!1,!0,function(a,b){return b?O(b,a):F(a.g)},0,1);Q(\"string-lengt" +
+    "h\",1,!1,!0,function(a,b){return(b?O(b,a):F(a.g)).length},0,1);\nQ(\"" +
+    "substring\",3,!1,!1,function(a,b,c,d){c=N(c,a);if(isNaN(c)||Infinit" +
+    "y==c||-Infinity==c)return\"\";d=d?N(d,a):Infinity;if(isNaN(d)||-Infi" +
+    "nity===d)return\"\";c=Math.round(c)-1;var e=Math.max(c,0);a=O(b,a);r" +
+    "eturn Infinity==d?a.substring(e):a.substring(e,c+Math.round(d))},2" +
+    ",3);Q(\"substring-after\",3,!1,!1,function(a,b,c){b=O(b,a);a=O(c,a);" +
+    "c=b.indexOf(a);return-1==c?\"\":b.substring(c+a.length)},2);\nQ(\"subs" +
+    "tring-before\",3,!1,!1,function(a,b,c){b=O(b,a);a=O(c,a);a=b.indexO" +
+    "f(a);return-1==a?\"\":b.substring(0,a)},2);Q(\"sum\",1,!1,!1,function(" +
+    "a,b){a=J(b.g(a));b=0;for(var c=a.next();c;c=a.next())b+=+F(c);retu" +
+    "rn b},1,1,!0);Q(\"translate\",3,!1,!1,function(a,b,c,d){b=O(b,a);c=O" +
+    "(c,a);var e=O(d,a);a={};for(d=0;d<c.length;d++){var f=c.charAt(d);" +
+    "f in a||(a[f]=e.charAt(d))}c=\"\";for(d=0;d<b.length;d++)f=b.charAt(" +
+    "d),c+=f in a?a[f]:f;return c},3);Q(\"true\",2,!1,!1,function(){retur" +
+    "n!0},0);function I(a,b){this.m=a;this.i=void 0!==b?b:null;this.h=n" +
+    "ull;switch(a){case \"comment\":this.h=8;break;case \"text\":this.h=3;b" +
+    "reak;case \"processing-instruction\":this.h=7;break;case \"node\":brea" +
+    "k;default:throw Error(\"Unexpected argument\");}}function sb(a){retu" +
+    "rn\"comment\"==a||\"text\"==a||\"processing-instruction\"==a||\"node\"==a}" +
+    "I.prototype.g=function(a){return null===this.h||this.h==a.nodeType" +
+    "};I.prototype.getType=function(){return this.h};I.prototype.j=func" +
+    "tion(){return this.m};\nI.prototype.toString=function(){var a=\"Kind" +
+    " Test: \"+this.m;null!==this.i&&(a+=M(this.i));return a};function t" +
+    "b(a){K.call(this,3);this.i=a.substring(1,a.length-1)}k(tb,K);tb.pr" +
+    "ototype.g=function(){return this.i};tb.prototype.toString=function" +
+    "(){return\"Literal: \"+this.i};function ub(a,b){this.s=a.toLowerCase" +
+    "();this.h=b?b.toLowerCase():\"http://www.w3.org/1999/xhtml\"}ub.prot" +
+    "otype.g=function(a){var b=a.nodeType;return 1!=b&&2!=b?!1:\"*\"!=thi" +
+    "s.s&&this.s!=a.nodeName.toLowerCase()?!1:this.h==(a.namespaceURI?a" +
+    ".namespaceURI.toLowerCase():\"http://www.w3.org/1999/xhtml\")};ub.pr" +
+    "ototype.j=function(){return this.s};ub.prototype.toString=function" +
+    "(){return\"Name Test: \"+(\"http://www.w3.org/1999/xhtml\"==this.h?\"\":" +
+    "this.h+\":\")+this.s};function vb(a){K.call(this,1);this.i=a}k(vb,K)" +
+    ";vb.prototype.g=function(){return this.i};vb.prototype.toString=fu" +
+    "nction(){return\"Number: \"+this.i};function wb(a,b){K.call(this,a.o" +
+    ");this.m=a;this.i=b;this.l=a.l;this.h=a.h;1==this.i.length&&(a=thi" +
+    "s.i[0],a.I||a.i!=xb||(a=a.B,\"*\"!=a.j()&&(this.j={name:a.j(),D:null" +
+    "})))}k(wb,K);function yb(){K.call(this,4)}k(yb,K);yb.prototype.g=f" +
+    "unction(a){var b=new H;a=a.g;9==a.nodeType?b.add(a):b.add(a.ownerD" +
+    "ocument);return b};yb.prototype.toString=function(){return\"Root He" +
+    "lper Expression\"};function zb(){K.call(this,4)}k(zb,K);zb.prototyp" +
+    "e.g=function(a){var b=new H;b.add(a.g);return b};zb.prototype.toSt" +
+    "ring=function(){return\"Context Helper Expression\"};\nfunction Ab(a)" +
+    "{return\"/\"==a||\"//\"==a}wb.prototype.g=function(a){var b=this.m.g(a" +
+    ");if(!(b instanceof H))throw Error(\"Filter expression must evaluat" +
+    "e to nodeset.\");a=this.i;for(var c=0,d=a.length;c<d&&b.h;c++){var " +
+    "e=a[c],f=J(b,e.i.C);if(e.l||e.i!=Bb)if(e.l||e.i!=Cb){var g=f.next(" +
+    ");for(b=e.g(new D(g));null!=(g=f.next());)g=e.g(new D(g)),b=Xa(b,g" +
+    ")}else g=f.next(),b=e.g(new D(g));else{for(g=f.next();(b=f.next())" +
+    "&&(!g.contains||g.contains(b))&&b.compareDocumentPosition(g)&8;g=b" +
+    ");b=e.g(new D(g))}}return b};\nwb.prototype.toString=function(){var" +
+    " a=\"Path Expression:\"+M(this.m);if(this.i.length){var b=t(this.i,f" +
+    "unction(c,d){return c+M(d)},\"Steps:\");a+=M(b)}return a};function D" +
+    "b(a,b){this.g=a;this.C=!!b}\nfunction ob(a,b,c){for(c=c||0;c<a.g.le" +
+    "ngth;c++)for(var d=a.g[c],e=J(b),f=b.h,g,h=0;g=e.next();h++){var p" +
+    "=a.C?f-h:h+1;g=d.g(new D(g,p,f));if(\"number\"==typeof g)p=p==g;else" +
+    " if(\"string\"==typeof g||\"boolean\"==typeof g)p=!!g;else if(g instan" +
+    "ceof H)p=0<g.h;else throw Error(\"Predicate.evaluate returned an un" +
+    "expected type.\");if(!p){p=e;g=p.j;var q=p.g;if(!q)throw Error(\"Nex" +
+    "t must be called at least once before remove.\");var m=q.g;q=q.next" +
+    ";m?m.next=q:g.g=q;q?q.g=m:g.j=m;g.h--;p.g=null}}return b}\nDb.proto" +
+    "type.toString=function(){return t(this.g,function(a,b){return a+M(" +
+    "b)},\"Predicates:\")};function R(a,b,c,d){K.call(this,4);this.i=a;th" +
+    "is.B=b;this.m=c||new Db([]);this.I=!!d;b=this.m;b=0<b.g.length?b.g" +
+    "[0].j:null;a.V&&b&&(this.j={name:b.name,D:b.D});a:{a=this.m;for(b=" +
+    "0;b<a.g.length;b++)if(c=a.g[b],c.l||1==c.o||0==c.o){a=!0;break a}a" +
+    "=!1}this.l=a}k(R,K);\nR.prototype.g=function(a){var b=a.g,c=this.j," +
+    "d=null,e=null,f=0;c&&(d=c.name,e=c.D?O(c.D,a):null,f=1);if(this.I)" +
+    "if(this.l||this.i!=Eb)if(b=J((new R(Fb,new I(\"node\"))).g(a)),c=b.n" +
+    "ext())for(a=this.v(c,d,e,f);null!=(c=b.next());)a=Xa(a,this.v(c,d," +
+    "e,f));else a=new H;else a=Ta(this.B,b,d,e),a=ob(this.m,a,f);else a" +
+    "=this.v(a.g,d,e,f);return a};R.prototype.v=function(a,b,c,d){a=thi" +
+    "s.i.G(this.B,a,b,c);return a=ob(this.m,a,d)};\nR.prototype.toString" +
+    "=function(){var a=\"Step:\"+M(\"Operator: \"+(this.I?\"//\":\"/\"));this.i" +
+    ".s&&(a+=M(\"Axis: \"+this.i));a+=M(this.B);if(this.m.g.length){var b" +
+    "=t(this.m.g,function(c,d){return c+M(d)},\"Predicates:\");a+=M(b)}re" +
+    "turn a};function Gb(a,b,c,d){this.s=a;this.G=b;this.C=c;this.V=d}G" +
+    "b.prototype.toString=function(){return this.s};var Hb={};function " +
+    "S(a,b,c,d){if(Hb.hasOwnProperty(a))throw Error(\"Axis already creat" +
+    "ed: \"+a);b=new Gb(a,b,c,!!d);return Hb[a]=b}\nS(\"ancestor\",function" +
+    "(a,b){for(var c=new H;b=b.parentNode;)a.g(b)&&Ya(c,b);return c},!0" +
+    ");S(\"ancestor-or-self\",function(a,b){var c=new H;do a.g(b)&&Ya(c,b" +
+    ");while(b=b.parentNode);return c},!0);\nvar xb=S(\"attribute\",functi" +
+    "on(a,b){var c=new H,d=a.j();if(b=b.attributes)if(a instanceof I&&n" +
+    "ull===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.add(d);else(d=b.get" +
+    "NamedItem(d))&&c.add(d);return c},!1),Eb=S(\"child\",function(a,b,c," +
+    "d,e){c=\"string\"===typeof c?c:null;d=\"string\"===typeof d?d:null;e=e" +
+    "||new H;for(b=b.firstChild;b;b=b.nextSibling)G(b,c,d)&&a.g(b)&&e.a" +
+    "dd(b);return e},!1,!0);S(\"descendant\",Ta,!1,!0);\nvar Fb=S(\"descend"
+  )
+      .append(
+    "ant-or-self\",function(a,b,c,d){var e=new H;G(b,c,d)&&a.g(b)&&e.add" +
+    "(b);return Ta(a,b,c,d,e)},!1,!0),Bb=S(\"following\",function(a,b,c,d" +
+    "){var e=new H;do for(var f=b;f=f.nextSibling;)G(f,c,d)&&a.g(f)&&e." +
+    "add(f),e=Ta(a,f,c,d,e);while(b=b.parentNode);return e},!1,!0);S(\"f" +
+    "ollowing-sibling\",function(a,b){for(var c=new H;b=b.nextSibling;)a" +
+    ".g(b)&&c.add(b);return c},!1);S(\"namespace\",function(){return new " +
+    "H},!1);\nvar Ib=S(\"parent\",function(a,b){var c=new H;if(9==b.nodeTy" +
+    "pe)return c;if(2==b.nodeType)return c.add(b.ownerElement),c;b=b.pa" +
+    "rentNode;a.g(b)&&c.add(b);return c},!1),Cb=S(\"preceding\",function(" +
+    "a,b,c,d){var e=new H,f=[];do f.unshift(b);while(b=b.parentNode);fo" +
+    "r(var g=1,h=f.length;g<h;g++){var p=[];for(b=f[g];b=b.previousSibl" +
+    "ing;)p.unshift(b);for(var q=0,m=p.length;q<m;q++)b=p[q],G(b,c,d)&&" +
+    "a.g(b)&&e.add(b),e=Ta(a,b,c,d,e)}return e},!0,!0);\nS(\"preceding-si" +
+    "bling\",function(a,b){for(var c=new H;b=b.previousSibling;)a.g(b)&&" +
+    "Ya(c,b);return c},!0);var Jb=S(\"self\",function(a,b){var c=new H;a." +
+    "g(b)&&c.add(b);return c},!1);function Kb(a){K.call(this,1);this.i=" +
+    "a;this.l=a.l;this.h=a.h}k(Kb,K);Kb.prototype.g=function(a){return-" +
+    "N(this.i,a)};Kb.prototype.toString=function(){return\"Unary Express" +
+    "ion: -\"+M(this.i)};function Mb(a){K.call(this,4);this.i=a;fb(this," +
+    "na(this.i,function(b){return b.l}));gb(this,na(this.i,function(b){" +
+    "return b.h}))}k(Mb,K);Mb.prototype.g=function(a){var b=new H;n(thi" +
+    "s.i,function(c){c=c.g(a);if(!(c instanceof H))throw Error(\"Path ex" +
+    "pression must evaluate to NodeSet.\");b=Xa(b,c)});return b};Mb.prot" +
+    "otype.toString=function(){return t(this.i,function(a,b){return a+M" +
+    "(b)},\"Union Expression:\")};function Nb(a,b){this.g=a;this.h=b}func" +
+    "tion Ob(a){for(var b,c=[];;){U(a,\"Missing right hand side of binar" +
+    "y expression.\");b=Pb(a);var d=a.g.next();if(!d)break;var e=(d=mb[d" +
+    "]||null)&&d.N;if(!e){a.g.g--;break}for(;c.length&&e<=c[c.length-1]" +
+    ".N;)b=new ib(c.pop(),c.pop(),b);c.push(b,d)}for(;c.length;)b=new i" +
+    "b(c.pop(),c.pop(),b);return b}function U(a,b){if(Sa(a.g))throw Err" +
+    "or(b);}function Qb(a,b){a=a.g.next();if(a!=b)throw Error(\"Bad toke" +
+    "n, expected: \"+b+\" got: \"+a);}\nfunction Rb(a){a=a.g.next();if(\")\"!" +
+    "=a)throw Error(\"Bad token: \"+a);}function Sb(a){a=a.g.next();if(2>" +
+    "a.length)throw Error(\"Unclosed literal string\");return new tb(a)}f" +
+    "unction Tb(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c)return ne" +
+    "w ub(b);var d=b.substring(0,c);a=a.h(d);if(!a)throw Error(\"Namespa" +
+    "ce prefix not declared: \"+d);b=b.substr(c+1);return new ub(b,a)}\nf" +
+    "unction Ub(a){var b=[];if(Ab(E(a.g))){var c=a.g.next();var d=E(a.g" +
+    ");if(\"/\"==c&&(Sa(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&!/(?![0-9]" +
+    ")[\\w]/.test(d)))return new yb;d=new yb;U(a,\"Missing next location " +
+    "step.\");c=Vb(a,c);b.push(c)}else{a:{c=E(a.g);d=c.charAt(0);switch(" +
+    "d){case \"$\":throw Error(\"Variable reference not allowed in HTML XP" +
+    "ath\");case \"(\":a.g.next();c=Ob(a);U(a,'unclosed \"(\"');Qb(a,\")\");br" +
+    "eak;case '\"':case \"'\":c=Sb(a);break;default:if(isNaN(+c))if(!sb(c)" +
+    "&&/(?![0-9])[\\w]/.test(d)&&\"(\"==E(a.g,\n1)){c=a.g.next();c=rb[c]||n" +
+    "ull;a.g.next();for(d=[];\")\"!=E(a.g);){U(a,\"Missing function argume" +
+    "nt list.\");d.push(Ob(a));if(\",\"!=E(a.g))break;a.g.next()}U(a,\"Uncl" +
+    "osed function argument list.\");Rb(a);c=new pb(c,d)}else{c=null;bre" +
+    "ak a}else c=new vb(+a.g.next())}\"[\"==E(a.g)&&(d=new Db(Wb(a)),c=ne" +
+    "w nb(c,d))}if(c)if(Ab(E(a.g)))d=c;else return c;else c=Vb(a,\"/\"),d" +
+    "=new zb,b.push(c)}for(;Ab(E(a.g));)c=a.g.next(),U(a,\"Missing next " +
+    "location step.\"),c=Vb(a,c),b.push(c);return new wb(d,b)}\nfunction " +
+    "Vb(a,b){if(\"/\"!=b&&\"//\"!=b)throw Error('Step op should be \"/\" or \"" +
+    "//\"');if(\".\"==E(a.g)){var c=new R(Jb,new I(\"node\"));a.g.next();ret" +
+    "urn c}if(\"..\"==E(a.g))return c=new R(Ib,new I(\"node\")),a.g.next()," +
+    "c;if(\"@\"==E(a.g)){var d=xb;a.g.next();U(a,\"Missing attribute name\"" +
+    ")}else if(\"::\"==E(a.g,1)){if(!/(?![0-9])[\\w]/.test(E(a.g).charAt(0" +
+    ")))throw Error(\"Bad token: \"+a.g.next());var e=a.g.next();d=Hb[e]|" +
+    "|null;if(!d)throw Error(\"No axis with name: \"+e);a.g.next();U(a,\"M" +
+    "issing node name\")}else d=Eb;e=\nE(a.g);if(/(?![0-9])[\\w]/.test(e.c" +
+    "harAt(0)))if(\"(\"==E(a.g,1)){if(!sb(e))throw Error(\"Invalid node ty" +
+    "pe: \"+e);e=a.g.next();if(!sb(e))throw Error(\"Invalid type name: \"+" +
+    "e);Qb(a,\"(\");U(a,\"Bad nodetype\");var f=E(a.g).charAt(0),g=null;if(" +
+    "'\"'==f||\"'\"==f)g=Sb(a);U(a,\"Bad nodetype\");Rb(a);e=new I(e,g)}else" +
+    " e=Tb(a);else if(\"*\"==e)e=Tb(a);else throw Error(\"Bad token: \"+a.g" +
+    ".next());a=new Db(Wb(a),d.C);return c||new R(d,e,a,\"//\"==b)}\nfunct" +
+    "ion Wb(a){for(var b=[];\"[\"==E(a.g);){a.g.next();U(a,\"Missing predi" +
+    "cate expression.\");var c=Ob(a);b.push(c);U(a,\"Unclosed predicate e" +
+    "xpression.\");Qb(a,\"]\")}return b}function Pb(a){if(\"-\"==E(a.g))retu" +
+    "rn a.g.next(),new Kb(Pb(a));var b=Ub(a);if(\"|\"!=E(a.g))a=b;else{fo" +
+    "r(b=[b];\"|\"==a.g.next();)U(a,\"Missing next union location path.\")," +
+    "b.push(Ub(a));a.g.g--;a=new Mb(b)}return a};function Xb(a,b){if(!a" +
+    ".length)throw Error(\"Empty XPath expression.\");a=Pa(a);if(Sa(a))th" +
+    "row Error(\"Invalid XPath expression.\");b?\"function\"!==typeof b&&(b" +
+    "=ea(b.lookupNamespaceURI,b)):b=function(){return null};var c=Ob(ne" +
+    "w Nb(a,b));if(!Sa(a))throw Error(\"Bad token: \"+a.next());this.eval" +
+    "uate=function(d,e){d=c.g(new D(d));return new V(d,e)}}\nfunction V(" +
+    "a,b){if(0==b)if(a instanceof H)b=4;else if(\"string\"==typeof a)b=2;" +
+    "else if(\"number\"==typeof a)b=1;else if(\"boolean\"==typeof a)b=3;els" +
+    "e throw Error(\"Unexpected evaluation result.\");if(2!=b&&1!=b&&3!=b" +
+    "&&!(a instanceof H))throw Error(\"value could not be converted to t" +
+    "he specified type\");this.resultType=b;switch(b){case 2:this.string" +
+    "Value=a instanceof H?ab(a):\"\"+a;break;case 1:this.numberValue=a in" +
+    "stanceof H?+ab(a):+a;break;case 3:this.booleanValue=a instanceof H" +
+    "?0<a.h:!!a;break;case 4:case 5:case 6:case 7:var c=\nJ(a);var d=[];" +
+    "for(var e=c.next();e;e=c.next())d.push(e);this.snapshotLength=a.h;" +
+    "this.invalidIteratorState=!1;break;case 8:case 9:this.singleNodeVa" +
+    "lue=Za(a);break;default:throw Error(\"Unknown XPathResult type.\");}" +
+    "var f=0;this.iterateNext=function(){if(4!=b&&5!=b)throw Error(\"ite" +
+    "rateNext called with wrong result type\");return f>=d.length?null:d" +
+    "[f++]};this.snapshotItem=function(g){if(6!=b&&7!=b)throw Error(\"sn" +
+    "apshotItem called with wrong result type\");return g>=d.length||0>g" +
+    "?null:d[g]}}V.ANY_TYPE=0;\nV.NUMBER_TYPE=1;V.STRING_TYPE=2;V.BOOLEA" +
+    "N_TYPE=3;V.UNORDERED_NODE_ITERATOR_TYPE=4;V.ORDERED_NODE_ITERATOR_" +
+    "TYPE=5;V.UNORDERED_NODE_SNAPSHOT_TYPE=6;V.ORDERED_NODE_SNAPSHOT_TY" +
+    "PE=7;V.ANY_UNORDERED_NODE_TYPE=8;V.FIRST_ORDERED_NODE_TYPE=9;funct" +
+    "ion Yb(a){this.lookupNamespaceURI=cb(a)}\nfunction Zb(a,b){a=a||aa;" +
+    "var c=a.document;if(!c.evaluate||b)a.XPathResult=V,c.evaluate=func" +
+    "tion(d,e,f,g){return(new Xb(d,f)).evaluate(e,g)},c.createExpressio" +
+    "n=function(d,e){return new Xb(d,e)},c.createNSResolver=function(d)" +
+    "{return new Yb(d)}}ba(\"wgxpath.install\",Zb);var W={};W.J=function(" +
+    "){var a={Y:\"http://www.w3.org/2000/svg\"};return function(b){return" +
+    " a[b]||null}}();\nW.v=function(a,b,c){var d=z(a);if(!d.documentElem" +
+    "ent)return null;Zb(d?d.parentWindow||d.defaultView:window);try{for" +
+    "(var e=d.createNSResolver?d.createNSResolver(d.documentElement):W." +
+    "J,f={},g=d.getElementsByTagName(\"*\"),h=0;h<g.length;++h){var p=g[h" +
+    "],q=p.namespaceURI;if(q&&!f[q]){var m=p.lookupPrefix(q);if(!m){var" +
+    " y=q.match(\".*/(\\\\w+)/?$\");m=y?y[1]:\"xhtml\"}f[q]=m}}var L={},T;for" +
+    "(T in f)L[f[T]]=T;e=function(l){return L[l]||null};try{return d.ev" +
+    "aluate(b,a,e,c,null)}catch(l){if(\"TypeError\"===l.name)return e=\nd." +
+    "createNSResolver?d.createNSResolver(d.documentElement):W.J,d.evalu" +
+    "ate(b,a,e,c,null);throw l;}}catch(l){throw new B(32,\"Unable to loc" +
+    "ate an element with the xpath expression \"+b+\" because of the foll" +
+    "owing error:\\n\"+l);}};W.K=function(a,b){if(!a||1!=a.nodeType)throw" +
+    " new B(32,'The result of the xpath expression \"'+b+'\" is: '+a+\". I" +
+    "t should be an element.\");};\nW.A=function(a,b){var c=function(){va" +
+    "r d=W.v(b,a,9);return d?d.singleNodeValue||null:b.selectSingleNode" +
+    "?(d=z(b),d.setProperty&&d.setProperty(\"SelectionLanguage\",\"XPath\")" +
+    ",b.selectSingleNode(a)):null}();null!==c&&W.K(c,a);return c};\nW.u=" +
+    "function(a,b){var c=function(){var d=W.v(b,a,7);if(d){for(var e=d." +
+    "snapshotLength,f=[],g=0;g<e;++g)f.push(d.snapshotItem(g));return f" +
+    "}return b.selectNodes?(d=z(b),d.setProperty&&d.setProperty(\"Select" +
+    "ionLanguage\",\"XPath\"),b.selectNodes(a)):[]}();n(c,function(d){W.K(" +
+    "d,a)});return c};var $b={aliceblue:\"#f0f8ff\",antiquewhite:\"#faebd7" +
+    "\",aqua:\"#00ffff\",aquamarine:\"#7fffd4\",azure:\"#f0ffff\",beige:\"#f5f5" +
+    "dc\",bisque:\"#ffe4c4\",black:\"#000000\",blanchedalmond:\"#ffebcd\",blue" +
+    ":\"#0000ff\",blueviolet:\"#8a2be2\",brown:\"#a52a2a\",burlywood:\"#deb887" +
+    "\",cadetblue:\"#5f9ea0\",chartreuse:\"#7fff00\",chocolate:\"#d2691e\",cor" +
+    "al:\"#ff7f50\",cornflowerblue:\"#6495ed\",cornsilk:\"#fff8dc\",crimson:\"" +
+    "#dc143c\",cyan:\"#00ffff\",darkblue:\"#00008b\",darkcyan:\"#008b8b\",dark" +
+    "goldenrod:\"#b8860b\",darkgray:\"#a9a9a9\",darkgreen:\"#006400\",\ndarkgr" +
+    "ey:\"#a9a9a9\",darkkhaki:\"#bdb76b\",darkmagenta:\"#8b008b\",darkolivegr" +
+    "een:\"#556b2f\",darkorange:\"#ff8c00\",darkorchid:\"#9932cc\",darkred:\"#" +
+    "8b0000\",darksalmon:\"#e9967a\",darkseagreen:\"#8fbc8f\",darkslateblue:" +
+    "\"#483d8b\",darkslategray:\"#2f4f4f\",darkslategrey:\"#2f4f4f\",darkturq" +
+    "uoise:\"#00ced1\",darkviolet:\"#9400d3\",deeppink:\"#ff1493\",deepskyblu" +
+    "e:\"#00bfff\",dimgray:\"#696969\",dimgrey:\"#696969\",dodgerblue:\"#1e90f" +
+    "f\",firebrick:\"#b22222\",floralwhite:\"#fffaf0\",forestgreen:\"#228b22\"" +
+    ",fuchsia:\"#ff00ff\",gainsboro:\"#dcdcdc\",\nghostwhite:\"#f8f8ff\",gold:" +
+    "\"#ffd700\",goldenrod:\"#daa520\",gray:\"#808080\",green:\"#008000\",green" +
+    "yellow:\"#adff2f\",grey:\"#808080\",honeydew:\"#f0fff0\",hotpink:\"#ff69b" +
+    "4\",indianred:\"#cd5c5c\",indigo:\"#4b0082\",ivory:\"#fffff0\",khaki:\"#f0" +
+    "e68c\",lavender:\"#e6e6fa\",lavenderblush:\"#fff0f5\",lawngreen:\"#7cfc0" +
+    "0\",lemonchiffon:\"#fffacd\",lightblue:\"#add8e6\",lightcoral:\"#f08080\"" +
+    ",lightcyan:\"#e0ffff\",lightgoldenrodyellow:\"#fafad2\",lightgray:\"#d3" +
+    "d3d3\",lightgreen:\"#90ee90\",lightgrey:\"#d3d3d3\",lightpink:\"#ffb6c1\"" +
+    ",lightsalmon:\"#ffa07a\",\nlightseagreen:\"#20b2aa\",lightskyblue:\"#87c" +
+    "efa\",lightslategray:\"#778899\",lightslategrey:\"#778899\",lightsteelb" +
+    "lue:\"#b0c4de\",lightyellow:\"#ffffe0\",lime:\"#00ff00\",limegreen:\"#32c" +
+    "d32\",linen:\"#faf0e6\",magenta:\"#ff00ff\",maroon:\"#800000\",mediumaqua" +
+    "marine:\"#66cdaa\",mediumblue:\"#0000cd\",mediumorchid:\"#ba55d3\",mediu" +
+    "mpurple:\"#9370db\",mediumseagreen:\"#3cb371\",mediumslateblue:\"#7b68e" +
+    "e\",mediumspringgreen:\"#00fa9a\",mediumturquoise:\"#48d1cc\",mediumvio" +
+    "letred:\"#c71585\",midnightblue:\"#191970\",mintcream:\"#f5fffa\",mistyr" +
+    "ose:\"#ffe4e1\",\nmoccasin:\"#ffe4b5\",navajowhite:\"#ffdead\",navy:\"#000" +
+    "080\",oldlace:\"#fdf5e6\",olive:\"#808000\",olivedrab:\"#6b8e23\",orange:" +
+    "\"#ffa500\",orangered:\"#ff4500\",orchid:\"#da70d6\",palegoldenrod:\"#eee" +
+    "8aa\",palegreen:\"#98fb98\",paleturquoise:\"#afeeee\",palevioletred:\"#d" +
+    "b7093\",papayawhip:\"#ffefd5\",peachpuff:\"#ffdab9\",peru:\"#cd853f\",pin" +
+    "k:\"#ffc0cb\",plum:\"#dda0dd\",powderblue:\"#b0e0e6\",purple:\"#800080\",r" +
+    "ed:\"#ff0000\",rosybrown:\"#bc8f8f\",royalblue:\"#4169e1\",saddlebrown:\"" +
+    "#8b4513\",salmon:\"#fa8072\",sandybrown:\"#f4a460\",seagreen:\"#2e8b57\"," +
+    "\nseashell:\"#fff5ee\",sienna:\"#a0522d\",silver:\"#c0c0c0\",skyblue:\"#87" +
+    "ceeb\",slateblue:\"#6a5acd\",slategray:\"#708090\",slategrey:\"#708090\"," +
+    "snow:\"#fffafa\",springgreen:\"#00ff7f\",steelblue:\"#4682b4\",tan:\"#d2b" +
+    "48c\",teal:\"#008080\",thistle:\"#d8bfd8\",tomato:\"#ff6347\",turquoise:\"" +
+    "#40e0d0\",violet:\"#ee82ee\",wheat:\"#f5deb3\",white:\"#ffffff\",whitesmo" +
+    "ke:\"#f5f5f5\",yellow:\"#ffff00\",yellowgreen:\"#9acd32\"};var ac=\"backg" +
+    "roundColor borderTopColor borderRightColor borderBottomColor borde" +
+    "rLeftColor color outlineColor\".split(\" \"),bc=/#([0-9a-fA-F])([0-9a" +
+    "-fA-F])([0-9a-fA-F])/,cc=/^#(?:[0-9a-f]{3}){1,2}$/i,dc=/^(?:rgba)?" +
+    "\\((\\d{1,3}),\\s?(\\d{1,3}),\\s?(\\d{1,3}),\\s?(0|1|0\\.\\d*)\\)$/i,ec=/^(?" +
+    ":rgb)?\\((0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2}),\\s?(0|[1-9]\\d{0,2})\\)" +
+    "$/i;function fc(a,b){b=b.toLowerCase();return\"style\"==b?gc(a.style" +
+    ".cssText):(a=a.getAttributeNode(b))&&a.specified?a.value:null}var " +
+    "hc=RegExp(\"[;]+(?=(?:(?:[^\\\"]*\\\"){2})*[^\\\"]*$)(?=(?:(?:[^']*'){2})" +
+    "*[^']*$)(?=(?:[^()]*\\\\([^()]*\\\\))*[^()]*$)\");function gc(a){var b=" +
+    "[];n(a.split(hc),function(c){var d=c.indexOf(\":\");0<d&&(c=[c.slice" +
+    "(0,d),c.slice(d+1)],2==c.length&&b.push(c[0].toLowerCase(),\":\",c[1" +
+    "],\";\"))});b=b.join(\"\");return b=\";\"==b.charAt(b.length-1)?b:b+\";\"}" +
+    "\nfunction X(a,b){b&&\"string\"!==typeof b&&(b=b.toString());return!!" +
+    "a&&1==a.nodeType&&(!b||a.tagName.toUpperCase()==b)};function ic(a)" +
+    "{for(a=a.parentNode;a&&1!=a.nodeType&&9!=a.nodeType&&11!=a.nodeTyp" +
+    "e;)a=a.parentNode;return X(a)?a:null}\nfunction Y(a,b){b=va(b);if(\"" +
+    "float\"==b||\"cssFloat\"==b||\"styleFloat\"==b)b=\"cssFloat\";a:{var c=b;" +
+    "var d=z(a);if(d.defaultView&&d.defaultView.getComputedStyle&&(d=d." +
+    "defaultView.getComputedStyle(a,null))){c=d[c]||d.getPropertyValue(" +
+    "c)||\"\";break a}c=\"\"}a=c||jc(a,b);if(null===a)a=null;else if(0<=la(" +
+    "ac,b)){b:{var e=a.match(dc);if(e&&(b=Number(e[1]),c=Number(e[2]),d" +
+    "=Number(e[3]),e=Number(e[4]),0<=b&&255>=b&&0<=c&&255>=c&&0<=d&&255" +
+    ">=d&&0<=e&&1>=e)){b=[b,c,d,e];break b}b=null}if(!b)b:{if(d=a.match" +
+    "(ec))if(b=Number(d[1]),\nc=Number(d[2]),d=Number(d[3]),0<=b&&255>=b" +
+    "&&0<=c&&255>=c&&0<=d&&255>=d){b=[b,c,d,1];break b}b=null}if(!b)b:{" +
+    "b=a.toLowerCase();c=$b[b.toLowerCase()];if(!c&&(c=\"#\"==b.charAt(0)" +
+    "?b:\"#\"+b,4==c.length&&(c=c.replace(bc,\"#$1$1$2$2$3$3\")),!cc.test(c" +
+    "))){b=null;break b}b=[parseInt(c.substr(1,2),16),parseInt(c.substr" +
+    "(3,2),16),parseInt(c.substr(5,2),16),1]}a=b?\"rgba(\"+b.join(\", \")+\"" +
+    ")\":a}return a}\nfunction jc(a,b){var c=a.currentStyle||a.style,d=c[" +
+    "b];void 0===d&&\"function\"===typeof c.getPropertyValue&&(d=c.getPro" +
+    "pertyValue(b));return\"inherit\"!=d?void 0!==d?d:null:(a=ic(a))?jc(a" +
+    ",b):null}\nfunction kc(a,b,c){function d(g){var h=lc(g);return 0<h." +
+    "height&&0<h.width?!0:X(g,\"PATH\")&&(0<h.height||0<h.width)?(g=Y(g,\"" +
+    "stroke-width\"),!!g&&0<parseInt(g,10)):\"hidden\"!=Y(g,\"overflow\")&&n" +
+    "a(g.childNodes,function(p){return 3==p.nodeType||X(p)&&d(p)})}func" +
+    "tion e(g){return\"hidden\"==mc(g)&&oa(g.childNodes,function(h){retur" +
+    "n!X(h)||e(h)||!d(h)})}if(!X(a))throw Error(\"Argument to isShown mu" +
+    "st be of type Element\");if(X(a,\"BODY\"))return!0;if(X(a,\"OPTION\")||" +
+    "X(a,\"OPTGROUP\"))return a=Ea(a,function(g){return X(g,\n\"SELECT\")})," +
+    "!!a&&kc(a,!0,c);var f=nc(a);if(f)return!!f.image&&0<f.rect.width&&" +
+    "0<f.rect.height&&kc(f.image,b,c);if(X(a,\"INPUT\")&&\"hidden\"==a.type" +
+    ".toLowerCase()||X(a,\"NOSCRIPT\"))return!1;f=Y(a,\"visibility\");retur" +
+    "n\"collapse\"!=f&&\"hidden\"!=f&&c(a)&&(b||0!=oc(a))&&d(a)?!e(a):!1}\nf" +
+    "unction pc(a){function b(c){if(X(c)&&\"none\"==Y(c,\"display\"))return" +
+    "!1;var d;(d=c.parentNode)&&d.shadowRoot&&void 0!==c.assignedSlot?d" +
+    "=c.assignedSlot?c.assignedSlot.parentNode:null:c.getDestinationIns" +
+    "ertionPoints&&(c=c.getDestinationInsertionPoints(),0<c.length&&(d=" +
+    "c[c.length-1]));return!d||9!=d.nodeType&&11!=d.nodeType?!!d&&b(d):" +
+    "!0}return kc(a,!1,b)}\nfunction mc(a){function b(l){function r($a){" +
+    "return $a==g?!0:0==Y($a,\"display\").lastIndexOf(\"inline\",0)||\"absol" +
+    "ute\"==Lb&&\"static\"==Y($a,\"position\")?!1:!0}var Lb=Y(l,\"position\");" +
+    "if(\"fixed\"==Lb)return q=!0,l==g?null:g;for(l=ic(l);l&&!r(l);)l=ic(" +
+    "l);return l}function c(l){var r=l;if(\"visible\"==p)if(l==g&&h)r=h;e" +
+    "lse if(l==h)return{x:\"visible\",y:\"visible\"};r={x:Y(r,\"overflow-x\")" +
+    ",y:Y(r,\"overflow-y\")};l==g&&(r.x=\"visible\"==r.x?\"auto\":r.x,r.y=\"vi" +
+    "sible\"==r.y?\"auto\":r.y);return r}function d(l){if(l==g){var r=\n(ne" +
+    "w wa(f)).g;l=r.scrollingElement?r.scrollingElement:r.body||r.docum" +
+    "entElement;r=r.parentWindow||r.defaultView;l=new v(r.pageXOffset||" +
+    "l.scrollLeft,r.pageYOffset||l.scrollTop)}else l=new v(l.scrollLeft" +
+    ",l.scrollTop);return l}var e=qc(a),f=z(a),g=f.documentElement,h=f." +
+    "body,p=Y(g,\"overflow\"),q;for(a=b(a);a;a=b(a)){var m=c(a);if(\"visib" +
+    "le\"!=m.x||\"visible\"!=m.y){var y=lc(a);if(0==y.width||0==y.height)r" +
+    "eturn\"hidden\";var L=e.g<y.left,T=e.h<y.top;if(L&&\"hidden\"==m.x||T&" +
+    "&\"hidden\"==m.y)return\"hidden\";if(L&&\n\"visible\"!=m.x||T&&\"visible\"!" +
+    "=m.y){L=d(a);T=e.h<y.top-L.y;if(e.g<y.left-L.x&&\"visible\"!=m.x||T&" +
+    "&\"visible\"!=m.x)return\"hidden\";e=mc(a);return\"hidden\"==e?\"hidden\":" +
+    "\"scroll\"}L=e.left>=y.left+y.width;y=e.top>=y.top+y.height;if(L&&\"h" +
+    "idden\"==m.x||y&&\"hidden\"==m.y)return\"hidden\";if(L&&\"visible\"!=m.x|" +
+    "|y&&\"visible\"!=m.y){if(q&&(m=d(a),e.left>=g.scrollWidth-m.x||e.g>=" +
+    "g.scrollHeight-m.y))return\"hidden\";e=mc(a);return\"hidden\"==e?\"hidd" +
+    "en\":\"scroll\"}}}return\"none\"}\nfunction lc(a){var b=nc(a);if(b)retur" +
+    "n b.rect;if(X(a,\"HTML\"))return a=z(a),a=((a?a.parentWindow||a.defa" +
+    "ultView:window)||window).document,a=\"CSS1Compat\"==a.compatMode?a.d" +
+    "ocumentElement:a.body,a=new w(a.clientWidth,a.clientHeight),new C(" +
+    "0,0,a.width,a.height);try{var c=a.getBoundingClientRect()}catch(d)" +
+    "{return new C(0,0,0,0)}return new C(c.left,c.top,c.right-c.left,c." +
+    "bottom-c.top)}\nfunction nc(a){var b=X(a,\"MAP\");if(!b&&!X(a,\"AREA\")" +
+    ")return null;var c=b?a:X(a.parentNode,\"MAP\")?a.parentNode:null,d=n" +
+    "ull,e=null;c&&c.name&&(d=z(c),d=W.A('/descendant::*[@usemap = \"#'+" +
+    "c.name+'\"]',d))&&(e=lc(d),b||\"default\"==a.shape.toLowerCase()||(a=" +
+    "rc(a),b=Math.min(Math.max(a.left,0),e.width),c=Math.min(Math.max(a" +
+    ".top,0),e.height),e=new C(b+e.left,c+e.top,Math.min(a.width,e.widt" +
+    "h-b),Math.min(a.height,e.height-c))));return{image:d,rect:e||new C" +
+    "(0,0,0,0)}}\nfunction rc(a){var b=a.shape.toLowerCase();a=a.coords." +
+    "split(\",\");if(\"rect\"==b&&4==a.length){b=a[0];var c=a[1];return new" +
+    " C(b,c,a[2]-b,a[3]-c)}if(\"circle\"==b&&3==a.length)return b=a[2],ne" +
+    "w C(a[0]-b,a[1]-b,2*b,2*b);if(\"poly\"==b&&2<a.length){b=a[0];c=a[1]" +
+    ";for(var d=b,e=c,f=2;f+1<a.length;f+=2)b=Math.min(b,a[f]),d=Math.m" +
+    "ax(d,a[f]),c=Math.min(c,a[f+1]),e=Math.max(e,a[f+1]);return new C(" +
+    "b,c,d-b,e-c)}return new C(0,0,0,0)}function qc(a){a=lc(a);return n" +
+    "ew Na(a.top,a.left+a.width,a.top+a.height,a.left)}\nfunction sc(a){" +
+    "return a.replace(/^[^\\S\\xa0]+|[^\\S\\xa0]+$/g,\"\")}function tc(a){var" +
+    " b=[];uc(a,b);a=b.length;var c=Array(a);b=\"string\"===typeof b?b.sp" +
+    "lit(\"\"):b;for(var d=0;d<a;d++)d in b&&(c[d]=sc.call(void 0,b[d]));" +
+    "return sc(c.join(\"\\n\")).replace(/\\xa0/g,\" \")}\nfunction vc(a,b,c){i" +
+    "f(X(a,\"BR\"))b.push(\"\");else{var d=X(a,\"TD\"),e=Y(a,\"display\"),f=!d&" +
+    "&!(0<=la(wc,e)),g=void 0!==a.previousElementSibling?a.previousElem" +
+    "entSibling:ya(a.previousSibling);g=g?Y(g,\"display\"):\"\";var h=Y(a,\"" +
+    "float\")||Y(a,\"cssFloat\")||Y(a,\"styleFloat\");!f||\"run-in\"==g&&\"none" +
+    "\"==h||/^[\\s\\xa0]*$/.test(b[b.length-1]||\"\")||b.push(\"\");var p=pc(a" +
+    "),q=null,m=null;p&&(q=Y(a,\"white-space\"),m=Y(a,\"text-transform\"));" +
+    "n(a.childNodes,function(y){c(y,b,p,q,m)});a=b[b.length-1]||\"\";!d&&" +
+    "\"table-cell\"!=e||!a||\nsa(a)||(b[b.length-1]+=\" \");f&&\"run-in\"!=e&&" +
+    "!/^[\\s\\xa0]*$/.test(a)&&b.push(\"\")}}function uc(a,b){vc(a,b,functi" +
+    "on(c,d,e,f,g){3==c.nodeType&&e?xc(c,d,f,g):X(c)&&uc(c,d)})}var wc=" +
+    "\"inline inline-block inline-table none table-cell table-column tab" +
+    "le-column-group\".split(\" \");\nfunction xc(a,b,c,d){a=a.nodeValue.re" +
+    "place(/[\\u200b\\u200e\\u200f]/g,\"\");a=a.replace(/(\\r\\n|\\r|\\n)/g,\"\\n\"" +
+    ");if(\"normal\"==c||\"nowrap\"==c)a=a.replace(/\\n/g,\" \");a=\"pre\"==c||\"" +
+    "pre-wrap\"==c?a.replace(/[ \\f\\t\\v\\u2028\\u2029]/g,\"\\u00a0\"):a.replac" +
+    "e(/[ \\f\\t\\v\\u2028\\u2029]+/g,\" \");\"capitalize\"==d?a=a.replace(/(^|\\" +
+    "s)(\\S)/g,function(e,f,g){return f+g.toUpperCase()}):\"uppercase\"==d" +
+    "?a=a.toUpperCase():\"lowercase\"==d&&(a=a.toLowerCase());c=b.pop()||" +
+    "\"\";sa(c)&&0==a.lastIndexOf(\" \",0)&&(a=a.substr(1));b.push(c+a)}\nfu" +
+    "nction oc(a){var b=1,c=Y(a,\"opacity\");c&&(b=Number(c));(a=ic(a))&&" +
+    "(b*=oc(a));return b};var yc={F:function(a,b){return!(!a.querySelec" +
+    "torAll||!a.querySelector)&&!/^\\d.*/.test(b)},A:function(a,b){var c" +
+    "=x(b),d=xa(c.g,a);return d?fc(d,\"id\")==a&&b!=d&&za(b,d)?d:pa(A(c,\"" +
+    "*\"),function(e){return fc(e,\"id\")==a&&b!=e&&za(b,e)}):null},u:func" +
+    "tion(a,b){if(!a)return[];if(yc.F(b,a))try{return b.querySelectorAl" +
+    "l(\"#\"+yc.P(a))}catch(c){return[]}b=A(x(b),\"*\",null,b);return ma(b," +
+    "function(c){return fc(c,\"id\")==a})},P:function(a){return a.replace" +
+    "(/([\\s'\"\\\\#.:;,!?+<>=~*^$|%&@`{}\\-\\/\\[\\]\\(\\)])/g,\"\\\\$1\")}};var Z={" +
+    "},zc={};Z.O=function(a,b,c){try{var d=Ma.u(\"a\",b)}catch(e){d=A(x(b" +
+    "),\"A\",null,b)}return pa(d,function(e){e=tc(e);e=e.replace(/^[\\s]+|" +
+    "[\\s]+$/g,\"\");return c&&-1!=e.indexOf(a)||e==a})};Z.L=function(a,b," +
+    "c){try{var d=Ma.u(\"a\",b)}catch(e){d=A(x(b),\"A\",null,b)}return ma(d" +
+    ",function(e){e=tc(e);e=e.replace(/^[\\s]+|[\\s]+$/g,\"\");return c&&-1" +
+    "!=e.indexOf(a)||e==a})};Z.A=function(a,b){return Z.O(a,b,!1)};Z.u=" +
+    "function(a,b){return Z.L(a,b,!1)};zc.A=function(a,b){return Z.O(a," +
+    "b,!0)};\nzc.u=function(a,b){return Z.L(a,b,!0)};var Ac={A:function(" +
+    "a,b){if(\"\"===a)throw new B(32,'Unable to locate an element with th" +
+    "e tagName \"\"');return b.getElementsByTagName(a)[0]||null},u:functi" +
+    "on(a,b){if(\"\"===a)throw new B(32,'Unable to locate an element with" +
+    " the tagName \"\"');return b.getElementsByTagName(a)}};var Bc={class" +
+    "Name:Ha,\"class name\":Ha,css:Ma,\"css selector\":Ma,id:yc,linkText:Z," +
+    "\"link text\":Z,name:{A:function(a,b){b=A(x(b),\"*\",null,b);return pa" +
+    "(b,function(c){return fc(c,\"name\")==a})},u:function(a,b){b=A(x(b)," +
+    "\"*\",null,b);return ma(b,function(c){return fc(c,\"name\")==a})}},par" +
+    "tialLinkText:zc,\"partial link text\":zc,tagName:Ac,\"tag name\":Ac,xp" +
+    "ath:W};ba(\"_\",function(a,b){b=b||Fa;for(var c=b.frames.length,d=0;" +
+    "d<c;d++){var e=b.frames[d],f=e.frameElement||e;if(f.name==a)return" +
+    " e.document?e:Da(e)}a:{a={id:a};b=b.document;b:{for(g in a)if(a.ha" +
+    "sOwnProperty(g))break b;var g=null}if(g&&(d=Bc[g])&&\"function\"===t" +
+    "ypeof d.u){g=d.u(a[g],b||Fa.document);break a}throw new B(61,\"Unsu" +
+    "pported locator strategy: \"+g);}for(d=0;d<g.length;d++)if((f=g[d])" +
+    "&&(X(f,\"FRAME\")||X(f,\"IFRAME\")))return Da(f);return null});;return" +
+    " this._.apply(null,arguments);}).apply({navigator:typeof window!=\"" +
+    "undefined\"?window.navigator:null},arguments);}\n"
+  )
+  .toString();
+  static final String FRAME_BY_ID_OR_NAME_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String FRAME_BY_ID_OR_NAME_ANDROID_original() {
+    return FRAME_BY_ID_OR_NAME_ANDROID.replaceAll("xxx_rpl_lic", FRAME_BY_ID_OR_NAME_ANDROID_license);
+  }
+
+/* field: FRAME_BY_INDEX_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String FRAME_BY_INDEX_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar k=this||self;fu" +
+    "nction aa(a,b){a=a.split(\".\");var c=k;a[0]in c||\"undefined\"==typeo" +
+    "f c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d=a" +
+    ".shift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]?c" +
+    "=c[d]:c=c[d]={}:c[d]=b}function ba(a,b,c){return a.call.apply(a.bi" +
+    "nd,arguments)}\nfunction ca(a,b,c){if(!a)throw Error();if(2<argumen" +
+    "ts.length){var d=Array.prototype.slice.call(arguments,2);return fu" +
+    "nction(){var e=Array.prototype.slice.call(arguments);Array.prototy" +
+    "pe.unshift.apply(e,d);return a.apply(b,e)}}return function(){retur" +
+    "n a.apply(b,arguments)}}function l(a,b,c){Function.prototype.bind&" +
+    "&-1!=Function.prototype.bind.toString().indexOf(\"native code\")?l=b" +
+    "a:l=ca;return l.apply(null,arguments)}\nfunction da(a,b){var c=Arra" +
+    "y.prototype.slice.call(arguments,1);return function(){var d=c.slic" +
+    "e();d.push.apply(d,arguments);return a.apply(this,d)}}function m(a" +
+    ",b){function c(){}c.prototype=b.prototype;a.O=b.prototype;a.protot" +
+    "ype=new c;a.prototype.constructor=a;a.N=function(d,e,f){for(var g=" +
+    "Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=argume" +
+    "nts[h];return b.prototype[e].apply(d,g)}};function n(a,b){if(Error" +
+    ".captureStackTrace)Error.captureStackTrace(this,n);else{var c=Erro" +
+    "r().stack;c&&(this.stack=c)}a&&(this.message=String(a));void 0!==b" +
+    "&&(this.cause=b)}m(n,Error);n.prototype.name=\"CustomError\";functio" +
+    "n ea(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length-1,e=0;e<d;e++)c+" +
+    "=a[e]+(e<b.length?b[e]:\"%s\");n.call(this,c+a[d])}m(ea,n);ea.protot" +
+    "ype.name=\"AssertionError\";function fa(a,b,c){if(!a){var d=\"Asserti" +
+    "on failed\";if(b){d+=\": \"+b;var e=Array.prototype.slice.call(argume" +
+    "nts,2)}throw new ea(\"\"+d,e||[]);}};function p(a,b){for(var c=a.len" +
+    "gth,d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)e in d&&b.call" +
+    "(void 0,d[e],e,a)}function q(a,b,c){var d=c;p(a,function(e,f){d=b." +
+    "call(void 0,d,e,f,a)});return d}function r(a,b){for(var c=a.length" +
+    ",d=\"string\"===typeof a?a.split(\"\"):a,e=0;e<c;e++)if(e in d&&b.call" +
+    "(void 0,d[e],e,a))return!0;return!1}function ha(a){return Array.pr" +
+    "ototype.concat.apply([],arguments)}\nfunction ia(a,b,c){fa(null!=a." +
+    "length);return 2>=arguments.length?Array.prototype.slice.call(a,b)" +
+    ":Array.prototype.slice.call(a,b,c)};var ja=String.prototype.trim?f" +
+    "unction(a){return a.trim()}:function(a){return/^[\\s\\xa0]*([\\s\\S]*?" +
+    ")[\\s\\xa0]*$/.exec(a)[1]};function ka(a,b){return a<b?-1:a>b?1:0};f" +
+    "unction la(){var a=k.navigator;return a&&(a=a.userAgent)?a:\"\"};fun" +
+    "ction ma(a,b){if(!a||!b)return!1;if(a.contains&&1==b.nodeType)retu" +
+    "rn a==b||a.contains(b);if(\"undefined\"!=typeof a.compareDocumentPos" +
+    "ition)return a==b||!!(a.compareDocumentPosition(b)&16);for(;b&&a!=" +
+    "b;)b=b.parentNode;return b==a}\nfunction na(a,b){if(a==b)return 0;i" +
+    "f(a.compareDocumentPosition)return a.compareDocumentPosition(b)&2?" +
+    "1:-1;if(\"sourceIndex\"in a||a.parentNode&&\"sourceIndex\"in a.parentN" +
+    "ode){var c=1==a.nodeType,d=1==b.nodeType;if(c&&d)return a.sourceIn" +
+    "dex-b.sourceIndex;var e=a.parentNode,f=b.parentNode;return e==f?oa" +
+    "(a,b):!c&&ma(e,b)?-1*pa(a,b):!d&&ma(f,a)?pa(b,a):(c?a.sourceIndex:" +
+    "e.sourceIndex)-(d?b.sourceIndex:f.sourceIndex)}fa(a,\"Node cannot b" +
+    "e null or undefined.\");d=9==a.nodeType?a:a.ownerDocument||a.docume" +
+    "nt;c=\nd.createRange();c.selectNode(a);c.collapse(!0);a=d.createRan" +
+    "ge();a.selectNode(b);a.collapse(!0);return c.compareBoundaryPoints" +
+    "(k.Range.START_TO_END,a)}function pa(a,b){var c=a.parentNode;if(c=" +
+    "=b)return-1;for(;b.parentNode!=c;)b=b.parentNode;return oa(b,a)}fu" +
+    "nction oa(a,b){for(;b=b.previousSibling;)if(b==a)return-1;return 1" +
+    "};/*\n\n Copyright 2014 Software Freedom Conservancy\n\n Licensed unde" +
+    "r the Apache License, Version 2.0 (the \"License\");\n you may not us" +
+    "e this file except in compliance with the License.\n You may obtain" +
+    " a copy of the License at\n\n      http://www.apache.org/licenses/LI" +
+    "CENSE-2.0\n\n Unless required by applicable law or agreed to in writ" +
+    "ing, software\n distributed under the License is distributed on an " +
+    "\"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, eith" +
+    "er express or implied.\n See the License for the specific language " +
+    "governing permissions and\n limitations under the License.\n*/\nvar q" +
+    "a=window;function ra(a){return(a=a.exec(la()))?a[1]:\"\"}ra(/Android" +
+    "\\s+([0-9.]+)/)||ra(/Version\\/([0-9.]+)/);function sa(a){var b=0,c=" +
+    "ja(String(ta)).split(\".\");a=ja(String(a)).split(\".\");for(var d=Mat" +
+    "h.max(c.length,a.length),e=0;0==b&&e<d;e++){var f=c[e]||\"\",g=a[e]|" +
+    "|\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"\",\"\",\"\"];g=/(\\d*)(\\D*)(.*)" +
+    "/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].length&&0==g[0].length)break;b" +
+    "=ka(0==f[1].length?0:parseInt(f[1],10),0==g[1].length?0:parseInt(g" +
+    "[1],10))||ka(0==f[2].length,0==g[2].length)||ka(f[2],g[2]);f=f[3];" +
+    "g=g[3]}while(0==b)}}var ua=/Android\\s+([0-9\\.]+)/.exec(la()),ta=ua" +
+    "?ua[1]:\"0\";sa(2.3);\nsa(4);/*\n\n The MIT License\n\n Copyright (c) 200" +
+    "7 Cybozu Labs, Inc.\n Copyright (c) 2012 Google Inc.\n\n Permission i" +
+    "s hereby granted, free of charge, to any person obtaining a copy\n " +
+    "of this software and associated documentation files (the \"Software" +
+    "\"), to\n deal in the Software without restriction, including withou" +
+    "t limitation the\n rights to use, copy, modify, merge, publish, dis" +
+    "tribute, sublicense, and/or\n sell copies of the Software, and to p" +
+    "ermit persons to whom the Software is\n furnished to do so, subject" +
+    " to the following conditions:\n\n The above copyright notice and thi" +
+    "s permission notice shall be included in\n all copies or substantia" +
+    "l portions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WI" +
+    "THOUT WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT" +
+    " LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PART" +
+    "ICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS" +
+    " OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n L" +
+    "IABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARI" +
+    "SING\n FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE O" +
+    "R OTHER DEALINGS\n IN THE SOFTWARE.\n*/\nfunction u(a,b,c){this.g=a;t" +
+    "his.j=b||1;this.h=c||1};function va(a){this.h=a;this.g=0}function " +
+    "wa(a){a=a.match(xa);for(var b=0;b<a.length;b++)ya.test(a[b])&&a.sp" +
+    "lice(b,1);return new va(a)}var xa=RegExp(\"\\\\$?(?:(?![0-9-])[\\\\w-]+" +
+    ":)?(?![0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[" +
+    "^\\\"]*\\\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),ya=/^\\s/;function v(a,b){retur" +
+    "n a.h[a.g+(b||0)]}va.prototype.next=function(){return this.h[this." +
+    "g++]};function w(a){return a.h.length<=a.g};function x(a){var b=nu" +
+    "ll,c=a.nodeType;1==c&&(b=a.textContent,b=void 0==b||null==b?a.inne" +
+    "rText:b,b=void 0==b||null==b?\"\":b);if(\"string\"!=typeof b)if(9==c||" +
+    "1==c){a=9==c?a.documentElement:a.firstChild;c=0;var d=[];for(b=\"\";" +
+    "a;){do 1!=a.nodeType&&(b+=a.nodeValue),d[c++]=a;while(a=a.firstChi" +
+    "ld);for(;c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;return\"" +
+    "\"+b}\nfunction z(a,b,c){if(null===b)return!0;try{if(!a.getAttribute" +
+    ")return!1}catch(d){return!1}return null==c?!!a.getAttribute(b):a.g" +
+    "etAttribute(b,2)==c}function A(a,b,c,d,e){return za.call(null,a,b," +
+    "\"string\"===typeof c?c:null,\"string\"===typeof d?d:null,e||new B)}\nf" +
+    "unction za(a,b,c,d,e){b.getElementsByName&&d&&\"name\"==c?(b=b.getEl" +
+    "ementsByName(d),p(b,function(f){a.g(f)&&e.add(f)})):b.getElementsB" +
+    "yClassName&&d&&\"class\"==c?(b=b.getElementsByClassName(d),p(b,funct" +
+    "ion(f){f.className==d&&a.g(f)&&e.add(f)})):a instanceof C?Aa(a,b,c" +
+    ",d,e):b.getElementsByTagName&&(b=b.getElementsByTagName(a.j()),p(b" +
+    ",function(f){z(f,c,d)&&e.add(f)}));return e}function Aa(a,b,c,d,e)" +
+    "{for(b=b.firstChild;b;b=b.nextSibling)z(b,c,d)&&a.g(b)&&e.add(b),A" +
+    "a(a,b,c,d,e)};function B(){this.j=this.g=null;this.h=0}function Ba" +
+    "(a){this.h=a;this.next=this.g=null}function Ca(a,b){if(!a.g)return" +
+    " b;if(!b.g)return a;var c=a.g;b=b.g;for(var d=null,e,f=0;c&&b;)c.h" +
+    "==b.h?(e=c,c=c.next,b=b.next):0<na(c.h,b.h)?(e=b,b=b.next):(e=c,c=" +
+    "c.next),(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;)e.g=d,d=d.nex" +
+    "t=e,f++,e=e.next;a.j=d;a.h=f;return a}function Da(a,b){b=new Ba(b)" +
+    ";b.next=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nB.prototype.add=fun" +
+    "ction(a){a=new Ba(a);a.g=this.j;this.g?this.j.next=a:this.g=this.j" +
+    "=a;this.j=a;this.h++};function D(a){return(a=a.g)?a.h:null}functio" +
+    "n E(a){return(a=D(a))?x(a):\"\"}function F(a,b){return new Ea(a,!!b)" +
+    "}function Ea(a,b){this.j=a;this.h=(this.A=b)?a.j:a.g;this.g=null}E" +
+    "a.prototype.next=function(){var a=this.h;if(null==a)return null;va" +
+    "r b=this.g=a;this.h=this.A?a.g:a.next;return b.h};function Fa(a){s" +
+    "witch(a.nodeType){case 1:return da(Ga,a);case 9:return Fa(a.docume" +
+    "ntElement);case 11:case 10:case 6:case 12:return Ha;default:return" +
+    " a.parentNode?Fa(a.parentNode):Ha}}function Ha(){return null}funct" +
+    "ion Ga(a,b){if(a.prefix==b)return a.namespaceURI||\"http://www.w3.o" +
+    "rg/1999/xhtml\";var c=a.getAttributeNode(\"xmlns:\"+b);return c&&c.sp" +
+    "ecified?c.value||null:a.parentNode&&9!=a.parentNode.nodeType?Ga(a." +
+    "parentNode,b):null};function G(a){this.o=a;this.h=this.l=!1;this.j" +
+    "=null}function H(a){return\"\\n  \"+a.toString().split(\"\\n\").join(\"\\n" +
+    "  \")}function Ia(a,b){a.l=b}function Ja(a,b){a.h=b}function I(a,b)" +
+    "{a=a.g(b);return a instanceof B?+E(a):+a}function J(a,b){a=a.g(b);" +
+    "return a instanceof B?E(a):\"\"+a}function L(a,b){a=a.g(b);return a " +
+    "instanceof B?!!a.h:!!a};function M(a,b,c){G.call(this,a.o);this.i=" +
+    "a;this.m=b;this.v=c;this.l=b.l||c.l;this.h=b.h||c.h;this.i==Ka&&(c" +
+    ".h||c.l||4==c.o||0==c.o||!b.j?b.h||b.l||4==b.o||0==b.o||!c.j||(thi" +
+    "s.j={name:c.j.name,B:b}):this.j={name:b.j.name,B:c})}m(M,G);\nfunct" +
+    "ion N(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;if(b instanceof B&&c inst" +
+    "anceof B){b=F(b);for(d=b.next();d;d=b.next())for(e=F(c),f=e.next()" +
+    ";f;f=e.next())if(a(x(d),x(f)))return!0;return!1}if(b instanceof B|" +
+    "|c instanceof B){b instanceof B?(e=b,d=c):(e=c,d=b);f=F(e);for(var" +
+    " g=typeof d,h=f.next();h;h=f.next()){switch(g){case \"number\":h=+x(" +
+    "h);break;case \"boolean\":h=!!x(h);break;case \"string\":h=x(h);break;" +
+    "default:throw Error(\"Illegal primitive type for comparison.\");}if(" +
+    "e==b&&a(h,d)||e==c&&a(d,h))return!0}return!1}return e?\n\"boolean\"==" +
+    "typeof b||\"boolean\"==typeof c?a(!!b,!!c):\"number\"==typeof b||\"numb" +
+    "er\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}M.prototype.g=function(a){r" +
+    "eturn this.i.u(this.m,this.v,a)};M.prototype.toString=function(){v" +
+    "ar a=\"Binary Expression: \"+this.i;a+=H(this.m);return a+=H(this.v)" +
+    "};function La(a,b,c,d){this.L=a;this.H=b;this.o=c;this.u=d}La.prot" +
+    "otype.toString=function(){return this.L};var Ma={};\nfunction O(a,b" +
+    ",c,d){if(Ma.hasOwnProperty(a))throw Error(\"Binary operator already" +
+    " created: \"+a);a=new La(a,b,c,d);return Ma[a.toString()]=a}O(\"div\"" +
+    ",6,1,function(a,b,c){return I(a,c)/I(b,c)});O(\"mod\",6,1,function(a" +
+    ",b,c){return I(a,c)%I(b,c)});O(\"*\",6,1,function(a,b,c){return I(a," +
+    "c)*I(b,c)});O(\"+\",5,1,function(a,b,c){return I(a,c)+I(b,c)});O(\"-\"" +
+    ",5,1,function(a,b,c){return I(a,c)-I(b,c)});O(\"<\",4,2,function(a,b" +
+    ",c){return N(function(d,e){return d<e},a,b,c)});\nO(\">\",4,2,functio" +
+    "n(a,b,c){return N(function(d,e){return d>e},a,b,c)});O(\"<=\",4,2,fu" +
+    "nction(a,b,c){return N(function(d,e){return d<=e},a,b,c)});O(\">=\"," +
+    "4,2,function(a,b,c){return N(function(d,e){return d>=e},a,b,c)});v" +
+    "ar Ka=O(\"=\",3,2,function(a,b,c){return N(function(d,e){return d==e" +
+    "},a,b,c,!0)});O(\"!=\",3,2,function(a,b,c){return N(function(d,e){re" +
+    "turn d!=e},a,b,c,!0)});O(\"and\",2,2,function(a,b,c){return L(a,c)&&" +
+    "L(b,c)});O(\"or\",1,2,function(a,b,c){return L(a,c)||L(b,c)});functi" +
+    "on P(a,b){if(b.g.length&&4!=a.o)throw Error(\"Primary expression mu" +
+    "st evaluate to nodeset if filter has predicate(s).\");G.call(this,a" +
+    ".o);this.m=a;this.i=b;this.l=a.l;this.h=a.h}m(P,G);P.prototype.g=f" +
+    "unction(a){a=this.m.g(a);return Na(this.i,a)};P.prototype.toString" +
+    "=function(){var a=\"Filter:\"+H(this.m);return a+=H(this.i)};functio" +
+    "n Q(a,b){if(b.length<a.G)throw Error(\"Function \"+a.s+\" expects at " +
+    "least\"+a.G+\" arguments, \"+b.length+\" given\");if(null!==a.D&&b.leng" +
+    "th>a.D)throw Error(\"Function \"+a.s+\" expects at most \"+a.D+\" argum" +
+    "ents, \"+b.length+\" given\");a.K&&p(b,function(c,d){if(4!=c.o)throw " +
+    "Error(\"Argument \"+d+\" to function \"+a.s+\" is not of type Nodeset: " +
+    "\"+c);});G.call(this,a.o);this.C=a;this.i=b;Ia(this,a.l||r(b,functi" +
+    "on(c){return c.l}));Ja(this,a.J&&!b.length||a.I&&!!b.length||r(b,f" +
+    "unction(c){return c.h}))}m(Q,G);\nQ.prototype.g=function(a){return " +
+    "this.C.u.apply(null,ha(a,this.i))};Q.prototype.toString=function()" +
+    "{var a=\"Function: \"+this.C;if(this.i.length){var b=q(this.i,functi" +
+    "on(c,d){return c+H(d)},\"Arguments:\");a+=H(b)}return a};function Oa" +
+    "(a,b,c,d,e,f,g,h){this.s=a;this.o=b;this.l=c;this.J=d;this.I=!1;th" +
+    "is.u=e;this.G=f;this.D=void 0!==g?g:f;this.K=!!h}Oa.prototype.toSt" +
+    "ring=function(){return this.s};var Pa={};\nfunction R(a,b,c,d,e,f,g" +
+    ",h){if(Pa.hasOwnProperty(a))throw Error(\"Function already created:" +
+    " \"+a+\".\");Pa[a]=new Oa(a,b,c,d,e,f,g,h)}R(\"boolean\",2,!1,!1,functi" +
+    "on(a,b){return L(b,a)},1);R(\"ceiling\",1,!1,!1,function(a,b){return" +
+    " Math.ceil(I(b,a))},1);R(\"concat\",3,!1,!1,function(a,b){var c=ia(a" +
+    "rguments,1);return q(c,function(d,e){return d+J(e,a)},\"\")},2,null)" +
+    ";R(\"contains\",2,!1,!1,function(a,b,c){b=J(b,a);a=J(c,a);return-1!=" +
+    "b.indexOf(a)},2);R(\"count\",1,!1,!1,function(a,b){return b.g(a).h}," +
+    "1,1,!0);\nR(\"false\",2,!1,!1,function(){return!1},0);R(\"floor\",1,!1," +
+    "!1,function(a,b){return Math.floor(I(b,a))},1);R(\"id\",4,!1,!1,func" +
+    "tion(a,b){var c=a.g,d=9==c.nodeType?c:c.ownerDocument;a=J(b,a).spl" +
+    "it(/\\s+/);var e=[];p(a,function(g){g=d.getElementById(g);var h;if(" +
+    "!(h=!g)){a:if(\"string\"===typeof e)h=\"string\"!==typeof g||1!=g.leng" +
+    "th?-1:e.indexOf(g,0);else{for(h=0;h<e.length;h++)if(h in e&&e[h]==" +
+    "=g)break a;h=-1}h=0<=h}h||e.push(g)});e.sort(na);var f=new B;p(e,f" +
+    "unction(g){f.add(g)});return f},1);\nR(\"lang\",2,!1,!1,function(){re" +
+    "turn!1},1);R(\"last\",1,!0,!1,function(a){if(1!=arguments.length)thr" +
+    "ow Error(\"Function last expects ()\");return a.h},0);R(\"local-name\"" +
+    ",3,!1,!0,function(a,b){return(a=b?D(b.g(a)):a.g)?a.localName||a.no" +
+    "deName.toLowerCase():\"\"},0,1,!0);R(\"name\",3,!1,!0,function(a,b){re" +
+    "turn(a=b?D(b.g(a)):a.g)?a.nodeName.toLowerCase():\"\"},0,1,!0);R(\"na" +
+    "mespace-uri\",3,!0,!1,function(){return\"\"},0,1,!0);\nR(\"normalize-sp" +
+    "ace\",3,!1,!0,function(a,b){return(b?J(b,a):x(a.g)).replace(/[\\s\\xa" +
+    "0]+/g,\" \").replace(/^\\s+|\\s+$/g,\"\")},0,1);R(\"not\",2,!1,!1,function" +
+    "(a,b){return!L(b,a)},1);R(\"number\",1,!1,!0,function(a,b){return b?" +
+    "I(b,a):+x(a.g)},0,1);R(\"position\",1,!0,!1,function(a){return a.j}," +
+    "0);R(\"round\",1,!1,!1,function(a,b){return Math.round(I(b,a))},1);R" +
+    "(\"starts-with\",2,!1,!1,function(a,b,c){b=J(b,a);a=J(c,a);return 0=" +
+    "=b.lastIndexOf(a,0)},2);R(\"string\",3,!1,!0,function(a,b){return b?" +
+    "J(b,a):x(a.g)},0,1);\nR(\"string-length\",1,!1,!0,function(a,b){retur" +
+    "n(b?J(b,a):x(a.g)).length},0,1);R(\"substring\",3,!1,!1,function(a,b" +
+    ",c,d){c=I(c,a);if(isNaN(c)||Infinity==c||-Infinity==c)return\"\";d=d" +
+    "?I(d,a):Infinity;if(isNaN(d)||-Infinity===d)return\"\";c=Math.round(" +
+    "c)-1;var e=Math.max(c,0);a=J(b,a);return Infinity==d?a.substring(e" +
+    "):a.substring(e,c+Math.round(d))},2,3);R(\"substring-after\",3,!1,!1" +
+    ",function(a,b,c){b=J(b,a);a=J(c,a);c=b.indexOf(a);return-1==c?\"\":b" +
+    ".substring(c+a.length)},2);\nR(\"substring-before\",3,!1,!1,function(" +
+    "a,b,c){b=J(b,a);a=J(c,a);a=b.indexOf(a);return-1==a?\"\":b.substring" +
+    "(0,a)},2);R(\"sum\",1,!1,!1,function(a,b){a=F(b.g(a));b=0;for(var c=" +
+    "a.next();c;c=a.next())b+=+x(c);return b},1,1,!0);R(\"translate\",3,!" +
+    "1,!1,function(a,b,c,d){b=J(b,a);c=J(c,a);var e=J(d,a);a={};for(d=0" +
+    ";d<c.length;d++){var f=c.charAt(d);f in a||(a[f]=e.charAt(d))}c=\"\"" +
+    ";for(d=0;d<b.length;d++)f=b.charAt(d),c+=f in a?a[f]:f;return c},3" +
+    ");R(\"true\",2,!1,!1,function(){return!0},0);function C(a,b){this.m=" +
+    "a;this.i=void 0!==b?b:null;this.h=null;switch(a){case \"comment\":th" +
+    "is.h=8;break;case \"text\":this.h=3;break;case \"processing-instructi" +
+    "on\":this.h=7;break;case \"node\":break;default:throw Error(\"Unexpect" +
+    "ed argument\");}}function Qa(a){return\"comment\"==a||\"text\"==a||\"pro" +
+    "cessing-instruction\"==a||\"node\"==a}C.prototype.g=function(a){retur" +
+    "n null===this.h||this.h==a.nodeType};C.prototype.getType=function(" +
+    "){return this.h};C.prototype.j=function(){return this.m};\nC.protot" +
+    "ype.toString=function(){var a=\"Kind Test: \"+this.m;null!==this.i&&" +
+    "(a+=H(this.i));return a};function S(a){G.call(this,3);this.i=a.sub" +
+    "string(1,a.length-1)}m(S,G);S.prototype.g=function(){return this.i" +
+    "};S.prototype.toString=function(){return\"Literal: \"+this.i};functi" +
+    "on T(a,b){this.s=a.toLowerCase();this.h=b?b.toLowerCase():\"http://" +
+    "www.w3.org/1999/xhtml\"}T.prototype.g=function(a){var b=a.nodeType;" +
+    "return 1!=b&&2!=b?!1:\"*\"!=this.s&&this.s!=a.nodeName.toLowerCase()" +
+    "?!1:this.h==(a.namespaceURI?a.namespaceURI.toLowerCase():\"http://w" +
+    "ww.w3.org/1999/xhtml\")};T.prototype.j=function(){return this.s};T." +
+    "prototype.toString=function(){return\"Name Test: \"+(\"http://www.w3." +
+    "org/1999/xhtml\"==this.h?\"\":this.h+\":\")+this.s};function U(a){G.cal" +
+    "l(this,1);this.i=a}m(U,G);U.prototype.g=function(){return this.i};" +
+    "U.prototype.toString=function(){return\"Number: \"+this.i};function " +
+    "Ra(a,b){G.call(this,a.o);this.m=a;this.i=b;this.l=a.l;this.h=a.h;1" +
+    "==this.i.length&&(a=this.i[0],a.F||a.i!=Sa||(a=a.v,\"*\"!=a.j()&&(th" +
+    "is.j={name:a.j(),B:null})))}m(Ra,G);function V(){G.call(this,4)}m(" +
+    "V,G);V.prototype.g=function(a){var b=new B;a=a.g;9==a.nodeType?b.a" +
+    "dd(a):b.add(a.ownerDocument);return b};V.prototype.toString=functi" +
+    "on(){return\"Root Helper Expression\"};function Ta(){G.call(this,4)}" +
+    "m(Ta,G);Ta.prototype.g=function(a){var b=new B;b.add(a.g);return b" +
+    "};Ta.prototype.toString=function(){return\"Context Helper Expressio" +
+    "n\"};\nfunction Ua(a){return\"/\"==a||\"//\"==a}Ra.prototype.g=function(" +
+    "a){var b=this.m.g(a);if(!(b instanceof B))throw Error(\"Filter expr" +
+    "ession must evaluate to nodeset.\");a=this.i;for(var c=0,d=a.length" +
+    ";c<d&&b.h;c++){var e=a[c],f=F(b,e.i.A);if(e.l||e.i!=Va)if(e.l||e.i" +
+    "!=Wa){var g=f.next();for(b=e.g(new u(g));null!=(g=f.next());)g=e.g" +
+    "(new u(g)),b=Ca(b,g)}else g=f.next(),b=e.g(new u(g));else{for(g=f." +
+    "next();(b=f.next())&&(!g.contains||g.contains(b))&&b.compareDocume" +
+    "ntPosition(g)&8;g=b);b=e.g(new u(g))}}return b};\nRa.prototype.toSt" +
+    "ring=function(){var a=\"Path Expression:\"+H(this.m);if(this.i.lengt" +
+    "h){var b=q(this.i,function(c,d){return c+H(d)},\"Steps:\");a+=H(b)}r" +
+    "eturn a};function Xa(a,b){this.g=a;this.A=!!b}\nfunction Na(a,b,c){" +
+    "for(c=c||0;c<a.g.length;c++)for(var d=a.g[c],e=F(b),f=b.h,g,h=0;g=" +
+    "e.next();h++){var t=a.A?f-h:h+1;g=d.g(new u(g,t,f));if(\"number\"==t" +
+    "ypeof g)t=t==g;else if(\"string\"==typeof g||\"boolean\"==typeof g)t=!" +
+    "!g;else if(g instanceof B)t=0<g.h;else throw Error(\"Predicate.eval" +
+    "uate returned an unexpected type.\");if(!t){t=e;g=t.j;var y=t.g;if(" +
+    "!y)throw Error(\"Next must be called at least once before remove.\")" +
+    ";var K=y.g;y=y.next;K?K.next=y:g.g=y;y?y.g=K:g.j=K;g.h--;t.g=null}" +
+    "}return b}\nXa.prototype.toString=function(){return q(this.g,functi" +
+    "on(a,b){return a+H(b)},\"Predicates:\")};function W(a,b,c,d){G.call(" +
+    "this,4);this.i=a;this.v=b;this.m=c||new Xa([]);this.F=!!d;b=this.m" +
+    ";b=0<b.g.length?b.g[0].j:null;a.M&&b&&(this.j={name:b.name,B:b.B})" +
+    ";a:{a=this.m;for(b=0;b<a.g.length;b++)if(c=a.g[b],c.l||1==c.o||0==" +
+    "c.o){a=!0;break a}a=!1}this.l=a}m(W,G);\nW.prototype.g=function(a){" +
+    "var b=a.g,c=this.j,d=null,e=null,f=0;c&&(d=c.name,e=c.B?J(c.B,a):n" +
+    "ull,f=1);if(this.F)if(this.l||this.i!=Ya)if(b=F((new W(Za,new C(\"n" +
+    "ode\"))).g(a)),c=b.next())for(a=this.u(c,d,e,f);null!=(c=b.next());" +
+    ")a=Ca(a,this.u(c,d,e,f));else a=new B;else a=A(this.v,b,d,e),a=Na(" +
+    "this.m,a,f);else a=this.u(a.g,d,e,f);return a};W.prototype.u=funct" +
+    "ion(a,b,c,d){a=this.i.C(this.v,a,b,c);return a=Na(this.m,a,d)};\nW." +
+    "prototype.toString=function(){var a=\"Step:\"+H(\"Operator: \"+(this.F" +
+    "?\"//\":\"/\"));this.i.s&&(a+=H(\"Axis: \"+this.i));a+=H(this.v);if(this" +
+    ".m.g.length){var b=q(this.m.g,function(c,d){return c+H(d)},\"Predic" +
+    "ates:\");a+=H(b)}return a};function $a(a,b,c,d){this.s=a;this.C=b;t" +
+    "his.A=c;this.M=d}$a.prototype.toString=function(){return this.s};v" +
+    "ar ab={};function X(a,b,c,d){if(ab.hasOwnProperty(a))throw Error(\"" +
+    "Axis already created: \"+a);b=new $a(a,b,c,!!d);return ab[a]=b}\nX(\"" +
+    "ancestor\",function(a,b){for(var c=new B;b=b.parentNode;)a.g(b)&&Da" +
+    "(c,b);return c},!0);X(\"ancestor-or-self\",function(a,b){var c=new B" +
+    ";do a.g(b)&&Da(c,b);while(b=b.parentNode);return c},!0);\nvar Sa=X(" +
+    "\"attribute\",function(a,b){var c=new B,d=a.j();if(b=b.attributes)if" +
+    "(a instanceof C&&null===a.getType()||\"*\"==d)for(a=0;d=b[a];a++)c.a" +
+    "dd(d);else(d=b.getNamedItem(d))&&c.add(d);return c},!1),Ya=X(\"chil" +
+    "d\",function(a,b,c,d,e){c=\"string\"===typeof c?c:null;d=\"string\"===t" +
+    "ypeof d?d:null;e=e||new B;for(b=b.firstChild;b;b=b.nextSibling)z(b" +
+    ",c,d)&&a.g(b)&&e.add(b);return e},!1,!0);X(\"descendant\",A,!1,!0);\n" +
+    "var Za=X(\"descendant-or-self\",function(a,b,c,d){var e=new B;z(b,c," +
+    "d)&&a.g(b)&&e.add(b);return A(a,b,c,d,e)},!1,!0),Va=X(\"following\"," +
+    "function(a,b,c,d){var e=new B;do for(var f=b;f=f.nextSibling;)z(f," +
+    "c,d)&&a.g(f)&&e.add(f),e=A(a,f,c,d,e);while(b=b.parentNode);return" +
+    " e},!1,!0);X(\"following-sibling\",function(a,b){for(var c=new B;b=b" +
+    ".nextSibling;)a.g(b)&&c.add(b);return c},!1);X(\"namespace\",functio" +
+    "n(){return new B},!1);\nvar bb=X(\"parent\",function(a,b){var c=new B" +
+    ";if(9==b.nodeType)return c;if(2==b.nodeType)return c.add(b.ownerEl" +
+    "ement),c;b=b.parentNode;a.g(b)&&c.add(b);return c},!1),Wa=X(\"prece" +
+    "ding\",function(a,b,c,d){var e=new B,f=[];do f.unshift(b);while(b=b" +
+    ".parentNode);for(var g=1,h=f.length;g<h;g++){var t=[];for(b=f[g];b" +
+    "=b.previousSibling;)t.unshift(b);for(var y=0,K=t.length;y<K;y++)b=" +
+    "t[y],z(b,c,d)&&a.g(b)&&e.add(b),e=A(a,b,c,d,e)}return e},!0,!0);\nX" +
+    "(\"preceding-sibling\",function(a,b){for(var c=new B;b=b.previousSib" +
+    "ling;)a.g(b)&&Da(c,b);return c},!0);var cb=X(\"self\",function(a,b){" +
+    "var c=new B;a.g(b)&&c.add(b);return c},!1);function db(a){G.call(t" +
+    "his,1);this.i=a;this.l=a.l;this.h=a.h}m(db,G);db.prototype.g=funct" +
+    "ion(a){return-I(this.i,a)};db.prototype.toString=function(){return" +
+    "\"Unary Expression: -\"+H(this.i)};function eb(a){G.call(this,4);thi" +
+    "s.i=a;Ia(this,r(this.i,function(b){return b.l}));Ja(this,r(this.i," +
+    "function(b){return b.h}))}m(eb,G);eb.prototype.g=function(a){var b" +
+    "=new B;p(this.i,function(c){c=c.g(a);if(!(c instanceof B))throw Er" +
+    "ror(\"Path expression must evaluate to NodeSet.\");b=Ca(b,c)});retur" +
+    "n b};eb.prototype.toString=function(){return q(this.i,function(a,b" +
+    "){return a+H(b)},\"Union Expression:\")};function fb(a,b){this.g=a;t" +
+    "his.h=b}function gb(a){for(var b,c=[];;){Y(a,\"Missing right hand s" +
+    "ide of binary expression.\");b=hb(a);var d=a.g.next();if(!d)break;v" +
+    "ar e=(d=Ma[d]||null)&&d.H;if(!e){a.g.g--;break}for(;c.length&&e<=c" +
+    "[c.length-1].H;)b=new M(c.pop(),c.pop(),b);c.push(b,d)}for(;c.leng" +
+    "th;)b=new M(c.pop(),c.pop(),b);return b}function Y(a,b){if(w(a.g))" +
+    "throw Error(b);}function ib(a,b){a=a.g.next();if(a!=b)throw Error(" +
+    "\"Bad token, expected: \"+b+\" got: \"+a);}\nfunction jb(a){a=a.g.next(" +
+    ");if(\")\"!=a)throw Error(\"Bad token: \"+a);}function kb(a){a=a.g.nex" +
+    "t();if(2>a.length)throw Error(\"Unclosed literal string\");return ne" +
+    "w S(a)}function lb(a){var b=a.g.next(),c=b.indexOf(\":\");if(-1==c)r" +
+    "eturn new T(b);var d=b.substring(0,c);a=a.h(d);if(!a)throw Error(\"" +
+    "Namespace prefix not declared: \"+d);b=b.substr(c+1);return new T(b" +
+    ",a)}\nfunction mb(a){var b=[];if(Ua(v(a.g))){var c=a.g.next();var d" +
+    "=v(a.g);if(\"/\"==c&&(w(a.g)||\".\"!=d&&\"..\"!=d&&\"@\"!=d&&\"*\"!=d&&!/(?!" +
+    "[0-9])[\\w]/.test(d)))return new V;d=new V;Y(a,\"Missing next locati" +
+    "on step.\");c=nb(a,c);b.push(c)}else{a:{c=v(a.g);d=c.charAt(0);swit" +
+    "ch(d){case \"$\":throw Error(\"Variable reference not allowed in HTML" +
+    " XPath\");case \"(\":a.g.next();c=gb(a);Y(a,'unclosed \"(\"');ib(a,\")\")" +
+    ";break;case '\"':case \"'\":c=kb(a);break;default:if(isNaN(+c))if(!Qa" +
+    "(c)&&/(?![0-9])[\\w]/.test(d)&&\"(\"==v(a.g,1)){c=\na.g.next();c=Pa[c]" +
+    "||null;a.g.next();for(d=[];\")\"!=v(a.g);){Y(a,\"Missing function arg" +
+    "ument list.\");d.push(gb(a));if(\",\"!=v(a.g))break;a.g.next()}Y(a,\"U" +
+    "nclosed function argument list.\");jb(a);c=new Q(c,d)}else{c=null;b" +
+    "reak a}else c=new U(+a.g.next())}\"[\"==v(a.g)&&(d=new Xa(ob(a)),c=n" +
+    "ew P(c,d))}if(c)if(Ua(v(a.g)))d=c;else return c;else c=nb(a,\"/\"),d" +
+    "=new Ta,b.push(c)}for(;Ua(v(a.g));)c=a.g.next(),Y(a,\"Missing next " +
+    "location step.\"),c=nb(a,c),b.push(c);return new Ra(d,b)}\nfunction " +
+    "nb(a,b){if(\"/\"!=b&&\"//\"!=b)throw Error('Step op should be \"/\" or \"" +
+    "//\"');if(\".\"==v(a.g)){var c=new W(cb,new C(\"node\"));a.g.next();ret" +
+    "urn c}if(\"..\"==v(a.g))return c=new W(bb,new C(\"node\")),a.g.next()," +
+    "c;if(\"@\"==v(a.g)){var d=Sa;a.g.next();Y(a,\"Missing attribute name\"" +
+    ")}else if(\"::\"==v(a.g,1)){if(!/(?![0-9])[\\w]/.test(v(a.g).charAt(0" +
+    ")))throw Error(\"Bad token: \"+a.g.next());var e=a.g.next();d=ab[e]|" +
+    "|null;if(!d)throw Error(\"No axis with name: \"+e);a.g.next();Y(a,\"M" +
+    "issing node name\")}else d=Ya;e=\nv(a.g);if(/(?![0-9])[\\w]/.test(e.c" +
+    "harAt(0)))if(\"(\"==v(a.g,1)){if(!Qa(e))throw Error(\"Invalid node ty" +
+    "pe: \"+e);e=a.g.next();if(!Qa(e))throw Error(\"Invalid type name: \"+" +
+    "e);ib(a,\"(\");Y(a,\"Bad nodetype\");var f=v(a.g).charAt(0),g=null;if(" +
+    "'\"'==f||\"'\"==f)g=kb(a);Y(a,\"Bad nodetype\");jb(a);e=new C(e,g)}else" +
+    " e=lb(a);else if(\"*\"==e)e=lb(a);else throw Error(\"Bad token: \"+a.g" +
+    ".next());a=new Xa(ob(a),d.A);return c||new W(d,e,a,\"//\"==b)}\nfunct" +
+    "ion ob(a){for(var b=[];\"[\"==v(a.g);){a.g.next();Y(a,\"Missing predi" +
+    "cate expression.\");var c=gb(a);b.push(c);Y(a,\"Unclosed predicate e" +
+    "xpression.\");ib(a,\"]\")}return b}function hb(a){if(\"-\"==v(a.g))retu" +
+    "rn a.g.next(),new db(hb(a));var b=mb(a);if(\"|\"!=v(a.g))a=b;else{fo" +
+    "r(b=[b];\"|\"==a.g.next();)Y(a,\"Missing next union location path.\")," +
+    "b.push(mb(a));a.g.g--;a=new eb(b)}return a};function pb(a,b){if(!a" +
+    ".length)throw Error(\"Empty XPath expression.\");a=wa(a);if(w(a))thr" +
+    "ow Error(\"Invalid XPath expression.\");b?\"function\"!==typeof b&&(b=" +
+    "l(b.lookupNamespaceURI,b)):b=function(){return null};var c=gb(new " +
+    "fb(a,b));if(!w(a))throw Error(\"Bad token: \"+a.next());this.evaluat" +
+    "e=function(d,e){d=c.g(new u(d));return new Z(d,e)}}\nfunction Z(a,b" +
+    "){if(0==b)if(a instanceof B)b=4;else if(\"string\"==typeof a)b=2;els" +
+    "e if(\"number\"==typeof a)b=1;else if(\"boolean\"==typeof a)b=3;else t" +
+    "hrow Error(\"Unexpected evaluation result.\");if(2!=b&&1!=b&&3!=b&&!" +
+    "(a instanceof B))throw Error(\"value could not be converted to the " +
+    "specified type\");this.resultType=b;switch(b){case 2:this.stringVal" +
+    "ue=a instanceof B?E(a):\"\"+a;break;case 1:this.numberValue=a instan" +
+    "ceof B?+E(a):+a;break;case 3:this.booleanValue=a instanceof B?0<a." +
+    "h:!!a;break;case 4:case 5:case 6:case 7:var c=\nF(a);var d=[];for(v" +
+    "ar e=c.next();e;e=c.next())d.push(e);this.snapshotLength=a.h;this." +
+    "invalidIteratorState=!1;break;case 8:case 9:this.singleNodeValue=D" +
+    "(a);break;default:throw Error(\"Unknown XPathResult type.\");}var f=" +
+    "0;this.iterateNext=function(){if(4!=b&&5!=b)throw Error(\"iterateNe" +
+    "xt called with wrong result type\");return f>=d.length?null:d[f++]}" +
+    ";this.snapshotItem=function(g){if(6!=b&&7!=b)throw Error(\"snapshot" +
+    "Item called with wrong result type\");return g>=d.length||0>g?null:" +
+    "d[g]}}Z.ANY_TYPE=0;\nZ.NUMBER_TYPE=1;Z.STRING_TYPE=2;Z.BOOLEAN_TYPE" +
+    "=3;Z.UNORDERED_NODE_ITERATOR_TYPE=4;Z.ORDERED_NODE_ITERATOR_TYPE=5" +
+    ";Z.UNORDERED_NODE_SNAPSHOT_TYPE=6;Z.ORDERED_NODE_SNAPSHOT_TYPE=7;Z"
+  )
+      .append(
+    ".ANY_UNORDERED_NODE_TYPE=8;Z.FIRST_ORDERED_NODE_TYPE=9;function qb" +
+    "(a){this.lookupNamespaceURI=Fa(a)}\naa(\"wgxpath.install\",function(a" +
+    ",b){a=a||k;var c=a.document;if(!c.evaluate||b)a.XPathResult=Z,c.ev" +
+    "aluate=function(d,e,f,g){return(new pb(d,f)).evaluate(e,g)},c.crea" +
+    "teExpression=function(d,e){return new pb(d,e)},c.createNSResolver=" +
+    "function(d){return new qb(d)}});aa(\"_\",function(a,b){return(b||qa)" +
+    ".frames[a]||null});;return this._.apply(null,arguments);}).apply({" +
+    "navigator:typeof window!=\"undefined\"?window.navigator:null},argume" +
+    "nts);}\n"
+  )
+  .toString();
+  static final String FRAME_BY_INDEX_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String FRAME_BY_INDEX_ANDROID_original() {
+    return FRAME_BY_INDEX_ANDROID.replaceAll("xxx_rpl_lic", FRAME_BY_INDEX_ANDROID_license);
+  }
+
+/* field: GET_VISIBLE_TEXT_ANDROID license: 
+
+ Copyright The Closure Library Authors.
+ SPDX-License-Identifier: Apache-2.0
+
+
+ Copyright 2014 Software Freedom Conservancy
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+  static final String GET_VISIBLE_TEXT_ANDROID =
+  new StringBuilder(
+    "function(){return(function(){/*\n\n Copyright The Closure Library Au" +
+    "thors.\n SPDX-License-Identifier: Apache-2.0\n*/\nvar k=this||self;fu" +
+    "nction aa(a,b){a=a.split(\".\");var c=k;a[0]in c||\"undefined\"==typeo" +
+    "f c.execScript||c.execScript(\"var \"+a[0]);for(var d;a.length&&(d=a" +
+    ".shift());)a.length||void 0===b?c[d]&&c[d]!==Object.prototype[d]?c" +
+    "=c[d]:c=c[d]={}:c[d]=b}function ba(a,b,c){return a.call.apply(a.bi" +
+    "nd,arguments)}\nfunction ca(a,b,c){if(!a)throw Error();if(2<argumen" +
+    "ts.length){var d=Array.prototype.slice.call(arguments,2);return fu" +
+    "nction(){var e=Array.prototype.slice.call(arguments);Array.prototy" +
+    "pe.unshift.apply(e,d);return a.apply(b,e)}}return function(){retur" +
+    "n a.apply(b,arguments)}}function da(a,b,c){Function.prototype.bind" +
+    "&&-1!=Function.prototype.bind.toString().indexOf(\"native code\")?da" +
+    "=ba:da=ca;return da.apply(null,arguments)}\nfunction ea(a,b){var c=" +
+    "Array.prototype.slice.call(arguments,1);return function(){var d=c." +
+    "slice();d.push.apply(d,arguments);return a.apply(this,d)}}function" +
+    " n(a,b){function c(){}c.prototype=b.prototype;a.O=b.prototype;a.pr" +
+    "ototype=new c;a.prototype.constructor=a;a.N=function(d,e,f){for(va" +
+    "r g=Array(arguments.length-2),h=2;h<arguments.length;h++)g[h-2]=ar" +
+    "guments[h];return b.prototype[e].apply(d,g)}};function r(a,b){if(E" +
+    "rror.captureStackTrace)Error.captureStackTrace(this,r);else{var c=" +
+    "Error().stack;c&&(this.stack=c)}a&&(this.message=String(a));void 0" +
+    "!==b&&(this.cause=b)}n(r,Error);r.prototype.name=\"CustomError\";fun" +
+    "ction fa(a,b){a=a.split(\"%s\");for(var c=\"\",d=a.length-1,e=0;e<d;e+" +
+    "+)c+=a[e]+(e<b.length?b[e]:\"%s\");r.call(this,c+a[d])}n(fa,r);fa.pr" +
+    "ototype.name=\"AssertionError\";function ha(a,b,c){if(!a){var d=\"Ass" +
+    "ertion failed\";if(b){d+=\": \"+b;var e=Array.prototype.slice.call(ar" +
+    "guments,2)}throw new fa(\"\"+d,e||[]);}};function ia(a,b){if(\"string" +
+    "\"===typeof a)return\"string\"!==typeof b||1!=b.length?-1:a.indexOf(b" +
+    ",0);for(var c=0;c<a.length;c++)if(c in a&&a[c]===b)return c;return" +
+    "-1}function u(a,b){for(var c=a.length,d=\"string\"===typeof a?a.spli" +
+    "t(\"\"):a,e=0;e<c;e++)e in d&&b.call(void 0,d[e],e,a)}function v(a,b" +
+    ",c){var d=c;u(a,function(e,f){d=b.call(void 0,d,e,f,a)});return d}" +
+    "function w(a,b){for(var c=a.length,d=\"string\"===typeof a?a.split(\"" +
+    "\"):a,e=0;e<c;e++)if(e in d&&b.call(void 0,d[e],e,a))return!0;retur" +
+    "n!1}\nfunction ja(a,b){for(var c=a.length,d=\"string\"===typeof a?a.s" +
+    "plit(\"\"):a,e=0;e<c;e++)if(e in d&&!b.call(void 0,d[e],e,a))return!" +
+    "1;return!0}function ka(a){return Array.prototype.concat.apply([],a" +
+    "rguments)}function la(a,b,c){ha(null!=a.length);return 2>=argument" +
+    "s.length?Array.prototype.slice.call(a,b):Array.prototype.slice.cal" +
+    "l(a,b,c)};/*\n\n Copyright 2014 Software Freedom Conservancy\n\n Licen" +
+    "sed under the Apache License, Version 2.0 (the \"License\");\n you ma" +
+    "y not use this file except in compliance with the License.\n You ma" +
+    "y obtain a copy of the License at\n\n      http://www.apache.org/lic" +
+    "enses/LICENSE-2.0\n\n Unless required by applicable law or agreed to" +
+    " in writing, software\n distributed under the License is distribute" +
+    "d on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KI" +
+    "ND, either express or implied.\n See the License for the specific l" +
+    "anguage governing permissions and\n limitations under the License.\n" +
+    "*/\nfunction ma(a){var b=a.length-1;return 0<=b&&a.indexOf(\" \",b)==" +
+    "b}var na=String.prototype.trim?function(a){return a.trim()}:functi" +
+    "on(a){return/^[\\s\\xa0]*([\\s\\S]*?)[\\s\\xa0]*$/.exec(a)[1]};function " +
+    "oa(a,b){return a<b?-1:a>b?1:0};function pa(){var a=k.navigator;ret" +
+    "urn a&&(a=a.userAgent)?a:\"\"};function x(a,b){this.x=void 0!==a?a:0" +
+    ";this.y=void 0!==b?b:0}x.prototype.toString=function(){return\"(\"+t" +
+    "his.x+\", \"+this.y+\")\"};x.prototype.ceil=function(){this.x=Math.cei" +
+    "l(this.x);this.y=Math.ceil(this.y);return this};x.prototype.floor=" +
+    "function(){this.x=Math.floor(this.x);this.y=Math.floor(this.y);ret" +
+    "urn this};x.prototype.round=function(){this.x=Math.round(this.x);t" +
+    "his.y=Math.round(this.y);return this};function z(a,b){this.width=a" +
+    ";this.height=b}z.prototype.toString=function(){return\"(\"+this.widt" +
+    "h+\" x \"+this.height+\")\"};z.prototype.aspectRatio=function(){return" +
+    " this.width/this.height};z.prototype.ceil=function(){this.width=Ma" +
+    "th.ceil(this.width);this.height=Math.ceil(this.height);return this" +
+    "};z.prototype.floor=function(){this.width=Math.floor(this.width);t" +
+    "his.height=Math.floor(this.height);return this};\nz.prototype.round" +
+    "=function(){this.width=Math.round(this.width);this.height=Math.rou" +
+    "nd(this.height);return this};function qa(a){return String(a).repla" +
+    "ce(/\\-([a-z])/g,function(b,c){return c.toUpperCase()})};function r" +
+    "a(a){for(;a&&1!=a.nodeType;)a=a.previousSibling;return a}function " +
+    "sa(a,b){if(!a||!b)return!1;if(a.contains&&1==b.nodeType)return a==" +
+    "b||a.contains(b);if(\"undefined\"!=typeof a.compareDocumentPosition)" +
+    "return a==b||!!(a.compareDocumentPosition(b)&16);for(;b&&a!=b;)b=b" +
+    ".parentNode;return b==a}\nfunction ta(a,b){if(a==b)return 0;if(a.co" +
+    "mpareDocumentPosition)return a.compareDocumentPosition(b)&2?1:-1;i" +
+    "f(\"sourceIndex\"in a||a.parentNode&&\"sourceIndex\"in a.parentNode){v" +
+    "ar c=1==a.nodeType,d=1==b.nodeType;if(c&&d)return a.sourceIndex-b." +
+    "sourceIndex;var e=a.parentNode,f=b.parentNode;return e==f?ua(a,b):" +
+    "!c&&sa(e,b)?-1*va(a,b):!d&&sa(f,a)?va(b,a):(c?a.sourceIndex:e.sour" +
+    "ceIndex)-(d?b.sourceIndex:f.sourceIndex)}d=A(a);c=d.createRange();" +
+    "c.selectNode(a);c.collapse(!0);a=d.createRange();a.selectNode(b);\n" +
+    "a.collapse(!0);return c.compareBoundaryPoints(k.Range.START_TO_END" +
+    ",a)}function va(a,b){var c=a.parentNode;if(c==b)return-1;for(;b.pa" +
+    "rentNode!=c;)b=b.parentNode;return ua(b,a)}function ua(a,b){for(;b" +
+    "=b.previousSibling;)if(b==a)return-1;return 1}function A(a){ha(a,\"" +
+    "Node cannot be null or undefined.\");return 9==a.nodeType?a:a.owner" +
+    "Document||a.document}function wa(a,b){a&&(a=a.parentNode);for(var " +
+    "c=0;a;){ha(\"parentNode\"!=a.name);if(b(a))return a;a=a.parentNode;c" +
+    "++}return null}\nfunction xa(a){this.g=a||k.document||document}xa.p" +
+    "rototype.getElementsByTagName=function(a,b){return(b||this.g).getE" +
+    "lementsByTagName(String(a))};function B(a,b,c,d){this.top=a;this.g" +
+    "=b;this.h=c;this.left=d}B.prototype.toString=function(){return\"(\"+" +
+    "this.top+\"t, \"+this.g+\"r, \"+this.h+\"b, \"+this.left+\"l)\"};B.prototy" +
+    "pe.ceil=function(){this.top=Math.ceil(this.top);this.g=Math.ceil(t" +
+    "his.g);this.h=Math.ceil(this.h);this.left=Math.ceil(this.left);ret" +
+    "urn this};B.prototype.floor=function(){this.top=Math.floor(this.to" +
+    "p);this.g=Math.floor(this.g);this.h=Math.floor(this.h);this.left=M" +
+    "ath.floor(this.left);return this};\nB.prototype.round=function(){th" +
+    "is.top=Math.round(this.top);this.g=Math.round(this.g);this.h=Math." +
+    "round(this.h);this.left=Math.round(this.left);return this};functio" +
+    "n C(a,b,c,d){this.left=a;this.top=b;this.width=c;this.height=d}C.p" +
+    "rototype.toString=function(){return\"(\"+this.left+\", \"+this.top+\" -" +
+    " \"+this.width+\"w x \"+this.height+\"h)\"};C.prototype.ceil=function()" +
+    "{this.left=Math.ceil(this.left);this.top=Math.ceil(this.top);this." +
+    "width=Math.ceil(this.width);this.height=Math.ceil(this.height);ret" +
+    "urn this};\nC.prototype.floor=function(){this.left=Math.floor(this." +
+    "left);this.top=Math.floor(this.top);this.width=Math.floor(this.wid" +
+    "th);this.height=Math.floor(this.height);return this};C.prototype.r" +
+    "ound=function(){this.left=Math.round(this.left);this.top=Math.roun" +
+    "d(this.top);this.width=Math.round(this.width);this.height=Math.rou" +
+    "nd(this.height);return this};function ya(a,b){this.code=a;this.g=z" +
+    "a[a]||\"unknown error\";this.message=b||\"\";a=this.g.replace(/((?:^|\\" +
+    "s+)[a-z])/g,function(c){return c.toUpperCase().replace(/^[\\s\\xa0]+" +
+    "/g,\"\")});b=a.length-5;if(0>b||a.indexOf(\"Error\",b)!=b)a+=\"Error\";t" +
+    "his.name=a;a=Error(this.message);a.name=this.name;this.stack=a.sta" +
+    "ck||\"\"}n(ya,Error);\nvar za={15:\"element not selectable\",11:\"elemen" +
+    "t not visible\",31:\"unknown error\",30:\"unknown error\",24:\"invalid c" +
+    "ookie domain\",29:\"invalid element coordinates\",12:\"invalid element" +
+    " state\",32:\"invalid selector\",51:\"invalid selector\",52:\"invalid se" +
+    "lector\",17:\"javascript error\",405:\"unsupported operation\",34:\"move" +
+    " target out of bounds\",27:\"no such alert\",7:\"no such element\",8:\"n" +
+    "o such frame\",23:\"no such window\",28:\"script timeout\",33:\"session " +
+    "not created\",10:\"stale element reference\",21:\"timeout\",25:\"unable " +
+    "to set cookie\",\n26:\"unexpected alert open\",13:\"unknown error\",9:\"u" +
+    "nknown command\"};ya.prototype.toString=function(){return this.name" +
+    "+\": \"+this.message};/*\n\n The MIT License\n\n Copyright (c) 2007 Cybo" +
+    "zu Labs, Inc.\n Copyright (c) 2012 Google Inc.\n\n Permission is here" +
+    "by granted, free of charge, to any person obtaining a copy\n of thi" +
+    "s software and associated documentation files (the \"Software\"), to" +
+    "\n deal in the Software without restriction, including without limi" +
+    "tation the\n rights to use, copy, modify, merge, publish, distribut" +
+    "e, sublicense, and/or\n sell copies of the Software, and to permit " +
+    "persons to whom the Software is\n furnished to do so, subject to th" +
+    "e following conditions:\n\n The above copyright notice and this perm" +
+    "ission notice shall be included in\n all copies or substantial port" +
+    "ions of the Software.\n\n THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT " +
+    "WARRANTY OF ANY KIND, EXPRESS OR\n IMPLIED, INCLUDING BUT NOT LIMIT" +
+    "ED TO THE WARRANTIES OF MERCHANTABILITY,\n FITNESS FOR A PARTICULAR" +
+    " PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\n AUTHORS OR CO" +
+    "PYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\n LIABILI" +
+    "TY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING\n " +
+    "FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHE" +
+    "R DEALINGS\n IN THE SOFTWARE.\n*/\nfunction D(a,b,c){this.g=a;this.j=" +
+    "b||1;this.h=c||1};function Aa(a){this.h=a;this.g=0}function Ba(a){" +
+    "a=a.match(Ca);for(var b=0;b<a.length;b++)Da.test(a[b])&&a.splice(b" +
+    ",1);return new Aa(a)}var Ca=RegExp(\"\\\\$?(?:(?![0-9-])[\\\\w-]+:)?(?!" +
+    "[0-9-])[\\\\w-]+|\\\\/\\\\/|\\\\.\\\\.|::|\\\\d+(?:\\\\.\\\\d*)?|\\\\.\\\\d+|\\\"[^\\\"]*\\" +
+    "\"|'[^']*'|[!<>]=|\\\\s+|.\",\"g\"),Da=/^\\s/;function E(a,b){return a.h[" +
+    "a.g+(b||0)]}Aa.prototype.next=function(){return this.h[this.g++]};" +
+    "function Ea(a){return a.h.length<=a.g};function F(a){var b=null,c=" +
+    "a.nodeType;1==c&&(b=a.textContent,b=void 0==b||null==b?a.innerText" +
+    ":b,b=void 0==b||null==b?\"\":b);if(\"string\"!=typeof b)if(9==c||1==c)" +
+    "{a=9==c?a.documentElement:a.firstChild;c=0;var d=[];for(b=\"\";a;){d" +
+    "o 1!=a.nodeType&&(b+=a.nodeValue),d[c++]=a;while(a=a.firstChild);f" +
+    "or(;c&&!(a=d[--c].nextSibling););}}else b=a.nodeValue;return\"\"+b}\n" +
+    "function G(a,b,c){if(null===b)return!0;try{if(!a.getAttribute)retu" +
+    "rn!1}catch(d){return!1}return null==c?!!a.getAttribute(b):a.getAtt" +
+    "ribute(b,2)==c}function Fa(a,b,c,d,e){return Ga.call(null,a,b,\"str" +
+    "ing\"===typeof c?c:null,\"string\"===typeof d?d:null,e||new I)}\nfunct" +
+    "ion Ga(a,b,c,d,e){b.getElementsByName&&d&&\"name\"==c?(b=b.getElemen" +
+    "tsByName(d),u(b,function(f){a.g(f)&&e.add(f)})):b.getElementsByCla" +
+    "ssName&&d&&\"class\"==c?(b=b.getElementsByClassName(d),u(b,function(" +
+    "f){f.className==d&&a.g(f)&&e.add(f)})):a instanceof K?Ha(a,b,c,d,e" +
+    "):b.getElementsByTagName&&(b=b.getElementsByTagName(a.j()),u(b,fun" +
+    "ction(f){G(f,c,d)&&e.add(f)}));return e}function Ha(a,b,c,d,e){for" +
+    "(b=b.firstChild;b;b=b.nextSibling)G(b,c,d)&&a.g(b)&&e.add(b),Ha(a," +
+    "b,c,d,e)};function I(){this.j=this.g=null;this.h=0}function Ia(a){" +
+    "this.h=a;this.next=this.g=null}function Ja(a,b){if(!a.g)return b;i" +
+    "f(!b.g)return a;var c=a.g;b=b.g;for(var d=null,e,f=0;c&&b;)c.h==b." +
+    "h?(e=c,c=c.next,b=b.next):0<ta(c.h,b.h)?(e=b,b=b.next):(e=c,c=c.ne" +
+    "xt),(e.g=d)?d.next=e:a.g=e,d=e,f++;for(e=c||b;e;)e.g=d,d=d.next=e," +
+    "f++,e=e.next;a.j=d;a.h=f;return a}function Ka(a,b){b=new Ia(b);b.n" +
+    "ext=a.g;a.j?a.g.g=b:a.g=a.j=b;a.g=b;a.h++}\nI.prototype.add=functio" +
+    "n(a){a=new Ia(a);a.g=this.j;this.g?this.j.next=a:this.g=this.j=a;t" +
+    "his.j=a;this.h++};function La(a){return(a=a.g)?a.h:null}function M" +
+    "a(a){return(a=La(a))?F(a):\"\"}function L(a,b){return new Oa(a,!!b)}" +
+    "function Oa(a,b){this.j=a;this.h=(this.A=b)?a.j:a.g;this.g=null}Oa" +
+    ".prototype.next=function(){var a=this.h;if(null==a)return null;var" +
+    " b=this.g=a;this.h=this.A?a.g:a.next;return b.h};function Pa(a){sw" +
+    "itch(a.nodeType){case 1:return ea(Qa,a);case 9:return Pa(a.documen" +
+    "tElement);case 11:case 10:case 6:case 12:return Ra;default:return " +
+    "a.parentNode?Pa(a.parentNode):Ra}}function Ra(){return null}functi" +
+    "on Qa(a,b){if(a.prefix==b)return a.namespaceURI||\"http://www.w3.or" +
+    "g/1999/xhtml\";var c=a.getAttributeNode(\"xmlns:\"+b);return c&&c.spe" +
+    "cified?c.value||null:a.parentNode&&9!=a.parentNode.nodeType?Qa(a.p" +
+    "arentNode,b):null};function M(a){this.o=a;this.h=this.l=!1;this.j=" +
+    "null}function N(a){return\"\\n  \"+a.toString().split(\"\\n\").join(\"\\n " +
+    " \")}function Sa(a,b){a.l=b}function Ta(a,b){a.h=b}function O(a,b){" +
+    "a=a.g(b);return a instanceof I?+Ma(a):+a}function P(a,b){a=a.g(b);" +
+    "return a instanceof I?Ma(a):\"\"+a}function Q(a,b){a=a.g(b);return a" +
+    " instanceof I?!!a.h:!!a};function Ua(a,b,c){M.call(this,a.o);this." +
+    "i=a;this.m=b;this.v=c;this.l=b.l||c.l;this.h=b.h||c.h;this.i==Va&&" +
+    "(c.h||c.l||4==c.o||0==c.o||!b.j?b.h||b.l||4==b.o||0==b.o||!c.j||(t" +
+    "his.j={name:c.j.name,B:b}):this.j={name:b.j.name,B:c})}n(Ua,M);\nfu" +
+    "nction R(a,b,c,d,e){b=b.g(d);c=c.g(d);var f;if(b instanceof I&&c i" +
+    "nstanceof I){b=L(b);for(d=b.next();d;d=b.next())for(e=L(c),f=e.nex" +
+    "t();f;f=e.next())if(a(F(d),F(f)))return!0;return!1}if(b instanceof" +
+    " I||c instanceof I){b instanceof I?(e=b,d=c):(e=c,d=b);f=L(e);for(" +
+    "var g=typeof d,h=f.next();h;h=f.next()){switch(g){case \"number\":h=" +
+    "+F(h);break;case \"boolean\":h=!!F(h);break;case \"string\":h=F(h);bre" +
+    "ak;default:throw Error(\"Illegal primitive type for comparison.\");}" +
+    "if(e==b&&a(h,d)||e==c&&a(d,h))return!0}return!1}return e?\n\"boolean" +
+    "\"==typeof b||\"boolean\"==typeof c?a(!!b,!!c):\"number\"==typeof b||\"n" +
+    "umber\"==typeof c?a(+b,+c):a(b,c):a(+b,+c)}Ua.prototype.g=function(" +
+    "a){return this.i.u(this.m,this.v,a)};Ua.prototype.toString=functio" +
+    "n(){var a=\"Binary Expression: \"+this.i;a+=N(this.m);return a+=N(th" +
+    "is.v)};function Wa(a,b,c,d){this.L=a;this.H=b;this.o=c;this.u=d}Wa" +
+    ".prototype.toString=function(){return this.L};var Xa={};\nfunction " +
+    "S(a,b,c,d){if(Xa.hasOwnProperty(a))throw Error(\"Binary operator al" +
+    "ready created: \"+a);a=new Wa(a,b,c,d);return Xa[a.toString()]=a}S(" +
+    "\"div\",6,1,function(a,b,c){return O(a,c)/O(b,c)});S(\"mod\",6,1,funct" +
+    "ion(a,b,c){return O(a,c)%O(b,c)});S(\"*\",6,1,function(a,b,c){return" +
+    " O(a,c)*O(b,c)});S(\"+\",5,1,function(a,b,c){return O(a,c)+O(b,c)});" +
+    "S(\"-\",5,1,function(a,b,c){return O(a,c)-O(b,c)});S(\"<\",4,2,functio" +
+    "n(a,b,c){return R(function(d,e){return d<e},a,b,c)});\nS(\">\",4,2,fu" +
+    "nction(a,b,c){return R(function(d,e){return d>e},a,b,c)});S(\"<=\",4" +
+    ",2,function(a,b,c){return R(function(d,e){return d<=e},a,b,c)});S(" +
+    "\">=\",4,2,function(a,b,c){return R(function(d,e){return d>=e},a,b,c" +
+    ")});var Va=S(\"=\",3,2,function(a,b,c){return R(function(d,e){return" +
+    " d==e},a,b,c,!0)});S(\"!=\",3,2,function(a,b,c){return R(function(d," +
+    "e){return d!=e},a,b,c,!0)});S(\"and\",2,2,function(a,b,c){return Q(a" +
+    ",c)&&Q(b,c)});S(\"or\",1,2,function(a,b,c){return Q(a,c)||Q(b,c)});f" +
+    "unction Ya(a,b){if(b.g.length&&4!=a.o)throw Error(\"Primary express" +
+    "ion must evaluate to nodeset if filter has predicate(s).\");M.call(" +
+    "this,a.o);this.m=a;this.i=b;this.l=a.l;this.h=a.h}n(Ya,M);Ya.proto" +
+    "type.g=function(a){a=this.m.g(a);return Za(this.i,a)};Ya.prototype" +
+    ".toString=function(){var a=\"Filter:\"+N(this.m);return a+=N(this.i)" +
+    "};function $a(a,b){if(b.length<a.G)throw Error(\"Function \"+a.s+\" e" +
+    "xpects at least\"+a.G+\" arguments, \"+b.length+\" given\");if(null!==a" +
+    ".D&&b.length>a.D)throw Error(\"Function \"+a.s+\" expects at most \"+a" +
+    ".D+\" arguments, \"+b.length+\" given\");a.K&&u(b,function(c,d){if(4!=" +
+    "c.o)throw Error(\"Argument \"+d+\" to function \"+a.s+\" is not of type" +
+    " Nodeset: \"+c);});M.call(this,a.o);this.C=a;this.i=b;Sa(this,a.l||" +
+    "w(b,function(c){return c.l}));Ta(this,a.J&&!b.length||a.I&&!!b.len" +
+    "gth||w(b,function(c){return c.h}))}n($a,M);\n$a.prototype.g=functio" +
+    "n(a){return this.C.u.apply(null,ka(a,this.i))};$a.prototype.toStri" +
+    "ng=function(){var a=\"Function: \"+this.C;if(this.i.length){var b=v(" +
+    "this.i,function(c,d){return c+N(d)},\"Arguments:\");a+=N(b)}return a" +
+    "};function ab(a,b,c,d,e,f,g,h){this.s=a;this.o=b;this.l=c;this.J=d" +
+    ";this.I=!1;this.u=e;this.G=f;this.D=void 0!==g?g:f;this.K=!!h}ab.p" +
+    "rototype.toString=function(){return this.s};var bb={};\nfunction T(" +
+    "a,b,c,d,e,f,g,h){if(bb.hasOwnProperty(a))throw Error(\"Function alr" +
+    "eady created: \"+a+\".\");bb[a]=new ab(a,b,c,d,e,f,g,h)}T(\"boolean\",2" +
+    ",!1,!1,function(a,b){return Q(b,a)},1);T(\"ceiling\",1,!1,!1,functio" +
+    "n(a,b){return Math.ceil(O(b,a))},1);T(\"concat\",3,!1,!1,function(a," +
+    "b){var c=la(arguments,1);return v(c,function(d,e){return d+P(e,a)}" +
+    ",\"\")},2,null);T(\"contains\",2,!1,!1,function(a,b,c){b=P(b,a);a=P(c," +
+    "a);return-1!=b.indexOf(a)},2);T(\"count\",1,!1,!1,function(a,b){retu" +
+    "rn b.g(a).h},1,1,!0);\nT(\"false\",2,!1,!1,function(){return!1},0);T(" +
+    "\"floor\",1,!1,!1,function(a,b){return Math.floor(O(b,a))},1);T(\"id\"" +
+    ",4,!1,!1,function(a,b){var c=a.g,d=9==c.nodeType?c:c.ownerDocument" +
+    ";a=P(b,a).split(/\\s+/);var e=[];u(a,function(g){g=d.getElementById" +
+    "(g);!g||0<=ia(e,g)||e.push(g)});e.sort(ta);var f=new I;u(e,functio" +
+    "n(g){f.add(g)});return f},1);T(\"lang\",2,!1,!1,function(){return!1}" +
+    ",1);T(\"last\",1,!0,!1,function(a){if(1!=arguments.length)throw Erro" +
+    "r(\"Function last expects ()\");return a.h},0);\nT(\"local-name\",3,!1," +
+    "!0,function(a,b){return(a=b?La(b.g(a)):a.g)?a.localName||a.nodeNam" +
+    "e.toLowerCase():\"\"},0,1,!0);T(\"name\",3,!1,!0,function(a,b){return(" +
+    "a=b?La(b.g(a)):a.g)?a.nodeName.toLowerCase():\"\"},0,1,!0);T(\"namesp" +
+    "ace-uri\",3,!0,!1,function(){return\"\"},0,1,!0);T(\"normalize-space\"," +
+    "3,!1,!0,function(a,b){return(b?P(b,a):F(a.g)).replace(/[\\s\\xa0]+/g" +
+    ",\" \").replace(/^\\s+|\\s+$/g,\"\")},0,1);T(\"not\",2,!1,!1,function(a,b)" +
+    "{return!Q(b,a)},1);T(\"number\",1,!1,!0,function(a,b){return b?O(b,a" +
+    "):+F(a.g)},0,1);\nT(\"position\",1,!0,!1,function(a){return a.j},0);T" +
+    "(\"round\",1,!1,!1,function(a,b){return Math.round(O(b,a))},1);T(\"st" +
+    "arts-with\",2,!1,!1,function(a,b,c){b=P(b,a);a=P(c,a);return 0==b.l" +
+    "astIndexOf(a,0)},2);T(\"string\",3,!1,!0,function(a,b){return b?P(b," +
+    "a):F(a.g)},0,1);T(\"string-length\",1,!1,!0,function(a,b){return(b?P" +
+    "(b,a):F(a.g)).length},0,1);\nT(\"substring\",3,!1,!1,function(a,b,c,d" +
+    "){c=O(c,a);if(isNaN(c)||Infinity==c||-Infinity==c)return\"\";d=d?O(d" +
+    ",a):Infinity;if(isNaN(d)||-Infinity===d)return\"\";c=Math.round(c)-1" +
+    ";var e=Math.max(c,0);a=P(b,a);return Infinity==d?a.substring(e):a." +
+    "substring(e,c+Math.round(d))},2,3);T(\"substring-after\",3,!1,!1,fun" +
+    "ction(a,b,c){b=P(b,a);a=P(c,a);c=b.indexOf(a);return-1==c?\"\":b.sub" +
+    "string(c+a.length)},2);\nT(\"substring-before\",3,!1,!1,function(a,b," +
+    "c){b=P(b,a);a=P(c,a);a=b.indexOf(a);return-1==a?\"\":b.substring(0,a" +
+    ")},2);T(\"sum\",1,!1,!1,function(a,b){a=L(b.g(a));b=0;for(var c=a.ne" +
+    "xt();c;c=a.next())b+=+F(c);return b},1,1,!0);T(\"translate\",3,!1,!1" +
+    ",function(a,b,c,d){b=P(b,a);c=P(c,a);var e=P(d,a);a={};for(d=0;d<c" +
+    ".length;d++){var f=c.charAt(d);f in a||(a[f]=e.charAt(d))}c=\"\";for" +
+    "(d=0;d<b.length;d++)f=b.charAt(d),c+=f in a?a[f]:f;return c},3);T(" +
+    "\"true\",2,!1,!1,function(){return!0},0);function K(a,b){this.m=a;th" +
+    "is.i=void 0!==b?b:null;this.h=null;switch(a){case \"comment\":this.h" +
+    "=8;break;case \"text\":this.h=3;break;case \"processing-instruction\":" +
+    "this.h=7;break;case \"node\":break;default:throw Error(\"Unexpected a" +
+    "rgument\");}}function cb(a){return\"comment\"==a||\"text\"==a||\"process" +
+    "ing-instruction\"==a||\"node\"==a}K.prototype.g=function(a){return nu" +
+    "ll===this.h||this.h==a.nodeType};K.prototype.getType=function(){re" +
+    "turn this.h};K.prototype.j=function(){return this.m};\nK.prototype." +
+    "toString=function(){var a=\"Kind Test: \"+this.m;null!==this.i&&(a+=" +
+    "N(this.i));return a};function db(a){M.call(this,3);this.i=a.substr" +
+    "ing(1,a.length-1)}n(db,M);db.prototype.g=function(){return this.i}" +
+    ";db.prototype.toString=function(){return\"Literal: \"+this.i};functi" +
+    "on eb(a,b){this.s=a.toLowerCase();this.h=b?b.toLowerCase():\"http:/" +
+    "/www.w3.org/1999/xhtml\"}eb.prototype.g=function(a){var b=a.nodeTyp" +
+    "e;return 1!=b&&2!=b?!1:\"*\"!=this.s&&this.s!=a.nodeName.toLowerCase" +
+    "()?!1:this.h==(a.namespaceURI?a.namespaceURI.toLowerCase():\"http:/" +
+    "/www.w3.org/1999/xhtml\")};eb.prototype.j=function(){return this.s}" +
+    ";eb.prototype.toString=function(){return\"Name Test: \"+(\"http://www" +
+    ".w3.org/1999/xhtml\"==this.h?\"\":this.h+\":\")+this.s};function fb(a){" +
+    "M.call(this,1);this.i=a}n(fb,M);fb.prototype.g=function(){return t" +
+    "his.i};fb.prototype.toString=function(){return\"Number: \"+this.i};f" +
+    "unction gb(a,b){M.call(this,a.o);this.m=a;this.i=b;this.l=a.l;this" +
+    ".h=a.h;1==this.i.length&&(a=this.i[0],a.F||a.i!=hb||(a=a.v,\"*\"!=a." +
+    "j()&&(this.j={name:a.j(),B:null})))}n(gb,M);function ib(){M.call(t" +
+    "his,4)}n(ib,M);ib.prototype.g=function(a){var b=new I;a=a.g;9==a.n" +
+    "odeType?b.add(a):b.add(a.ownerDocument);return b};ib.prototype.toS" +
+    "tring=function(){return\"Root Helper Expression\"};function jb(){M.c" +
+    "all(this,4)}n(jb,M);jb.prototype.g=function(a){var b=new I;b.add(a" +
+    ".g);return b};jb.prototype.toString=function(){return\"Context Help" +
+    "er Expression\"};\nfunction kb(a){return\"/\"==a||\"//\"==a}gb.prototype" +
+    ".g=function(a){var b=this.m.g(a);if(!(b instanceof I))throw Error(" +
+    "\"Filter expression must evaluate to nodeset.\");a=this.i;for(var c=" +
+    "0,d=a.length;c<d&&b.h;c++){var e=a[c],f=L(b,e.i.A);if(e.l||e.i!=lb" +
+    ")if(e.l||e.i!=mb){var g=f.next();for(b=e.g(new D(g));null!=(g=f.ne" +
+    "xt());)g=e.g(new D(g)),b=Ja(b,g)}else g=f.next(),b=e.g(new D(g));e" +
+    "lse{for(g=f.next();(b=f.next())&&(!g.contains||g.contains(b))&&b.c" +
+    "ompareDocumentPosition(g)&8;g=b);b=e.g(new D(g))}}return b};\ngb.pr" +
+    "ototype.toString=function(){var a=\"Path Expression:\"+N(this.m);if(" +
+    "this.i.length){var b=v(this.i,function(c,d){return c+N(d)},\"Steps:" +
+    "\");a+=N(b)}return a};function nb(a,b){this.g=a;this.A=!!b}\nfunctio" +
+    "n Za(a,b,c){for(c=c||0;c<a.g.length;c++)for(var d=a.g[c],e=L(b),f=" +
+    "b.h,g,h=0;g=e.next();h++){var l=a.A?f-h:h+1;g=d.g(new D(g,l,f));if" +
+    "(\"number\"==typeof g)l=l==g;else if(\"string\"==typeof g||\"boolean\"==" +
+    "typeof g)l=!!g;else if(g instanceof I)l=0<g.h;else throw Error(\"Pr" +
+    "edicate.evaluate returned an unexpected type.\");if(!l){l=e;g=l.j;v" +
+    "ar t=l.g;if(!t)throw Error(\"Next must be called at least once befo" +
+    "re remove.\");var m=t.g;t=t.next;m?m.next=t:g.g=t;t?t.g=m:g.j=m;g.h" +
+    "--;l.g=null}}return b}\nnb.prototype.toString=function(){return v(t" +
+    "his.g,function(a,b){return a+N(b)},\"Predicates:\")};function U(a,b," +
+    "c,d){M.call(this,4);this.i=a;this.v=b;this.m=c||new nb([]);this.F=" +
+    "!!d;b=this.m;b=0<b.g.length?b.g[0].j:null;a.M&&b&&(this.j={name:b." +
+    "name,B:b.B});a:{a=this.m;for(b=0;b<a.g.length;b++)if(c=a.g[b],c.l|" +
+    "|1==c.o||0==c.o){a=!0;break a}a=!1}this.l=a}n(U,M);\nU.prototype.g=" +
+    "function(a){var b=a.g,c=this.j,d=null,e=null,f=0;c&&(d=c.name,e=c." +
+    "B?P(c.B,a):null,f=1);if(this.F)if(this.l||this.i!=ob)if(b=L((new U" +
+    "(pb,new K(\"node\"))).g(a)),c=b.next())for(a=this.u(c,d,e,f);null!=(" +
+    "c=b.next());)a=Ja(a,this.u(c,d,e,f));else a=new I;else a=Fa(this.v" +
+    ",b,d,e),a=Za(this.m,a,f);else a=this.u(a.g,d,e,f);return a};U.prot" +
+    "otype.u=function(a,b,c,d){a=this.i.C(this.v,a,b,c);return a=Za(thi" +
+    "s.m,a,d)};\nU.prototype.toString=function(){var a=\"Step:\"+N(\"Operat" +
+    "or: \"+(this.F?\"//\":\"/\"));this.i.s&&(a+=N(\"Axis: \"+this.i));a+=N(th" +
+    "is.v);if(this.m.g.length){var b=v(this.m.g,function(c,d){return c+" +
+    "N(d)},\"Predicates:\");a+=N(b)}return a};function qb(a,b,c,d){this.s" +
+    "=a;this.C=b;this.A=c;this.M=d}qb.prototype.toString=function(){ret" +
+    "urn this.s};var rb={};function V(a,b,c,d){if(rb.hasOwnProperty(a))" +
+    "throw Error(\"Axis already created: \"+a);b=new qb(a,b,c,!!d);return" +
+    " rb[a]=b}\nV(\"ancestor\",function(a,b){for(var c=new I;b=b.parentNod" +
+    "e;)a.g(b)&&Ka(c,b);return c},!0);V(\"ancestor-or-self\",function(a,b" +
+    "){var c=new I;do a.g(b)&&Ka(c,b);while(b=b.parentNode);return c},!" +
+    "0);\nvar hb=V(\"attribute\",function(a,b){var c=new I,d=a.j();if(b=b." +
+    "attributes)if(a instanceof K&&null===a.getType()||\"*\"==d)for(a=0;d" +
+    "=b[a];a++)c.add(d);else(d=b.getNamedItem(d))&&c.add(d);return c},!" +
+    "1),ob=V(\"child\",function(a,b,c,d,e){c=\"string\"===typeof c?c:null;d" +
+    "=\"string\"===typeof d?d:null;e=e||new I;for(b=b.firstChild;b;b=b.ne" +
+    "xtSibling)G(b,c,d)&&a.g(b)&&e.add(b);return e},!1,!0);V(\"descendan" +
+    "t\",Fa,!1,!0);\nvar pb=V(\"descendant-or-self\",function(a,b,c,d){var " +
+    "e=new I;G(b,c,d)&&a.g(b)&&e.add(b);return Fa(a,b,c,d,e)},!1,!0),lb" +
+    "=V(\"following\",function(a,b,c,d){var e=new I;do for(var f=b;f=f.ne" +
+    "xtSibling;)G(f,c,d)&&a.g(f)&&e.add(f),e=Fa(a,f,c,d,e);while(b=b.pa" +
+    "rentNode);return e},!1,!0);V(\"following-sibling\",function(a,b){for" +
+    "(var c=new I;b=b.nextSibling;)a.g(b)&&c.add(b);return c},!1);V(\"na" +
+    "mespace\",function(){return new I},!1);\nvar sb=V(\"parent\",function(" +
+    "a,b){var c=new I;if(9==b.nodeType)return c;if(2==b.nodeType)return" +
+    " c.add(b.ownerElement),c;b=b.parentNode;a.g(b)&&c.add(b);return c}" +
+    ",!1),mb=V(\"preceding\",function(a,b,c,d){var e=new I,f=[];do f.unsh" +
+    "ift(b);while(b=b.parentNode);for(var g=1,h=f.length;g<h;g++){var l" +
+    "=[];for(b=f[g];b=b.previousSibling;)l.unshift(b);for(var t=0,m=l.l" +
+    "ength;t<m;t++)b=l[t],G(b,c,d)&&a.g(b)&&e.add(b),e=Fa(a,b,c,d,e)}re" +
+    "turn e},!0,!0);\nV(\"preceding-sibling\",function(a,b){for(var c=new " +
+    "I;b=b.previousSibling;)a.g(b)&&Ka(c,b);return c},!0);var tb=V(\"sel" +
+    "f\",function(a,b){var c=new I;a.g(b)&&c.add(b);return c},!1);functi" +
+    "on ub(a){M.call(this,1);this.i=a;this.l=a.l;this.h=a.h}n(ub,M);ub." +
+    "prototype.g=function(a){return-O(this.i,a)};ub.prototype.toString=" +
+    "function(){return\"Unary Expression: -\"+N(this.i)};function vb(a){M" +
+    ".call(this,4);this.i=a;Sa(this,w(this.i,function(b){return b.l}));" +
+    "Ta(this,w(this.i,function(b){return b.h}))}n(vb,M);vb.prototype.g=" +
+    "function(a){var b=new I;u(this.i,function(c){c=c.g(a);if(!(c insta" +
+    "nceof I))throw Error(\"Path expression must evaluate to NodeSet.\");" +
+    "b=Ja(b,c)});return b};vb.prototype.toString=function(){return v(th" +
+    "is.i,function(a,b){return a+N(b)},\"Union Expression:\")};function w" +
+    "b(a,b){this.g=a;this.h=b}function xb(a){for(var b,c=[];;){W(a,\"Mis" +
+    "sing right hand side of binary expression.\");b=zb(a);var d=a.g.nex" +
+    "t();if(!d)break;var e=(d=Xa[d]||null)&&d.H;if(!e){a.g.g--;break}fo" +
+    "r(;c.length&&e<=c[c.length-1].H;)b=new Ua(c.pop(),c.pop(),b);c.pus" +
+    "h(b,d)}for(;c.length;)b=new Ua(c.pop(),c.pop(),b);return b}functio" +
+    "n W(a,b){if(Ea(a.g))throw Error(b);}function Ab(a,b){a=a.g.next();" +
+    "if(a!=b)throw Error(\"Bad token, expected: \"+b+\" got: \"+a);}\nfuncti" +
+    "on Bb(a){a=a.g.next();if(\")\"!=a)throw Error(\"Bad token: \"+a);}func" +
+    "tion Cb(a){a=a.g.next();if(2>a.length)throw Error(\"Unclosed litera" +
+    "l string\");return new db(a)}function Db(a){var b=a.g.next(),c=b.in" +
+    "dexOf(\":\");if(-1==c)return new eb(b);var d=b.substring(0,c);a=a.h(" +
+    "d);if(!a)throw Error(\"Namespace prefix not declared: \"+d);b=b.subs" +
+    "tr(c+1);return new eb(b,a)}\nfunction Eb(a){var b=[];if(kb(E(a.g)))" +
+    "{var c=a.g.next();var d=E(a.g);if(\"/\"==c&&(Ea(a.g)||\".\"!=d&&\"..\"!=" +
+    "d&&\"@\"!=d&&\"*\"!=d&&!/(?![0-9])[\\w]/.test(d)))return new ib;d=new i" +
+    "b;W(a,\"Missing next location step.\");c=Fb(a,c);b.push(c)}else{a:{c" +
+    "=E(a.g);d=c.charAt(0);switch(d){case \"$\":throw Error(\"Variable ref" +
+    "erence not allowed in HTML XPath\");case \"(\":a.g.next();c=xb(a);W(a" +
+    ",'unclosed \"(\"');Ab(a,\")\");break;case '\"':case \"'\":c=Cb(a);break;d" +
+    "efault:if(isNaN(+c))if(!cb(c)&&/(?![0-9])[\\w]/.test(d)&&\"(\"==E(a.g"
+  )
+      .append(
+    ",\n1)){c=a.g.next();c=bb[c]||null;a.g.next();for(d=[];\")\"!=E(a.g);)" +
+    "{W(a,\"Missing function argument list.\");d.push(xb(a));if(\",\"!=E(a." +
+    "g))break;a.g.next()}W(a,\"Unclosed function argument list.\");Bb(a);" +
+    "c=new $a(c,d)}else{c=null;break a}else c=new fb(+a.g.next())}\"[\"==" +
+    "E(a.g)&&(d=new nb(Gb(a)),c=new Ya(c,d))}if(c)if(kb(E(a.g)))d=c;els" +
+    "e return c;else c=Fb(a,\"/\"),d=new jb,b.push(c)}for(;kb(E(a.g));)c=" +
+    "a.g.next(),W(a,\"Missing next location step.\"),c=Fb(a,c),b.push(c);" +
+    "return new gb(d,b)}\nfunction Fb(a,b){if(\"/\"!=b&&\"//\"!=b)throw Erro" +
+    "r('Step op should be \"/\" or \"//\"');if(\".\"==E(a.g)){var c=new U(tb," +
+    "new K(\"node\"));a.g.next();return c}if(\"..\"==E(a.g))return c=new U(" +
+    "sb,new K(\"node\")),a.g.next(),c;if(\"@\"==E(a.g)){var d=hb;a.g.next()" +
+    ";W(a,\"Missing attribute name\")}else if(\"::\"==E(a.g,1)){if(!/(?![0-" +
+    "9])[\\w]/.test(E(a.g).charAt(0)))throw Error(\"Bad token: \"+a.g.next" +
+    "());var e=a.g.next();d=rb[e]||null;if(!d)throw Error(\"No axis with" +
+    " name: \"+e);a.g.next();W(a,\"Missing node name\")}else d=ob;e=\nE(a.g" +
+    ");if(/(?![0-9])[\\w]/.test(e.charAt(0)))if(\"(\"==E(a.g,1)){if(!cb(e)" +
+    ")throw Error(\"Invalid node type: \"+e);e=a.g.next();if(!cb(e))throw" +
+    " Error(\"Invalid type name: \"+e);Ab(a,\"(\");W(a,\"Bad nodetype\");var " +
+    "f=E(a.g).charAt(0),g=null;if('\"'==f||\"'\"==f)g=Cb(a);W(a,\"Bad nodet" +
+    "ype\");Bb(a);e=new K(e,g)}else e=Db(a);else if(\"*\"==e)e=Db(a);else " +
+    "throw Error(\"Bad token: \"+a.g.next());a=new nb(Gb(a),d.A);return c" +
+    "||new U(d,e,a,\"//\"==b)}\nfunction Gb(a){for(var b=[];\"[\"==E(a.g);){" +
+    "a.g.next();W(a,\"Missing predicate expression.\");var c=xb(a);b.push" +
+    "(c);W(a,\"Unclosed predicate expression.\");Ab(a,\"]\")}return b}funct" +
+    "ion zb(a){if(\"-\"==E(a.g))return a.g.next(),new ub(zb(a));var b=Eb(" +
+    "a);if(\"|\"!=E(a.g))a=b;else{for(b=[b];\"|\"==a.g.next();)W(a,\"Missing" +
+    " next union location path.\"),b.push(Eb(a));a.g.g--;a=new vb(b)}ret" +
+    "urn a};function Hb(a,b){if(!a.length)throw Error(\"Empty XPath expr" +
+    "ession.\");a=Ba(a);if(Ea(a))throw Error(\"Invalid XPath expression.\"" +
+    ");b?\"function\"!==typeof b&&(b=da(b.lookupNamespaceURI,b)):b=functi" +
+    "on(){return null};var c=xb(new wb(a,b));if(!Ea(a))throw Error(\"Bad" +
+    " token: \"+a.next());this.evaluate=function(d,e){d=c.g(new D(d));re" +
+    "turn new X(d,e)}}\nfunction X(a,b){if(0==b)if(a instanceof I)b=4;el" +
+    "se if(\"string\"==typeof a)b=2;else if(\"number\"==typeof a)b=1;else i" +
+    "f(\"boolean\"==typeof a)b=3;else throw Error(\"Unexpected evaluation " +
+    "result.\");if(2!=b&&1!=b&&3!=b&&!(a instanceof I))throw Error(\"valu" +
+    "e could not be converted to the specified type\");this.resultType=b" +
+    ";switch(b){case 2:this.stringValue=a instanceof I?Ma(a):\"\"+a;break" +
+    ";case 1:this.numberValue=a instanceof I?+Ma(a):+a;break;case 3:thi" +
+    "s.booleanValue=a instanceof I?0<a.h:!!a;break;case 4:case 5:case 6" +
+    ":case 7:var c=\nL(a);var d=[];for(var e=c.next();e;e=c.next())d.pus" +
+    "h(e);this.snapshotLength=a.h;this.invalidIteratorState=!1;break;ca" +
+    "se 8:case 9:this.singleNodeValue=La(a);break;default:throw Error(\"" +
+    "Unknown XPathResult type.\");}var f=0;this.iterateNext=function(){i" +
+    "f(4!=b&&5!=b)throw Error(\"iterateNext called with wrong result typ" +
+    "e\");return f>=d.length?null:d[f++]};this.snapshotItem=function(g){" +
+    "if(6!=b&&7!=b)throw Error(\"snapshotItem called with wrong result t" +
+    "ype\");return g>=d.length||0>g?null:d[g]}}X.ANY_TYPE=0;\nX.NUMBER_TY" +
+    "PE=1;X.STRING_TYPE=2;X.BOOLEAN_TYPE=3;X.UNORDERED_NODE_ITERATOR_TY" +
+    "PE=4;X.ORDERED_NODE_ITERATOR_TYPE=5;X.UNORDERED_NODE_SNAPSHOT_TYPE" +
+    "=6;X.ORDERED_NODE_SNAPSHOT_TYPE=7;X.ANY_UNORDERED_NODE_TYPE=8;X.FI" +
+    "RST_ORDERED_NODE_TYPE=9;function Ib(a){this.lookupNamespaceURI=Pa(" +
+    "a)}\nfunction Jb(a,b){a=a||k;var c=a.document;if(!c.evaluate||b)a.X" +
+    "PathResult=X,c.evaluate=function(d,e,f,g){return(new Hb(d,f)).eval" +
+    "uate(e,g)},c.createExpression=function(d,e){return new Hb(d,e)},c." +
+    "createNSResolver=function(d){return new Ib(d)}}aa(\"wgxpath.install" +
+    "\",Jb);var Kb=function(){var a={P:\"http://www.w3.org/2000/svg\"};ret" +
+    "urn function(b){return a[b]||null}}();\nfunction Lb(a,b){var c=A(a)" +
+    ";if(!c.documentElement)return null;Jb(c?c.parentWindow||c.defaultV" +
+    "iew:window);try{for(var d=c.createNSResolver?c.createNSResolver(c." +
+    "documentElement):Kb,e={},f=c.getElementsByTagName(\"*\"),g=0;g<f.len" +
+    "gth;++g){var h=f[g],l=h.namespaceURI;if(l&&!e[l]){var t=h.lookupPr" +
+    "efix(l);if(!t){var m=l.match(\".*/(\\\\w+)/?$\");t=m?m[1]:\"xhtml\"}e[l]" +
+    "=t}}var y={},H;for(H in e)y[e[H]]=H;d=function(J){return y[J]||nul" +
+    "l};try{return c.evaluate(b,a,d,9,null)}catch(J){if(\"TypeError\"===J" +
+    ".name)return d=\nc.createNSResolver?c.createNSResolver(c.documentEl" +
+    "ement):Kb,c.evaluate(b,a,d,9,null);throw J;}}catch(J){throw new ya" +
+    "(32,\"Unable to locate an element with the xpath expression \"+b+\" b" +
+    "ecause of the following error:\\n\"+J);}}\nfunction Mb(a,b){var c=fun" +
+    "ction(){var d=Lb(b,a);return d?d.singleNodeValue||null:b.selectSin" +
+    "gleNode?(d=A(b),d.setProperty&&d.setProperty(\"SelectionLanguage\",\"" +
+    "XPath\"),b.selectSingleNode(a)):null}();if(null!==c&&(!c||1!=c.node" +
+    "Type))throw new ya(32,'The result of the xpath expression \"'+a+'\" " +
+    "is: '+c+\". It should be an element.\");return c};var Nb={aliceblue:" +
+    "\"#f0f8ff\",antiquewhite:\"#faebd7\",aqua:\"#00ffff\",aquamarine:\"#7fffd" +
+    "4\",azure:\"#f0ffff\",beige:\"#f5f5dc\",bisque:\"#ffe4c4\",black:\"#000000" +
+    "\",blanchedalmond:\"#ffebcd\",blue:\"#0000ff\",blueviolet:\"#8a2be2\",bro" +
+    "wn:\"#a52a2a\",burlywood:\"#deb887\",cadetblue:\"#5f9ea0\",chartreuse:\"#" +
+    "7fff00\",chocolate:\"#d2691e\",coral:\"#ff7f50\",cornflowerblue:\"#6495e" +
+    "d\",cornsilk:\"#fff8dc\",crimson:\"#dc143c\",cyan:\"#00ffff\",darkblue:\"#" +
+    "00008b\",darkcyan:\"#008b8b\",darkgoldenrod:\"#b8860b\",darkgray:\"#a9a9" +
+    "a9\",darkgreen:\"#006400\",\ndarkgrey:\"#a9a9a9\",darkkhaki:\"#bdb76b\",da" +
+    "rkmagenta:\"#8b008b\",darkolivegreen:\"#556b2f\",darkorange:\"#ff8c00\"," +
+    "darkorchid:\"#9932cc\",darkred:\"#8b0000\",darksalmon:\"#e9967a\",darkse" +
+    "agreen:\"#8fbc8f\",darkslateblue:\"#483d8b\",darkslategray:\"#2f4f4f\",d" +
+    "arkslategrey:\"#2f4f4f\",darkturquoise:\"#00ced1\",darkviolet:\"#9400d3" +
+    "\",deeppink:\"#ff1493\",deepskyblue:\"#00bfff\",dimgray:\"#696969\",dimgr" +
+    "ey:\"#696969\",dodgerblue:\"#1e90ff\",firebrick:\"#b22222\",floralwhite:" +
+    "\"#fffaf0\",forestgreen:\"#228b22\",fuchsia:\"#ff00ff\",gainsboro:\"#dcdc" +
+    "dc\",\nghostwhite:\"#f8f8ff\",gold:\"#ffd700\",goldenrod:\"#daa520\",gray:" +
+    "\"#808080\",green:\"#008000\",greenyellow:\"#adff2f\",grey:\"#808080\",hon" +
+    "eydew:\"#f0fff0\",hotpink:\"#ff69b4\",indianred:\"#cd5c5c\",indigo:\"#4b0" +
+    "082\",ivory:\"#fffff0\",khaki:\"#f0e68c\",lavender:\"#e6e6fa\",lavenderbl" +
+    "ush:\"#fff0f5\",lawngreen:\"#7cfc00\",lemonchiffon:\"#fffacd\",lightblue" +
+    ":\"#add8e6\",lightcoral:\"#f08080\",lightcyan:\"#e0ffff\",lightgoldenrod" +
+    "yellow:\"#fafad2\",lightgray:\"#d3d3d3\",lightgreen:\"#90ee90\",lightgre" +
+    "y:\"#d3d3d3\",lightpink:\"#ffb6c1\",lightsalmon:\"#ffa07a\",\nlightseagre" +
+    "en:\"#20b2aa\",lightskyblue:\"#87cefa\",lightslategray:\"#778899\",light" +
+    "slategrey:\"#778899\",lightsteelblue:\"#b0c4de\",lightyellow:\"#ffffe0\"" +
+    ",lime:\"#00ff00\",limegreen:\"#32cd32\",linen:\"#faf0e6\",magenta:\"#ff00" +
+    "ff\",maroon:\"#800000\",mediumaquamarine:\"#66cdaa\",mediumblue:\"#0000c" +
+    "d\",mediumorchid:\"#ba55d3\",mediumpurple:\"#9370db\",mediumseagreen:\"#" +
+    "3cb371\",mediumslateblue:\"#7b68ee\",mediumspringgreen:\"#00fa9a\",medi" +
+    "umturquoise:\"#48d1cc\",mediumvioletred:\"#c71585\",midnightblue:\"#191" +
+    "970\",mintcream:\"#f5fffa\",mistyrose:\"#ffe4e1\",\nmoccasin:\"#ffe4b5\",n" +
+    "avajowhite:\"#ffdead\",navy:\"#000080\",oldlace:\"#fdf5e6\",olive:\"#8080" +
+    "00\",olivedrab:\"#6b8e23\",orange:\"#ffa500\",orangered:\"#ff4500\",orchi" +
+    "d:\"#da70d6\",palegoldenrod:\"#eee8aa\",palegreen:\"#98fb98\",paleturquo" +
+    "ise:\"#afeeee\",palevioletred:\"#db7093\",papayawhip:\"#ffefd5\",peachpu" +
+    "ff:\"#ffdab9\",peru:\"#cd853f\",pink:\"#ffc0cb\",plum:\"#dda0dd\",powderbl" +
+    "ue:\"#b0e0e6\",purple:\"#800080\",red:\"#ff0000\",rosybrown:\"#bc8f8f\",ro" +
+    "yalblue:\"#4169e1\",saddlebrown:\"#8b4513\",salmon:\"#fa8072\",sandybrow" +
+    "n:\"#f4a460\",seagreen:\"#2e8b57\",\nseashell:\"#fff5ee\",sienna:\"#a0522d" +
+    "\",silver:\"#c0c0c0\",skyblue:\"#87ceeb\",slateblue:\"#6a5acd\",slategray" +
+    ":\"#708090\",slategrey:\"#708090\",snow:\"#fffafa\",springgreen:\"#00ff7f" +
+    "\",steelblue:\"#4682b4\",tan:\"#d2b48c\",teal:\"#008080\",thistle:\"#d8bfd" +
+    "8\",tomato:\"#ff6347\",turquoise:\"#40e0d0\",violet:\"#ee82ee\",wheat:\"#f" +
+    "5deb3\",white:\"#ffffff\",whitesmoke:\"#f5f5f5\",yellow:\"#ffff00\",yello" +
+    "wgreen:\"#9acd32\"};var Ob=\"backgroundColor borderTopColor borderRig" +
+    "htColor borderBottomColor borderLeftColor color outlineColor\".spli" +
+    "t(\" \"),Pb=/#([0-9a-fA-F])([0-9a-fA-F])([0-9a-fA-F])/,Qb=/^#(?:[0-9" +
+    "a-f]{3}){1,2}$/i,Rb=/^(?:rgba)?\\((\\d{1,3}),\\s?(\\d{1,3}),\\s?(\\d{1,3" +
+    "}),\\s?(0|1|0\\.\\d*)\\)$/i,Sb=/^(?:rgb)?\\((0|[1-9]\\d{0,2}),\\s?(0|[1-9" +
+    "]\\d{0,2}),\\s?(0|[1-9]\\d{0,2})\\)$/i;function Tb(a){return(a=a.exec(" +
+    "pa()))?a[1]:\"\"}Tb(/Android\\s+([0-9.]+)/)||Tb(/Version\\/([0-9.]+)/)" +
+    ";function Ub(a){var b=0,c=na(String(Vb)).split(\".\");a=na(String(a)" +
+    ").split(\".\");for(var d=Math.max(c.length,a.length),e=0;0==b&&e<d;e" +
+    "++){var f=c[e]||\"\",g=a[e]||\"\";do{f=/(\\d*)(\\D*)(.*)/.exec(f)||[\"\",\"" +
+    "\",\"\",\"\"];g=/(\\d*)(\\D*)(.*)/.exec(g)||[\"\",\"\",\"\",\"\"];if(0==f[0].leng" +
+    "th&&0==g[0].length)break;b=oa(0==f[1].length?0:parseInt(f[1],10),0" +
+    "==g[1].length?0:parseInt(g[1],10))||oa(0==f[2].length,0==g[2].leng" +
+    "th)||oa(f[2],g[2]);f=f[3];g=g[3]}while(0==b)}}var Wb=/Android\\s+([" +
+    "0-9\\.]+)/.exec(pa()),Vb=Wb?Wb[1]:\"0\";Ub(2.3);\nUb(4);function Y(a,b" +
+    "){b&&\"string\"!==typeof b&&(b=b.toString());return!!a&&1==a.nodeTyp" +
+    "e&&(!b||a.tagName.toUpperCase()==b)};function Xb(a){for(a=a.parent" +
+    "Node;a&&1!=a.nodeType&&9!=a.nodeType&&11!=a.nodeType;)a=a.parentNo" +
+    "de;return Y(a)?a:null}\nfunction Z(a,b){b=qa(b);if(\"float\"==b||\"css" +
+    "Float\"==b||\"styleFloat\"==b)b=\"cssFloat\";a:{var c=b;var d=A(a);if(d" +
+    ".defaultView&&d.defaultView.getComputedStyle&&(d=d.defaultView.get" +
+    "ComputedStyle(a,null))){c=d[c]||d.getPropertyValue(c)||\"\";break a}" +
+    "c=\"\"}a=c||Yb(a,b);if(null===a)a=null;else if(0<=ia(Ob,b)){b:{var e" +
+    "=a.match(Rb);if(e&&(b=Number(e[1]),c=Number(e[2]),d=Number(e[3]),e" +
+    "=Number(e[4]),0<=b&&255>=b&&0<=c&&255>=c&&0<=d&&255>=d&&0<=e&&1>=e" +
+    ")){b=[b,c,d,e];break b}b=null}if(!b)b:{if(d=a.match(Sb))if(b=Numbe" +
+    "r(d[1]),\nc=Number(d[2]),d=Number(d[3]),0<=b&&255>=b&&0<=c&&255>=c&" +
+    "&0<=d&&255>=d){b=[b,c,d,1];break b}b=null}if(!b)b:{b=a.toLowerCase" +
+    "();c=Nb[b.toLowerCase()];if(!c&&(c=\"#\"==b.charAt(0)?b:\"#\"+b,4==c.l" +
+    "ength&&(c=c.replace(Pb,\"#$1$1$2$2$3$3\")),!Qb.test(c))){b=null;brea" +
+    "k b}b=[parseInt(c.substr(1,2),16),parseInt(c.substr(3,2),16),parse" +
+    "Int(c.substr(5,2),16),1]}a=b?\"rgba(\"+b.join(\", \")+\")\":a}return a}\n" +
+    "function Yb(a,b){var c=a.currentStyle||a.style,d=c[b];void 0===d&&" +
+    "\"function\"===typeof c.getPropertyValue&&(d=c.getPropertyValue(b));" +
+    "return\"inherit\"!=d?void 0!==d?d:null:(a=Xb(a))?Yb(a,b):null}\nfunct" +
+    "ion Zb(a,b,c){function d(g){var h=$b(g);return 0<h.height&&0<h.wid" +
+    "th?!0:Y(g,\"PATH\")&&(0<h.height||0<h.width)?(g=Z(g,\"stroke-width\")," +
+    "!!g&&0<parseInt(g,10)):\"hidden\"!=Z(g,\"overflow\")&&w(g.childNodes,f" +
+    "unction(l){return 3==l.nodeType||Y(l)&&d(l)})}function e(g){return" +
+    "\"hidden\"==ac(g)&&ja(g.childNodes,function(h){return!Y(h)||e(h)||!d" +
+    "(h)})}if(!Y(a))throw Error(\"Argument to isShown must be of type El" +
+    "ement\");if(Y(a,\"BODY\"))return!0;if(Y(a,\"OPTION\")||Y(a,\"OPTGROUP\"))" +
+    "return a=wa(a,function(g){return Y(g,\n\"SELECT\")}),!!a&&Zb(a,!0,c);" +
+    "var f=bc(a);if(f)return!!f.image&&0<f.rect.width&&0<f.rect.height&" +
+    "&Zb(f.image,b,c);if(Y(a,\"INPUT\")&&\"hidden\"==a.type.toLowerCase()||" +
+    "Y(a,\"NOSCRIPT\"))return!1;f=Z(a,\"visibility\");return\"collapse\"!=f&&" +
+    "\"hidden\"!=f&&c(a)&&(b||0!=cc(a))&&d(a)?!e(a):!1}\nfunction dc(a){fu" +
+    "nction b(c){if(Y(c)&&\"none\"==Z(c,\"display\"))return!1;var d;(d=c.pa" +
+    "rentNode)&&d.shadowRoot&&void 0!==c.assignedSlot?d=c.assignedSlot?" +
+    "c.assignedSlot.parentNode:null:c.getDestinationInsertionPoints&&(c" +
+    "=c.getDestinationInsertionPoints(),0<c.length&&(d=c[c.length-1]));" +
+    "return!d||9!=d.nodeType&&11!=d.nodeType?!!d&&b(d):!0}return Zb(a,!" +
+    "1,b)}\nfunction ac(a){function b(p){function q(Na){return Na==g?!0:" +
+    "0==Z(Na,\"display\").lastIndexOf(\"inline\",0)||\"absolute\"==yb&&\"stati" +
+    "c\"==Z(Na,\"position\")?!1:!0}var yb=Z(p,\"position\");if(\"fixed\"==yb)r" +
+    "eturn t=!0,p==g?null:g;for(p=Xb(p);p&&!q(p);)p=Xb(p);return p}func" +
+    "tion c(p){var q=p;if(\"visible\"==l)if(p==g&&h)q=h;else if(p==h)retu" +
+    "rn{x:\"visible\",y:\"visible\"};q={x:Z(q,\"overflow-x\"),y:Z(q,\"overflow" +
+    "-y\")};p==g&&(q.x=\"visible\"==q.x?\"auto\":q.x,q.y=\"visible\"==q.y?\"aut" +
+    "o\":q.y);return q}function d(p){if(p==g){var q=\n(new xa(f)).g;p=q.s" +
+    "crollingElement?q.scrollingElement:q.body||q.documentElement;q=q.p" +
+    "arentWindow||q.defaultView;p=new x(q.pageXOffset||p.scrollLeft,q.p" +
+    "ageYOffset||p.scrollTop)}else p=new x(p.scrollLeft,p.scrollTop);re" +
+    "turn p}var e=ec(a),f=A(a),g=f.documentElement,h=f.body,l=Z(g,\"over" +
+    "flow\"),t;for(a=b(a);a;a=b(a)){var m=c(a);if(\"visible\"!=m.x||\"visib" +
+    "le\"!=m.y){var y=$b(a);if(0==y.width||0==y.height)return\"hidden\";va" +
+    "r H=e.g<y.left,J=e.h<y.top;if(H&&\"hidden\"==m.x||J&&\"hidden\"==m.y)r" +
+    "eturn\"hidden\";if(H&&\n\"visible\"!=m.x||J&&\"visible\"!=m.y){H=d(a);J=e" +
+    ".h<y.top-H.y;if(e.g<y.left-H.x&&\"visible\"!=m.x||J&&\"visible\"!=m.x)" +
+    "return\"hidden\";e=ac(a);return\"hidden\"==e?\"hidden\":\"scroll\"}H=e.lef" +
+    "t>=y.left+y.width;y=e.top>=y.top+y.height;if(H&&\"hidden\"==m.x||y&&" +
+    "\"hidden\"==m.y)return\"hidden\";if(H&&\"visible\"!=m.x||y&&\"visible\"!=m" +
+    ".y){if(t&&(m=d(a),e.left>=g.scrollWidth-m.x||e.g>=g.scrollHeight-m" +
+    ".y))return\"hidden\";e=ac(a);return\"hidden\"==e?\"hidden\":\"scroll\"}}}r" +
+    "eturn\"none\"}\nfunction $b(a){var b=bc(a);if(b)return b.rect;if(Y(a," +
+    "\"HTML\"))return a=A(a),a=((a?a.parentWindow||a.defaultView:window)|" +
+    "|window).document,a=\"CSS1Compat\"==a.compatMode?a.documentElement:a" +
+    ".body,a=new z(a.clientWidth,a.clientHeight),new C(0,0,a.width,a.he" +
+    "ight);try{var c=a.getBoundingClientRect()}catch(d){return new C(0," +
+    "0,0,0)}return new C(c.left,c.top,c.right-c.left,c.bottom-c.top)}\nf" +
+    "unction bc(a){var b=Y(a,\"MAP\");if(!b&&!Y(a,\"AREA\"))return null;var" +
+    " c=b?a:Y(a.parentNode,\"MAP\")?a.parentNode:null,d=null,e=null;c&&c." +
+    "name&&(d=A(c),d=Mb('/descendant::*[@usemap = \"#'+c.name+'\"]',d))&&" +
+    "(e=$b(d),b||\"default\"==a.shape.toLowerCase()||(a=fc(a),b=Math.min(" +
+    "Math.max(a.left,0),e.width),c=Math.min(Math.max(a.top,0),e.height)" +
+    ",e=new C(b+e.left,c+e.top,Math.min(a.width,e.width-b),Math.min(a.h" +
+    "eight,e.height-c))));return{image:d,rect:e||new C(0,0,0,0)}}\nfunct" +
+    "ion fc(a){var b=a.shape.toLowerCase();a=a.coords.split(\",\");if(\"re" +
+    "ct\"==b&&4==a.length){b=a[0];var c=a[1];return new C(b,c,a[2]-b,a[3" +
+    "]-c)}if(\"circle\"==b&&3==a.length)return b=a[2],new C(a[0]-b,a[1]-b" +
+    ",2*b,2*b);if(\"poly\"==b&&2<a.length){b=a[0];c=a[1];for(var d=b,e=c," +
+    "f=2;f+1<a.length;f+=2)b=Math.min(b,a[f]),d=Math.max(d,a[f]),c=Math" +
+    ".min(c,a[f+1]),e=Math.max(e,a[f+1]);return new C(b,c,d-b,e-c)}retu" +
+    "rn new C(0,0,0,0)}function ec(a){a=$b(a);return new B(a.top,a.left" +
+    "+a.width,a.top+a.height,a.left)}\nfunction gc(a){return a.replace(/" +
+    "^[^\\S\\xa0]+|[^\\S\\xa0]+$/g,\"\")}\nfunction hc(a,b,c){if(Y(a,\"BR\"))b.p" +
+    "ush(\"\");else{var d=Y(a,\"TD\"),e=Z(a,\"display\"),f=!d&&!(0<=ia(ic,e))" +
+    ",g=void 0!==a.previousElementSibling?a.previousElementSibling:ra(a" +
+    ".previousSibling);g=g?Z(g,\"display\"):\"\";var h=Z(a,\"float\")||Z(a,\"c" +
+    "ssFloat\")||Z(a,\"styleFloat\");!f||\"run-in\"==g&&\"none\"==h||/^[\\s\\xa0" +
+    "]*$/.test(b[b.length-1]||\"\")||b.push(\"\");var l=dc(a),t=null,m=null" +
+    ";l&&(t=Z(a,\"white-space\"),m=Z(a,\"text-transform\"));u(a.childNodes," +
+    "function(y){c(y,b,l,t,m)});a=b[b.length-1]||\"\";!d&&\"table-cell\"!=e" +
+    "||!a||\nma(a)||(b[b.length-1]+=\" \");f&&\"run-in\"!=e&&!/^[\\s\\xa0]*$/." +
+    "test(a)&&b.push(\"\")}}function jc(a,b){hc(a,b,function(c,d,e,f,g){3" +
+    "==c.nodeType&&e?kc(c,d,f,g):Y(c)&&jc(c,d)})}var ic=\"inline inline-" +
+    "block inline-table none table-cell table-column table-column-group" +
+    "\".split(\" \");\nfunction kc(a,b,c,d){a=a.nodeValue.replace(/[\\u200b\\" +
+    "u200e\\u200f]/g,\"\");a=a.replace(/(\\r\\n|\\r|\\n)/g,\"\\n\");if(\"normal\"==" +
+    "c||\"nowrap\"==c)a=a.replace(/\\n/g,\" \");a=\"pre\"==c||\"pre-wrap\"==c?a." +
+    "replace(/[ \\f\\t\\v\\u2028\\u2029]/g,\"\\u00a0\"):a.replace(/[ \\f\\t\\v\\u20" +
+    "28\\u2029]+/g,\" \");\"capitalize\"==d?a=a.replace(/(^|\\s)(\\S)/g,functi" +
+    "on(e,f,g){return f+g.toUpperCase()}):\"uppercase\"==d?a=a.toUpperCas" +
+    "e():\"lowercase\"==d&&(a=a.toLowerCase());c=b.pop()||\"\";ma(c)&&0==a." +
+    "lastIndexOf(\" \",0)&&(a=a.substr(1));b.push(c+a)}\nfunction cc(a){va" +
+    "r b=1,c=Z(a,\"opacity\");c&&(b=Number(c));(a=Xb(a))&&(b*=cc(a));retu" +
+    "rn b};aa(\"_\",function(a){var b=[];jc(a,b);a=b.length;var c=Array(a" +
+    ");b=\"string\"===typeof b?b.split(\"\"):b;for(var d=0;d<a;d++)d in b&&" +
+    "(c[d]=gc.call(void 0,b[d]));return gc(c.join(\"\\n\")).replace(/\\xa0/" +
+    "g,\" \")});;return this._.apply(null,arguments);}).apply({navigator:" +
+    "typeof window!=\"undefined\"?window.navigator:null},arguments);}\n"
+  )
+  .toString();
+  static final String GET_VISIBLE_TEXT_ANDROID_license =
+    "\n\n Copyright The Closure Library Authors.\n SPDX-License-Identifier" +
+    ": Apache-2.0\n\n\n Copyright 2014 Software Freedom Conservancy\n\n Lice" +
+    "nsed under the Apache License, Version 2.0 (the \"License\");\n you m" +
+    "ay not use this file except in compliance with the License.\n You m" +
+    "ay obtain a copy of the License at\n\n      http://www.apache.org/li" +
+    "censes/LICENSE-2.0\n\n Unless required by applicable law or agreed t" +
+    "o in writing, software\n distributed under the License is distribut" +
+    "ed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY K" +
+    "IND, either express or implied.\n See the License for the specific " +
+    "language governing permissions and\n limitations under the License." +
+    "\n";
+  private static final String GET_VISIBLE_TEXT_ANDROID_original() {
+    return GET_VISIBLE_TEXT_ANDROID.replaceAll("xxx_rpl_lic", GET_VISIBLE_TEXT_ANDROID_license);
+  }
+
+  public static void main(String[] args) {
+    if (args.length == 0) {
+      {
+        String message =     "CLEAR_ANDROID third_party/javascript/browser_automation/bot/fragme" +
+    "nts/clear_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "CLICK_ANDROID third_party/javascript/browser_automation/bot/fragme" +
+    "nts/click_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "FIND_ELEMENT_ANDROID third_party/javascript/browser_automation/bot" +
+    "/fragments/find_element_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "FIND_ELEMENTS_ANDROID third_party/javascript/browser_automation/bo" +
+    "t/fragments/find_elements_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "SCROLL_INTO_VIEW_ANDROID third_party/javascript/browser_automation" +
+    "/bot/fragments/scroll_into_view_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "SEND_KEYS_ANDROID third_party/javascript/browser_automation/webdri" +
+    "ver/atoms/fragments/send_keys_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "ACTIVE_ELEMENT_ANDROID tools/android/webdriver/atom/active_element" +
+    "_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "FRAME_BY_ID_OR_NAME_ANDROID tools/android/webdriver/atom/frame_by_" +
+    "id_or_name_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "FRAME_BY_INDEX_ANDROID tools/android/webdriver/atom/frame_by_index" +
+    "_android.js";
+        System.out.println(message);
+      }
+      {
+        String message =     "GET_VISIBLE_TEXT_ANDROID tools/android/webdriver/atom/get_visible_" +
+    "text_android.js";
+        System.out.println(message);
+      }
+      System.exit(0);
+    }
+    String name = args[0];
+    if("CLEAR_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.CLEAR_ANDROID_original());
+      System.exit(0);
+    }
+    if("CLICK_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.CLICK_ANDROID_original());
+      System.exit(0);
+    }
+    if("FIND_ELEMENT_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.FIND_ELEMENT_ANDROID_original());
+      System.exit(0);
+    }
+    if("FIND_ELEMENTS_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.FIND_ELEMENTS_ANDROID_original());
+      System.exit(0);
+    }
+    if("SCROLL_INTO_VIEW_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.SCROLL_INTO_VIEW_ANDROID_original());
+      System.exit(0);
+    }
+    if("SEND_KEYS_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.SEND_KEYS_ANDROID_original());
+      System.exit(0);
+    }
+    if("ACTIVE_ELEMENT_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.ACTIVE_ELEMENT_ANDROID_original());
+      System.exit(0);
+    }
+    if("FRAME_BY_ID_OR_NAME_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.FRAME_BY_ID_OR_NAME_ANDROID_original());
+      System.exit(0);
+    }
+    if("FRAME_BY_INDEX_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.FRAME_BY_INDEX_ANDROID_original());
+      System.exit(0);
+    }
+    if("GET_VISIBLE_TEXT_ANDROID".equals(name)) {
+      System.out.print(WebDriverAtomScripts.GET_VISIBLE_TEXT_ANDROID_original());
+      System.exit(0);
+    }
+    System.exit(1);
+  }
+}
\ No newline at end of file
diff --git a/espresso/web/javatests/androidx/test/espresso/web/BUILD.bazel b/espresso/web/javatests/androidx/test/espresso/web/BUILD.bazel
deleted file mode 100644
index 794425550..000000000
--- a/espresso/web/javatests/androidx/test/espresso/web/BUILD.bazel
+++ /dev/null
@@ -1,59 +0,0 @@
-# Description: Tests for espresso web
-
-load(
-    "//build_extensions:android_app_instrumentation_tests.bzl",
-    "android_app_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_app_instrumentation_tests(
-    name = "instrumentation_tests",
-    testonly = 1,
-    srcs = glob(["**/*.java"]),
-    binary_target = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    target_devices = devices(),
-    deps = [
-        "//core",
-        "//espresso/core/java/androidx/test/espresso",
-        "//espresso/core/java/androidx/test/espresso:framework",
-        "//espresso/core/java/androidx/test/espresso:interface",
-        "//espresso/core/java/androidx/test/espresso/matcher",
-        "//espresso/core/java/androidx/test/espresso/matcher:remote_hamcrest_v1_3_core_matchers",
-        "//espresso/core/java/androidx/test/espresso/remote:interface",
-        "//espresso/core/java/androidx/test/espresso/remote:protoUtils",
-        "//espresso/core/java/androidx/test/espresso/remote:registry",
-        "//espresso/core/javatests/androidx/test/espresso/proto:test_protos_android_pb3",
-        "//espresso/core/javatests/androidx/test/espresso/remote:util",
-        "//espresso/web/java/androidx/test/espresso/web/action",
-        "//espresso/web/java/androidx/test/espresso/web/action:remote_web_actions",
-        "//espresso/web/java/androidx/test/espresso/web/assertion",
-        "//espresso/web/java/androidx/test/espresso/web/assertion:remote_web_assertions",
-        "//espresso/web/java/androidx/test/espresso/web/matcher",
-        "//espresso/web/java/androidx/test/espresso/web/matcher:remote_web_matchers",
-        "//espresso/web/java/androidx/test/espresso/web/model",
-        "//espresso/web/java/androidx/test/espresso/web/model:remote_web_model_atoms",
-        "//espresso/web/java/androidx/test/espresso/web/proto/action:web_actions_proto_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/proto/assertion:web_assertions_proto_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/proto/matcher:remote_web_matchers_proto_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/proto/model:remote_web_model_atoms_proto_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/proto/sugar:web_sugar_proto_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/proto/webdriver:web_driver_atoms_proto_android_pb3",
-        "//espresso/web/java/androidx/test/espresso/web/sugar",
-        "//espresso/web/java/androidx/test/espresso/web/sugar:remote_sugar",
-        "//espresso/web/java/androidx/test/espresso/web/webdriver",
-        "//espresso/web/java/androidx/test/espresso/web/webdriver:remote_webdriver_atoms",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-        "@com_google_protobuf//:protobuf_javalite",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/action/BUILD b/espresso/web/javatests/androidx/test/espresso/web/action/BUILD
new file mode 100644
index 000000000..2a2bb9aa6
--- /dev/null
+++ b/espresso/web/javatests/androidx/test/espresso/web/action/BUILD
@@ -0,0 +1,43 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:phone_devices.bzl",
+    "apis",
+    "devices",
+    "gmscore_channel",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "JavaScriptExecutionActionTest",
+    srcs = [
+        "JavaScriptExecutionActionTest.java",
+    ],
+
+    # TODO(b/232962936): AOSP API 26 doesn't include webview
+    device_list = devices(apis(exclude_apis = [26])) + devices(
+        [26],
+        gms_channel = gmscore_channel.PREBUILT,
+    ),
+    deps = [
+        "//core",
+        "//espresso/core",
+        "//espresso/web",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/assertion/BUILD b/espresso/web/javatests/androidx/test/espresso/web/assertion/BUILD
new file mode 100644
index 000000000..345ea8cdb
--- /dev/null
+++ b/espresso/web/javatests/androidx/test/espresso/web/assertion/BUILD
@@ -0,0 +1,41 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:phone_devices.bzl",
+    "apis",
+    "devices",
+    "gmscore_channel",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "WebViewAssertionsTest",
+    srcs = [
+        "WebViewAssertionsTest.java",
+    ],
+
+    # TODO(b/232962936): AOSP API 26 doesn't include webview
+    device_list = devices(apis(exclude_apis = [26])) + devices(
+        [26],
+        gms_channel = gmscore_channel.PREBUILT,
+    ),
+    deps = [
+        "//core",
+        "//espresso/core",
+        "//espresso/web",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/matcher/BUILD b/espresso/web/javatests/androidx/test/espresso/web/matcher/BUILD
new file mode 100644
index 000000000..5829a99af
--- /dev/null
+++ b/espresso/web/javatests/androidx/test/espresso/web/matcher/BUILD
@@ -0,0 +1,29 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "DomMatchersTest",
+    srcs = ["DomMatchersTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core",
+        "//espresso/web",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/model/BUILD b/espresso/web/javatests/androidx/test/espresso/web/model/BUILD
new file mode 100644
index 000000000..b4304aebf
--- /dev/null
+++ b/espresso/web/javatests/androidx/test/espresso/web/model/BUILD
@@ -0,0 +1,42 @@
+# Description: Tests for espresso web
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "ModelCodecTest",
+    srcs = ["ModelCodecTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core",
+        "//espresso/web",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "SimpleAtomTest",
+    srcs = ["SimpleAtomTest.java"],
+    deps = [
+        "//core",
+        "//espresso/core",
+        "//espresso/web",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/ui_testapp/java/androidx/test/ui/app:lib_exported",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/espresso/web/javatests/androidx/test/espresso/web/model/ModelCodecTest.java b/espresso/web/javatests/androidx/test/espresso/web/model/ModelCodecTest.java
index 6d52253e2..bb23c8251 100644
--- a/espresso/web/javatests/androidx/test/espresso/web/model/ModelCodecTest.java
+++ b/espresso/web/javatests/androidx/test/espresso/web/model/ModelCodecTest.java
@@ -16,13 +16,16 @@
 
 package androidx.test.espresso.web.model;
 
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import org.json.JSONObject;
@@ -69,7 +72,7 @@ public void testEncodeDecodeEvaluation_withNumber() {
 
   @Test
   public void testEncodeDecodeEvaluation_withList() {
-    List<Object> results = Lists.newArrayList();
+    List<Object> results = new ArrayList<>();
     results.add(1);
     results.add(2);
     results.add(3);
@@ -92,7 +95,7 @@ public void testEncodeDecodeEvaluation_withJSONAbleValue() {
 
   @Test
   public void testEncodeDecodeEvaluation_withMapValue() {
-    Map<String, Object> mapResult = Maps.newHashMap();
+    Map<String, Object> mapResult = new LinkedHashMap<>();
     mapResult.put("foo", "bar");
     mapResult.put("baz", true);
 
@@ -136,7 +139,7 @@ public void testEncodeDecode_map() {
     adhoc.put("int_min", Integer.MIN_VALUE);
     adhoc.put("double_min", Double.MIN_VALUE);
     adhoc.put("double_max", Double.MAX_VALUE);
-    adhoc.put("sudz", Lists.newArrayList("goodbye"));
+    adhoc.put("sudz", singletonList("goodbye"));
     assertEquals(adhoc, ModelCodec.decode(ModelCodec.encode(adhoc)));
   }
 
@@ -148,7 +151,7 @@ public void testEncodeDecoded_array() {
     array[2] = Double.MIN_VALUE;
     array[3] = "Hello World";
     array[4] = 2;
-    assertEquals(Lists.newArrayList(array), ModelCodec.decode(ModelCodec.encode(array)));
+    assertEquals(Arrays.asList(array), ModelCodec.decode(ModelCodec.encode(array)));
   }
 
   @Test
@@ -157,9 +160,9 @@ public void testEncodeDecoded_list() {
     Map<String, Object> adhoc = Maps.newHashMap();
     adhoc.put("foobar", 1234);
     adhoc.put("buzzz", Boolean.FALSE);
-    adhoc.put("sudz", Lists.newArrayList("goodbye"));
+    adhoc.put("sudz", singletonList("goodbye"));
     List<Object> blah =
-        Lists.newArrayList(
+        Arrays.asList(
             (Object) new GoodJSONAble("something"),
             new GoodJSONAble(null),
             new ElementReference("haha"),
@@ -167,7 +170,7 @@ public void testEncodeDecoded_list() {
             Boolean.TRUE,
             42,
             null,
-            Lists.newArrayList((Object) "a nested list", 12345),
+            Arrays.asList((Object) "a nested list", 12345),
             adhoc,
             new GoodJSONAble("otherthing"));
     assertEquals(blah, ModelCodec.decode(ModelCodec.encode(blah)));
diff --git a/espresso/web/javatests/androidx/test/espresso/web/model/SimpleAtomTest.java b/espresso/web/javatests/androidx/test/espresso/web/model/SimpleAtomTest.java
index d63dc9c50..8c1f4bafa 100644
--- a/espresso/web/javatests/androidx/test/espresso/web/model/SimpleAtomTest.java
+++ b/espresso/web/javatests/androidx/test/espresso/web/model/SimpleAtomTest.java
@@ -22,7 +22,8 @@
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
-import com.google.common.collect.Lists;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,7 +44,7 @@ public void testArgumentOrdering_noArgs() {
 
   @Test
   public void testArgumentOrdering_nonContextualArgsSupplied() {
-    final List<Object> vals = Lists.newArrayList(1, 2, 3, 4, 5);
+    final List<Object> vals = Arrays.asList(1, 2, 3, 4, 5);
     SimpleAtom atom =
         new SimpleAtom("return 1;") {
           @Override
@@ -55,14 +56,14 @@ public List<Object> getNonContextualArguments() {
 
     ElementReference elementReference = new ElementReference("dog");
     List<Object> withElement = atom.getArguments(elementReference);
-    List<Object> expected = Lists.newArrayList(vals);
+    List<Object> expected = new ArrayList<>(vals);
     expected.add(0, elementReference);
     assertEquals(expected, withElement);
   }
 
   @Test
   public void testArgumentOrdering_lastPlacement() {
-    final List<Object> vals = Lists.newArrayList(1, 2, 3, 4, 5);
+    final List<Object> vals = Arrays.asList(1, 2, 3, 4, 5);
     SimpleAtom atom =
         new SimpleAtom("return 1;", SimpleAtom.ElementReferencePlacement.LAST) {
           @Override
@@ -74,7 +75,7 @@ public List<Object> getNonContextualArguments() {
 
     ElementReference elementReference = new ElementReference("dog");
     List<Object> withElement = atom.getArguments(elementReference);
-    List<Object> expected = Lists.newArrayList(vals);
+    List<Object> expected = new ArrayList<>(vals);
     expected.add(elementReference);
     assertEquals(expected, withElement);
   }
diff --git a/ext/junit/BUILD b/ext/junit/BUILD
new file mode 100644
index 000000000..947e285b1
--- /dev/null
+++ b/ext/junit/BUILD
@@ -0,0 +1,14 @@
+# Publicly visible junit extensions for Android
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "junit",
+    actual = "//ext/junit/java/androidx/test/ext/junit",
+    visibility = ["//visibility:public"],
+)
diff --git a/ext/junit/BUILD.bazel b/ext/junit/BUILD.bazel
deleted file mode 100644
index 32f4a60a7..000000000
--- a/ext/junit/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-# Publicly visible junit extensions for Android
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "junit",
-    visibility = ["//visibility:public"],
-    exports = ["//ext/junit/java/androidx/test/ext/junit"],
-)
diff --git a/ext/junit/CHANGELOG.md b/ext/junit/CHANGELOG.md
new file mode 100644
index 000000000..b32f51bd8
--- /dev/null
+++ b/ext/junit/CHANGELOG.md
@@ -0,0 +1,20 @@
+### ext.junit {version} {:#ext.junit-{version}}
+
+{{date}}
+
+`androidx.test.ext:junit:{version}` and `androidx.test.ext:junit-ktx:{version}`
+are released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
index 9c9d31f75..6c442b412 100644
--- a/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
+++ b/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
@@ -17,8 +17,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.test.ext.junit" >
 
+
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/ext/junit/java/androidx/test/ext/junit/BUILD b/ext/junit/java/androidx/test/ext/junit/BUILD
new file mode 100644
index 000000000..038b666f6
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/BUILD
@@ -0,0 +1,75 @@
+# Description: Build rules for building androidx.test.junit from source
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# all users should reference the equivalent targets in //ext/junit
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+licenses(["notice"])
+
+kt_android_library(
+    name = "junit",
+    srcs = glob(
+        [
+            "**/*.java",
+            "**/*.kt",
+        ],
+    ),
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    tags = ["alt_dep=//ext/junit"],
+    deps = [
+        "//core",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/storage",
+        "@maven//:junit_junit",
+    ],
+)
+
+# group of targets to use to produce release binary + docs
+android_library(
+    name = "junit_release_lib",
+    custom_package = "androidx.test.ext.junit",
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:private"],
+    exports = [":junit"],
+    deps = [":junit"],
+)
+
+# Generate rules for the release artifacts.
+axt_android_aar(
+    name = "junit_aar",
+    expected_class_prefixes = [
+        "androidx.test.ext.junit",
+    ],
+    included_dep = ":junit_release_lib",
+)
+
+maven_artifact(
+    name = "junit_maven_artifact",
+    last_updated = "20180723000000",
+    target = ":junit_aar",
+)
+
+dackka_test(
+    name = "junit_doc",
+    runtime_dep = ":junit",
+    src_jar = ":junit_aar-src.jar",
+)
+
+api_checks(
+    name = "junit_api",
+    runtime_dep = ":junit",
+    src_jar = ":junit_aar-src.jar",
+)
diff --git a/ext/junit/java/androidx/test/ext/junit/BUILD.bazel b/ext/junit/java/androidx/test/ext/junit/BUILD.bazel
deleted file mode 100644
index a7c9218b0..000000000
--- a/ext/junit/java/androidx/test/ext/junit/BUILD.bazel
+++ /dev/null
@@ -1,63 +0,0 @@
-# Description: Build rules for building androidx.test.truth from source
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_JUNIT_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "JUNIT_VERSION", "MONITOR_VERSION")
-load("//build_extensions:release.bzl", "axt_release_lib")
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-android_library(
-    name = "junit",
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    manifest = "AndroidManifest.xml",
-    deps = [
-        "//:androidx_annotation",
-        "//core",
-        "//runner/monitor",
-        "@maven//:junit_junit",
-    ],
-)
-
-# group of targets to use to produce release binary + docs
-android_library(
-    name = "junit_release_lib",
-    testonly = 1,
-    exports = [
-        ":junit",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: junit_release_no_deps.jar and junit_release.aar
-# a java_library target libjunit_release_no_deps
-axt_release_lib(
-    name = "junit_release",
-    keep_spec = "androidx/test/ext/junit",
-    remove_spec = "androidx/test/ext/junit/R[$$\\.]",
-    deps = [
-        ":junit_release_lib",
-    ],
-)
-
-maven_artifact(
-    name = "junit_maven_artifact",
-    src = ":junit_release.aar",
-    artifact_deps = [
-        "junit:junit:%s" % JUNIT_VERSION,
-        "androidx.test:core:%s" % CORE_VERSION,
-        "androidx.test:monitor:%s" % MONITOR_VERSION,
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-    ],
-    artifact_id = "junit",
-    group_id = "androidx.test.ext",
-    last_updated = "20180723000000",
-    src_jar = ":libjunit-src.jar",
-    version = "%s" % ANDROIDX_JUNIT_VERSION,
-)
diff --git a/ext/junit/java/androidx/test/ext/junit/api/1.1.3_public.txt b/ext/junit/java/androidx/test/ext/junit/api/1.1.3_public.txt
new file mode 100644
index 000000000..aa17dbf1d
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/1.1.3_public.txt
@@ -0,0 +1,25 @@
+// Signature format: 3.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRule<A extends android.app.Activity> extends org.junit.rules.ExternalResource {
+    ctor public ActivityScenarioRule(Class<A!>!);
+    ctor public ActivityScenarioRule(Class<A!>!, android.os.Bundle?);
+    ctor public ActivityScenarioRule(android.content.Intent!);
+    ctor public ActivityScenarioRule(android.content.Intent!, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! getScenario();
+  }
+
+}
+
+package androidx.test.ext.junit.runners {
+
+  public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor public AndroidJUnit4(Class<?>!) throws org.junit.runners.model.InitializationError;
+    method public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method public org.junit.runner.Description! getDescription();
+    method public void run(org.junit.runner.notification.RunNotifier!);
+    method public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+}
+
diff --git a/ext/junit/java/androidx/test/ext/junit/api/1.1.4_internal.txt b/ext/junit/java/androidx/test/ext/junit/api/1.1.4_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/1.1.4_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ext/junit/java/androidx/test/ext/junit/api/1.2.0_internal.txt b/ext/junit/java/androidx/test/ext/junit/api/1.2.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/1.2.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ext/junit/java/androidx/test/ext/junit/api/1.2.0_public.txt b/ext/junit/java/androidx/test/ext/junit/api/1.2.0_public.txt
new file mode 100644
index 000000000..d0cea8689
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/1.2.0_public.txt
@@ -0,0 +1,35 @@
+// Signature format: 3.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRule<A extends android.app.Activity> extends org.junit.rules.ExternalResource {
+    ctor public ActivityScenarioRule(android.content.Intent!);
+    ctor public ActivityScenarioRule(android.content.Intent!, android.os.Bundle?);
+    ctor public ActivityScenarioRule(Class<A!>!);
+    ctor public ActivityScenarioRule(Class<A!>!, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! getScenario();
+  }
+
+  public final class AppComponentFactoryRule extends org.junit.rules.ExternalResource {
+    ctor public AppComponentFactoryRule(android.app.AppComponentFactory factory);
+    method protected void before();
+  }
+
+  public final class DeleteFilesRule implements org.junit.rules.TestRule {
+    ctor public DeleteFilesRule();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.ext.junit.runners {
+
+  public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor public AndroidJUnit4(Class<?>!) throws org.junit.runners.model.InitializationError;
+    method public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method public org.junit.runner.Description! getDescription();
+    method public void run(org.junit.runner.notification.RunNotifier!);
+    method public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+}
+
diff --git a/ext/junit/java/androidx/test/ext/junit/api/1.3.0_internal.txt b/ext/junit/java/androidx/test/ext/junit/api/1.3.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/1.3.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ext/junit/java/androidx/test/ext/junit/api/1.3.0_public.txt b/ext/junit/java/androidx/test/ext/junit/api/1.3.0_public.txt
new file mode 100644
index 000000000..1330fadf7
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/1.3.0_public.txt
@@ -0,0 +1,35 @@
+// Signature format: 3.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRule<A extends android.app.Activity> extends org.junit.rules.ExternalResource {
+    ctor public ActivityScenarioRule(android.content.Intent!);
+    ctor public ActivityScenarioRule(android.content.Intent!, android.os.Bundle?);
+    ctor public ActivityScenarioRule(Class<A!>!);
+    ctor public ActivityScenarioRule(Class<A!>!, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A!>! getScenario();
+  }
+
+  public final class AppComponentFactoryRule extends org.junit.rules.ExternalResource {
+    ctor public AppComponentFactoryRule(android.app.AppComponentFactory factory);
+    method protected void before();
+  }
+
+  public final class DeleteFilesRule implements org.junit.rules.TestRule {
+    ctor public DeleteFilesRule();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.ext.junit.runners {
+
+  public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor public AndroidJUnit4(Class<? extends java.lang.Object!>!) throws org.junit.runners.model.InitializationError;
+    method public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method public org.junit.runner.Description! getDescription();
+    method public void run(org.junit.runner.notification.RunNotifier!);
+    method public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+}
+
diff --git a/ext/junit/java/androidx/test/ext/junit/api/current_internal.txt b/ext/junit/java/androidx/test/ext/junit/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/ext/junit/java/androidx/test/ext/junit/api/current_public.txt b/ext/junit/java/androidx/test/ext/junit/api/current_public.txt
new file mode 100644
index 000000000..22da553e4
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/api/current_public.txt
@@ -0,0 +1,35 @@
+// Signature format: 5.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRule<A extends android.app.Activity> extends org.junit.rules.ExternalResource {
+    ctor public ActivityScenarioRule(android.content.Intent!);
+    ctor public ActivityScenarioRule(android.content.Intent!, android.os.Bundle?);
+    ctor public ActivityScenarioRule(Class<A>!);
+    ctor public ActivityScenarioRule(Class<A>!, android.os.Bundle?);
+    method public androidx.test.core.app.ActivityScenario<A>! getScenario();
+  }
+
+  public final class AppComponentFactoryRule extends org.junit.rules.ExternalResource {
+    ctor public AppComponentFactoryRule(android.app.AppComponentFactory factory);
+    method protected void before();
+  }
+
+  public final class DeleteFilesRule implements org.junit.rules.TestRule {
+    ctor public DeleteFilesRule();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.ext.junit.runners {
+
+  public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor public AndroidJUnit4(Class<? extends java.lang.Object!>!) throws org.junit.runners.model.InitializationError;
+    method public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method public org.junit.runner.Description! getDescription();
+    method public void run(org.junit.runner.notification.RunNotifier!);
+    method public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+}
+
diff --git a/ext/junit/java/androidx/test/ext/junit/rules/ActivityScenarioRule.java b/ext/junit/java/androidx/test/ext/junit/rules/ActivityScenarioRule.java
index d51d6068d..72611f5fb 100644
--- a/ext/junit/java/androidx/test/ext/junit/rules/ActivityScenarioRule.java
+++ b/ext/junit/java/androidx/test/ext/junit/rules/ActivityScenarioRule.java
@@ -21,6 +21,8 @@
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.core.app.ActivityScenario;
 import org.junit.rules.ExternalResource;
 
@@ -31,18 +33,22 @@
  * #getScenario()}. You may finish your activity manually in your test, it will not cause any
  * problems and this rule does nothing after the test in such cases.
  *
- * <p>This rule is an upgraded version of the now deprecated {@link
- * androidx.test.rule.ActivityTestRule}.
+ * <p>This rule is an upgraded version of the now deprecated <br>
+ * {@link androidx.test.rule.ActivityTestRule}.
+ *
+ * <p>This rule does not support calling scenario.getResult(). Use
+ * ActivityScenario.launchActivityForResult() when the Activity result is needed.
  *
  * <p>Example:
  *
  * <pre>
  *   &#64;Rule
- *   public ActivityScenarioRule<MyActivity> rule = new ActivityScenarioRule<>(MyActivity.class);
+ *   public ActivityScenarioRule&lt;MyActivity&gt; rule =
+ *       new ActivityScenarioRule&lt;&gt;(MyActivity.class);
  *
  *   &#64;Test
  *   public void myTest() {
- *     ActivityScenario<MyActivity> scenario = rule.getScenario();
+ *     ActivityScenario&lt;MyActivity&gt; scenario = rule.getScenario();
  *     // Your test code goes here.
  *   }
  * </pre>
@@ -54,6 +60,7 @@ public final class ActivityScenarioRule<A extends Activity> extends ExternalReso
    *
    * @hide
    */
+  @RestrictTo(Scope.LIBRARY)
   interface Supplier<T> {
     T get();
   }
@@ -72,6 +79,7 @@ public ActivityScenarioRule(Class<A> activityClass) {
 
   /**
    * @see #ActivityScenarioRule(Class)
+   * @param activityClass an activity class to launch
    * @param activityOptions an activity options bundle to be passed along with the intent to start
    *     activity.
    */
@@ -90,6 +98,7 @@ public ActivityScenarioRule(Intent startActivityIntent) {
 
   /**
    * @see #ActivityScenarioRule(Intent)
+   * @param startActivityIntent an intent to start an activity
    * @param activityOptions an activity options bundle to be passed along with the intent to start
    *     activity.
    */
diff --git a/ext/junit/java/androidx/test/ext/junit/rules/AppComponentFactoryRule.kt b/ext/junit/java/androidx/test/ext/junit/rules/AppComponentFactoryRule.kt
new file mode 100644
index 000000000..645b851d5
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/rules/AppComponentFactoryRule.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.junit.rules
+
+import android.app.AppComponentFactory
+import android.os.Build
+import androidx.test.platform.app.AppComponentFactoryRegistry
+import org.junit.Rule
+import org.junit.rules.ExternalResource
+
+/**
+ * JUnit [Rule] that let you define a [AppComponentFactory] before the tests starts and clean-up
+ * the factory after the test.
+ *
+ * This rule is designed to be used with [ActivityScenarioRule].
+ *
+ * Example:
+ *
+ * ```kotlin
+ * // We use `order`  to to ensure the `AppComponentFactoryRule` will always run BEFORE the
+ * // `ActivityScenarioRule` so that your custom `AppComponentFactory` is available when the
+ * // activity is launched.
+ * @get:Rule(order = 1)
+ * val factoryRule = AppComponentFactoryRule(MyAppComponentFactory())
+ *
+ * @get:Rule(order = 2)
+ * val activityRule = ActivityScenarioRule<MyActivity>()
+ * ```
+ */
+class AppComponentFactoryRule(private val factory: AppComponentFactory) : ExternalResource() {
+
+  override fun before() {
+    check(Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      "AppComponentFactoryRule is not supported on 'VERSION.SDK_INT < VERSION_CODES.P'"
+    }
+    AppComponentFactoryRegistry.appComponentFactory = factory
+  }
+
+  override fun after() {
+    AppComponentFactoryRegistry.appComponentFactory = null
+  }
+}
diff --git a/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java b/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java
new file mode 100644
index 000000000..8244a2e14
--- /dev/null
+++ b/ext/junit/java/androidx/test/ext/junit/rules/DeleteFilesRule.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.junit.rules;
+
+import android.content.Context;
+import android.os.Build;
+import android.os.Environment;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Deletes files recursively in Android storage directories after each test.
+ *
+ * <p>This ensures that each test case has a clean slate in terms of the file system, such that
+ * files created in one test don't impact any other test.
+ *
+ * <p>Files that are present at the start of the test are not deleted at the end.
+ *
+ * <p>Directories that are impacted are
+ *
+ * <ul>
+ *   <li>{@code context.getApplicationInfo().dataDir}
+ *   <li>{@link Environment#getExternalStorageDirectory()}
+ *   <li>{@link Environment#getDownloadCacheDirectory()}
+ *   <li>{@link Context#getExternalCacheDir()}
+ *   <li>{@link Context#getNoBackupFilesDir()} (Android 21+)
+ *   <li>{@code context.getApplicationInfo().deviceProtectedDataDir} (Android 24+)
+ * </ul>
+ */
+public final class DeleteFilesRule implements TestRule {
+
+  @Override
+  public Statement apply(final Statement base, Description description) {
+    return new Statement() {
+      @Override
+      public void evaluate() throws Throwable {
+        Context context = ApplicationProvider.getApplicationContext();
+
+        List<File> directories = new ArrayList<>();
+        directories.add(new File(context.getApplicationInfo().dataDir));
+        directories.add(Environment.getExternalStorageDirectory());
+        directories.add(Environment.getDownloadCacheDirectory());
+        if (context.getExternalCacheDir() != null) {
+          directories.add(context.getExternalCacheDir());
+        }
+        if (Build.VERSION.SDK_INT >= 21) {
+          directories.add(context.getNoBackupFilesDir());
+        }
+        if (Build.VERSION.SDK_INT >= 24) {
+          directories.add(new File(context.getApplicationInfo().deviceProtectedDataDir));
+        }
+
+        Set<File> existingFiles = new HashSet<>();
+        for (File directory : directories) {
+          findFilesRecursively(existingFiles, directory);
+        }
+        try {
+          base.evaluate();
+        } finally {
+          for (File directory : directories) {
+            deleteFilesRecursively(existingFiles, directory);
+          }
+        }
+      }
+    };
+  }
+
+  private static boolean isConstant(File file) {
+    return file.getName().endsWith(".dex");
+  }
+
+  private static void findFilesRecursively(Set<File> existingFiles, File directory) {
+    File[] files = directory.listFiles();
+    if (files != null) {
+      for (File file : files) {
+        existingFiles.add(file);
+        if (file.isDirectory()) {
+          findFilesRecursively(existingFiles, file);
+        }
+      }
+    }
+  }
+
+  private static void deleteFilesRecursively(Set<File> existingFiles, File directory) {
+    File[] files = directory.listFiles();
+    if (files != null) {
+      for (File file : files) {
+        if (file.isDirectory()) {
+          if (PlatformTestStorageRegistry.getInstance().isTestStorageFilePath(file.getPath())) {
+            continue;
+          }
+          deleteFilesRecursively(existingFiles, file);
+          if (!existingFiles.contains(file) && file.exists()) {
+            File[] filesInDirectory = file.listFiles();
+            if (filesInDirectory == null && !file.delete()) {
+              System.err.println(
+                  "DeleteRules failed to delete (not a directory or I/O error): " + file);
+            } else if (filesInDirectory.length == 0 && !file.delete()) {
+              System.err.println("DeleteRules failed to delete: " + file);
+            }
+          }
+        } else {
+          if (!existingFiles.contains(file) && file.exists() && !isConstant(file)) {
+            if (!file.delete()) {
+              System.err.println("DeleteRules failed to delete: " + file);
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/ext/junit/java/androidx/test/ext/junit/runners/AndroidJUnit4.java b/ext/junit/java/androidx/test/ext/junit/runners/AndroidJUnit4.java
index cdc1a76ee..95cbf9432 100644
--- a/ext/junit/java/androidx/test/ext/junit/runners/AndroidJUnit4.java
+++ b/ext/junit/java/androidx/test/ext/junit/runners/AndroidJUnit4.java
@@ -36,12 +36,12 @@
  *
  * <ul>
  *   <li>Supports running on Robolectric. This implementation will delegate to RobolectricTestRunner
- *       if test is running in Robolectric enviroment. A custom runner can be provided by specifying
- *       the full class name in a 'android.junit.runner' system property.
- *   <li>Supports a per-test timeout - specfied via a 'timeout_msec' {@link
+ *       if test is running in Robolectric environment. A custom runner can be provided by
+ *       specifying the full class name in a 'android.junit.runner' system property.
+ *   <li>Supports a per-test timeout - specified via a 'timeout_msec' {@link
  *       androidx.test.runner.AndroidJUnitRunner} argument.
  *   <li>Supports running tests on the application's UI Thread, for tests annotated with {@link
- *       UiThreadTest}.
+ *       androidx.test.annotation.UiThreadTest}.
  * </ul>
  *
  * <p>Usage {@code @RunWith(AndroidJUnit4.class)}
diff --git a/ext/junit/javatests/androidx/test/ext/junit/BUILD.bazel b/ext/junit/javatests/androidx/test/ext/junit/BUILD.bazel
deleted file mode 100644
index 6640b56fe..000000000
--- a/ext/junit/javatests/androidx/test/ext/junit/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-licenses(["notice"])  # Apache License 2.0
-
-load("//build_extensions:android_library_instrumentation_tests.bzl", "android_library_instrumentation_tests")
-load("//build_extensions:android_library_local_tests.bzl", "android_library_local_tests")
-load("//build_extensions:test_devices.bzl", "devices")
-
-android_library_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = ["**/ActivityScenarioTest.java"],
-    ),
-    target_devices = devices(),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ext/truth",
-        "//runner/android_junit_runner",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library_local_tests(
-    name = "local_tests",
-    srcs = glob(["**/*.java"]),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core/java/androidx/test/core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ext/truth",
-        "//runner/monitor/java/androidx/test:monitor",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
diff --git a/ext/junit/javatests/androidx/test/ext/junit/rules/AppComponentFactoryRuleTest.kt b/ext/junit/javatests/androidx/test/ext/junit/rules/AppComponentFactoryRuleTest.kt
new file mode 100644
index 000000000..46a72882c
--- /dev/null
+++ b/ext/junit/javatests/androidx/test/ext/junit/rules/AppComponentFactoryRuleTest.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.junit.rules
+
+import android.app.Activity
+import android.app.AppComponentFactory
+import android.app.Application
+import android.content.Intent
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+class AppComponentFactoryRuleTest {
+
+  private val appComponentFactoryRule = AppComponentFactoryRule(DummyAppComponentFactory())
+
+  private val activityScenarioRule = ActivityScenarioRule(DummyActivity::class.java)
+
+  @[JvmField Rule]
+  val ruleChain: RuleChain =
+    RuleChain.outerRule(appComponentFactoryRule).around(activityScenarioRule)
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldCreateNewAppComponentsUsingAppComponentFactorySet() {
+    activityScenarioRule.scenario.onActivity { activity: DummyActivity ->
+      assertThat(activity.text).isEqualTo("instantiateActivity")
+      assertThat(activity.application).isInstanceOf(DummyApplication::class.java)
+      assertThat((activity.application as DummyApplication).text)
+        .isEqualTo("instantiateApplication")
+    }
+  }
+}
+
+private class DummyAppComponentFactory : AppComponentFactory() {
+  override fun instantiateApplication(cl: ClassLoader, className: String): Application =
+    if (className == DummyApplication::class.java.name) {
+      DummyApplication(text = "instantiateApplication")
+    } else {
+      super.instantiateApplication(cl, className)
+    }
+
+  override fun instantiateActivity(cl: ClassLoader, className: String, intent: Intent?): Activity =
+    if (className == DummyActivity::class.java.name) {
+      DummyActivity(text = "instantiateActivity")
+    } else {
+      super.instantiateActivity(cl, className, intent)
+    }
+}
+
+private class DummyApplication(val text: String) : Application()
+
+private class DummyActivity(val text: String) : Activity()
diff --git a/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
new file mode 100644
index 000000000..f1dbdc9de
--- /dev/null
+++ b/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
@@ -0,0 +1,76 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "ActivityScenarioRuleTest",
+    srcs = ["ActivityScenarioRuleTest.java"],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ActivityScenarioRuleTest_android",
+    srcs = ["ActivityScenarioRuleTest.java"],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ActivityScenarioRuleWithCustomIntentTest_android",
+    srcs = ["ActivityScenarioRuleWithCustomIntentTest.java"],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "DeleteFilesRuleTest",
+    srcs = ["DeleteFilesRuleTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "DeleteFilesRuleTest_android",
+    srcs = ["DeleteFilesRuleTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ext/junit/javatests/androidx/test/ext/junit/rules/DeleteFilesRuleTest.java b/ext/junit/javatests/androidx/test/ext/junit/rules/DeleteFilesRuleTest.java
new file mode 100644
index 000000000..36f703b15
--- /dev/null
+++ b/ext/junit/javatests/androidx/test/ext/junit/rules/DeleteFilesRuleTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.junit.rules;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.io.File;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.model.Statement;
+
+/** Test cases for {@link DeleteFilesRule}. */
+@RunWith(AndroidJUnit4.class)
+public final class DeleteFilesRuleTest {
+  @Rule
+  public RuleChain chain = RuleChain.outerRule(EXISTING_FILE_RULE).around(new DeleteFilesRule());
+
+  private static final TestRule EXISTING_FILE_RULE =
+      (base, description) ->
+          new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+              getApplicationContext()
+                  .openOrCreateDatabase("existing.db", Context.MODE_PRIVATE, null);
+              File existingDb = getApplicationContext().getDatabasePath("existing.db");
+              File existingFile = new File(getFilesDir(), "existingFile.txt");
+              File existingDir = new File(getFilesDir(), "existingDir");
+              try {
+                existingFile.createNewFile();
+                existingDir.mkdir();
+                base.evaluate();
+              } finally {
+                assertThat(existingDb.exists()).isTrue();
+                assertThat(existingDb.delete()).isTrue();
+                assertThat(existingFile.exists()).isTrue();
+                assertThat(existingFile.delete()).isTrue();
+                assertThat(existingDir.exists()).isTrue();
+                assertThat(existingDir.delete()).isTrue();
+              }
+            }
+          };
+
+  @Test
+  public void testDeleteFilesRule1() throws Exception {
+    checkDatabaseDoesNotAlreadyExist();
+    checkFileDoesNotAlreadyExist();
+  }
+
+  @Test
+  public void testDeleteFilesRule2() throws Exception {
+    checkDatabaseDoesNotAlreadyExist();
+    checkFileDoesNotAlreadyExist();
+  }
+
+  private void checkDatabaseDoesNotAlreadyExist() {
+    String name = "cool.db";
+    Context context = getApplicationContext();
+
+    // Create a new database and make sure that it did not already exist.
+    assertThat(context.getDatabasePath(name).exists()).isFalse();
+    context.openOrCreateDatabase(name, Context.MODE_PRIVATE, null);
+    assertThat(context.getDatabasePath(name).exists()).isTrue();
+  }
+
+  private void checkFileDoesNotAlreadyExist() throws Exception {
+    File filesDir = getFilesDir();
+
+    // Create a new file and make sure that it did not already exist
+    assertThat(new File(filesDir, "deletemeorforeverbeflaky.txt").createNewFile()).isTrue();
+
+    // Create a new file in a subdirectory and make sure that it did not already exist
+    File subdirectory = new File(filesDir, "wehavefiles");
+    assertThat(subdirectory.mkdir()).isTrue();
+    assertThat(new File(subdirectory, "wehavethebestfiles.txt").createNewFile()).isTrue();
+  }
+
+  private static File getFilesDir() {
+    return getApplicationContext().getFilesDir();
+  }
+}
diff --git a/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD b/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD
new file mode 100644
index 000000000..7678d6445
--- /dev/null
+++ b/ext/junit/javatests/androidx/test/ext/junit/runners/BUILD
@@ -0,0 +1,37 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "AndroidJUnit4Test",
+    srcs = ["AndroidJUnit4Test.java"],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "AndroidJUnit4Test_android",
+    srcs = ["AndroidJUnit4Test.java"],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ext/truth/BUILD b/ext/truth/BUILD
new file mode 100644
index 000000000..d29a21dce
--- /dev/null
+++ b/ext/truth/BUILD
@@ -0,0 +1,17 @@
+# Publicly visible truth extensions for Android
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# This needs to be a java_library instead of an alias, so java_* based rules can reference it
+java_library(
+    name = "truth",
+    visibility = ["//visibility:public"],
+    exports = ["//ext/truth/java/androidx/test/ext/truth"],
+)
diff --git a/ext/truth/BUILD.bazel b/ext/truth/BUILD.bazel
deleted file mode 100644
index b500a4cf2..000000000
--- a/ext/truth/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-# Publicly visible truth extensions for Android
-
-licenses(["notice"])  # Apache License 2.0
-
-# This needs to be a java_library instead of an alias, so java_* based rules can reference it
-java_library(
-    name = "truth",
-    visibility = ["//visibility:public"],
-    exports = ["//ext/truth/java/androidx/test/ext/truth"],
-)
diff --git a/ext/truth/CHANGELOG.md b/ext/truth/CHANGELOG.md
new file mode 100644
index 000000000..0613c94af
--- /dev/null
+++ b/ext/truth/CHANGELOG.md
@@ -0,0 +1,25 @@
+### ext.truth {version} {:#ext.truth-{version}}
+
+{{date}}
+
+`androidx.test.ext:truth:{version}` is released.
+
+**Bug Fixes**
+
+**New Features**
+
+* `BundleSubject` and `PersistableBundleSubject` now share `BaseBundle` support,
+  including additional array type assertions
+* `PersistableBundleSubject` now supports `isEqualTo` and `isNotEqualTo` for
+  direct comparison between two `PersistableBundle`'s.
+* Added `integerArrayList` method to `BundleSubject`.
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml b/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml
index 289f3eefd..8e66c3929 100644
--- a/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml
+++ b/ext/truth/java/androidx/test/ext/truth/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.ext.truth" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/ext/truth/java/androidx/test/ext/truth/BUILD b/ext/truth/java/androidx/test/ext/truth/BUILD
new file mode 100644
index 000000000..81af8641a
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/BUILD
@@ -0,0 +1,63 @@
+# Description: Build rules for building androidx.test.truth from source
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# all users should reference the equivalent targets in //ext/truth
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__pkg__",
+        "//ext/truth:__subpackages__",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "truth",
+    srcs = glob(
+        ["**/*.java"],
+    ),
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//opensource/androidx:annotation",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+# Generate rules for the release artifacts.
+axt_android_aar(
+    name = "truth_aar",
+
+    # omit banned check for guava, since its a dependency of upstream truth
+    banned_maven_deps = ["com.google.dagger"],
+    expected_class_prefixes = [
+        "androidx.test.ext.truth",
+    ],
+    included_dep = ":truth",
+)
+
+maven_artifact(
+    name = "truth_maven_artifact",
+    last_updated = "20180321000000",
+    target = ":truth_aar",
+)
+
+dackka_test(
+    name = "truth_doc",
+    runtime_dep = ":truth",
+    src_jar = ":truth_aar-src.jar",
+)
+
+api_checks(
+    name = "truth_api",
+    runtime_dep = ":truth",
+    src_jar = ":truth_aar-src.jar",
+)
diff --git a/ext/truth/java/androidx/test/ext/truth/BUILD.bazel b/ext/truth/java/androidx/test/ext/truth/BUILD.bazel
deleted file mode 100644
index ed518329b..000000000
--- a/ext/truth/java/androidx/test/ext/truth/BUILD.bazel
+++ /dev/null
@@ -1,64 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_TRUTH_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "GUAVA_VERSION", "TRUTH_VERSION")
-
-# Description: Build rules for building androidx.test.truth from source
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-android_library(
-    name = "truth",
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    manifest = "AndroidManifest.xml",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-        "//core",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-    ],
-)
-
-# group of targets to use to produce release binary + docs
-android_library(
-    name = "truth_release_lib",
-    testonly = 1,
-    exports = [
-        ":truth",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: truth_release_no_deps.jar and truth_release.aar
-# a java_library target libtruth_release_no_deps
-axt_release_lib(
-    name = "truth_release",
-    keep_spec = "androidx/test/ext/truth",
-    remove_spec = "androidx/test/ext/truth/R[$$\\.]",
-    deps = [
-        ":truth_release_lib",
-    ],
-)
-
-maven_artifact(
-    name = "truth_maven_artifact",
-    src = ":truth_release.aar",
-    artifact_deps = [
-        "androidx.test:core:%s" % CORE_VERSION,
-        "com.google.guava:guava:%s" % GUAVA_VERSION,
-        "com.google.truth:truth:%s" % TRUTH_VERSION,
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-    ],
-    artifact_id = "truth",
-    group_id = "androidx.test.ext",
-    last_updated = "20180321000000",
-    src_jar = ":libtruth-src.jar",
-    version = "%s" % ANDROIDX_TRUTH_VERSION,
-)
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.4.0_public.txt b/ext/truth/java/androidx/test/ext/truth/api/1.4.0_public.txt
new file mode 100644
index 000000000..ab0a29219
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.4.0_public.txt
@@ -0,0 +1,226 @@
+// Signature format: 3.0
+package androidx.test.ext.truth.app {
+
+  public class NotificationActionSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationActionSubject! assertThat(android.app.Notification.Action!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationActionSubject!,android.app.Notification.Action!>! notificationActions();
+    method public final com.google.common.truth.StringSubject! title();
+  }
+
+  public class NotificationSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationSubject! assertThat(android.app.Notification!);
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! contentIntent();
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! deleteIntent();
+    method public final void doesNotHaveFlags(int);
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public final void hasFlags(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationSubject!,android.app.Notification!>! notifications();
+    method public final com.google.common.truth.StringSubject! tickerText();
+  }
+
+  public class PendingIntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.PendingIntentSubject! assertThat(android.app.PendingIntent!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.PendingIntentSubject!,android.app.PendingIntent!>! pendingIntents();
+  }
+
+}
+
+package androidx.test.ext.truth.content {
+
+  public final class IntentCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! action();
+    method @com.google.common.annotations.Beta public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...);
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! data();
+  }
+
+  public final class IntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.content.IntentSubject! assertThat(android.content.Intent!);
+    method public com.google.common.truth.IterableSubject! categories();
+    method public androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void filtersEquallyTo(android.content.Intent!);
+    method public void hasAction(String!);
+    method public void hasComponent(String!, String!);
+    method public void hasComponent(android.content.ComponentName!);
+    method public void hasComponentClass(Class<?>!);
+    method public void hasComponentClass(String!);
+    method public void hasComponentPackage(String!);
+    method public void hasData(android.net.Uri!);
+    method public void hasFlags(int);
+    method public void hasNoAction();
+    method public void hasPackage(String!);
+    method public void hasType(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.content.IntentSubject!,android.content.Intent!>! intents();
+  }
+
+}
+
+package androidx.test.ext.truth.location {
+
+  public final class LocationCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! at();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! equality();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! nearby(float);
+  }
+
+  public class LocationSubject extends com.google.common.truth.Subject {
+    method public com.google.common.truth.FloatSubject! accuracy();
+    method public com.google.common.truth.DoubleSubject! altitude();
+    method public static androidx.test.ext.truth.location.LocationSubject! assertThat(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearing();
+    method public com.google.common.truth.FloatSubject! bearingAccuracy();
+    method public com.google.common.truth.FloatSubject! bearingTo(double, double);
+    method public com.google.common.truth.FloatSubject! bearingTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! distanceTo(double, double);
+    method public com.google.common.truth.FloatSubject! distanceTo(android.location.Location!);
+    method public void doesNotHaveProvider(String!);
+    method public com.google.common.truth.LongSubject! elapsedRealtimeMillis();
+    method public com.google.common.truth.LongSubject! elapsedRealtimeNanos();
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void hasAccuracy();
+    method public void hasAltitude();
+    method public void hasBearing();
+    method public void hasBearingAccuracy();
+    method public void hasProvider(String!);
+    method public void hasSpeed();
+    method public void hasSpeedAccuracy();
+    method public void hasVerticalAccuracy();
+    method public void isAt(android.location.Location!);
+    method public void isAt(double, double);
+    method public void isFaraway(android.location.Location!, float);
+    method public void isMock();
+    method public void isNearby(android.location.Location!, float);
+    method public void isNotAt(android.location.Location!);
+    method public void isNotAt(double, double);
+    method public void isNotMock();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.location.LocationSubject!,android.location.Location!>! locations();
+    method public com.google.common.truth.FloatSubject! speed();
+    method public com.google.common.truth.FloatSubject! speedAccuracy();
+    method public com.google.common.truth.LongSubject! time();
+    method public com.google.common.truth.FloatSubject! verticalAccuracy();
+  }
+
+}
+
+package androidx.test.ext.truth.os {
+
+  public final class BundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.BundleSubject! assertThat(android.os.Bundle!);
+    method public com.google.common.truth.BooleanSubject! bool(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.BundleSubject!,android.os.Bundle!>! bundles();
+    method public void containsKey(String!);
+    method public void doesNotContainKey(String!);
+    method public void hasSize(int);
+    method public com.google.common.truth.IntegerSubject! integer(String!);
+    method public void isEmpty();
+    method public void isNotEmpty();
+    method public com.google.common.truth.LongSubject! longInt(String!);
+    method public <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! parcelable(String!);
+    method public com.google.common.truth.IterableSubject! parcelableArrayList(String!);
+    method public <T extends android.os.Parcelable, SubjectT extends com.google.common.truth.Subject> SubjectT! parcelableAsType(String!, com.google.common.truth.Subject.Factory<SubjectT!,T!>!);
+    method public com.google.common.truth.StringSubject! string(String!);
+    method public com.google.common.truth.IterableSubject! stringArrayList(String!);
+  }
+
+  public final class ParcelableSubject<T extends android.os.Parcelable> extends com.google.common.truth.Subject {
+    method public static <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! assertThat(T!);
+    method public static <T extends android.os.Parcelable> com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.ParcelableSubject<T!>!,T!>! parcelables();
+    method public void recreatesEqual(android.os.Parcelable.Creator<T!>!);
+  }
+
+}
+
+package androidx.test.ext.truth.util {
+
+  public final class SparseBooleanArraySubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.util.SparseBooleanArraySubject! assertThat(android.util.SparseBooleanArray!);
+    method public void containsKey(int);
+    method public void doesNotContainKey(int);
+    method public static AssertionError! expectFailure(com.google.common.truth.ExpectFailure.SimpleSubjectBuilderCallback<androidx.test.ext.truth.util.SparseBooleanArraySubject!,android.util.SparseBooleanArray!>!);
+    method public void hasFalseValueAt(int);
+    method public void hasSize(int);
+    method public void hasTrueValueAt(int);
+    method public void isEmpty();
+    method public void isNotEmpty();
+  }
+
+}
+
+package androidx.test.ext.truth.view {
+
+  public final class MotionEventSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.MotionEventSubject! assertThat(android.view.MotionEvent!);
+    method public void hasAction(int);
+    method public void hasActionButton(int);
+    method public void hasButtonState(int);
+    method public void hasDeviceId(int);
+    method public void hasDownTime(long);
+    method public void hasEdgeFlags(int);
+    method public void hasEventTime(long);
+    method public void hasFlags(int);
+    method public void hasHistorySize(int);
+    method public void hasMetaState(int);
+    method public void hasPointerCount(int);
+    method public com.google.common.truth.LongSubject! historicalEventTime(int);
+    method public com.google.common.truth.FloatSubject! historicalOrientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! historicalPointerCoords(int, int);
+    method public com.google.common.truth.FloatSubject! historicalPressure(int);
+    method public com.google.common.truth.FloatSubject! historicalSize(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalX(int);
+    method public com.google.common.truth.FloatSubject! historicalY(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.MotionEventSubject!,android.view.MotionEvent!>! motionEvents();
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public com.google.common.truth.FloatSubject! orientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! pointerCoords(int);
+    method public com.google.common.truth.IntegerSubject! pointerId(int);
+    method public androidx.test.ext.truth.view.PointerPropertiesSubject! pointerProperties(int);
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! pressure(int);
+    method public com.google.common.truth.FloatSubject! rawX();
+    method public com.google.common.truth.FloatSubject! rawY();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! size(int);
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMajor(int);
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! toolMinor(int);
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMajor(int);
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! touchMinor(int);
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! x(int);
+    method public com.google.common.truth.FloatSubject! xPrecision();
+    method public com.google.common.truth.FloatSubject! y();
+    method public com.google.common.truth.FloatSubject! y(int);
+    method public com.google.common.truth.FloatSubject! yPrecision();
+  }
+
+  public final class PointerCoordsSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerCoordsSubject! assertThat(android.view.MotionEvent.PointerCoords!);
+    method public com.google.common.truth.FloatSubject! axisValue(int);
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerCoordsSubject!,android.view.MotionEvent.PointerCoords!>! pointerCoords();
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! y();
+  }
+
+  public final class PointerPropertiesSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerPropertiesSubject! assertThat(android.view.MotionEvent.PointerProperties!);
+    method public void hasId(int);
+    method public void hasToolType(int);
+    method public void isEqualTo(android.view.MotionEvent.PointerProperties!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerPropertiesSubject!,android.view.MotionEvent.PointerProperties!>! pointerProperties();
+  }
+
+}
+
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.5.0_internal.txt b/ext/truth/java/androidx/test/ext/truth/api/1.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.5.0_public.txt b/ext/truth/java/androidx/test/ext/truth/api/1.5.0_public.txt
new file mode 100644
index 000000000..96d9205b5
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.5.0_public.txt
@@ -0,0 +1,230 @@
+// Signature format: 3.0
+package androidx.test.ext.truth.app {
+
+  public class NotificationActionSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationActionSubject! assertThat(android.app.Notification.Action!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationActionSubject!,android.app.Notification.Action!>! notificationActions();
+    method public final com.google.common.truth.StringSubject! title();
+  }
+
+  public class NotificationSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationSubject! assertThat(android.app.Notification!);
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! contentIntent();
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! deleteIntent();
+    method public final void doesNotHaveFlags(int);
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public final void hasFlags(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationSubject!,android.app.Notification!>! notifications();
+    method public final com.google.common.truth.StringSubject! tickerText();
+  }
+
+  public class PendingIntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.PendingIntentSubject! assertThat(android.app.PendingIntent!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.PendingIntentSubject!,android.app.PendingIntent!>! pendingIntents();
+  }
+
+}
+
+package androidx.test.ext.truth.content {
+
+  public final class IntentCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! action();
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...);
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! data();
+  }
+
+  public final class IntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.content.IntentSubject! assertThat(android.content.Intent!);
+    method public com.google.common.truth.IterableSubject! categories();
+    method public androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void filtersEquallyTo(android.content.Intent!);
+    method public void hasAction(String!);
+    method public void hasComponent(String!, String!);
+    method public void hasComponent(android.content.ComponentName!);
+    method public void hasComponentClass(Class<?>!);
+    method public void hasComponentClass(String!);
+    method public void hasComponentPackage(String!);
+    method public void hasData(android.net.Uri!);
+    method public void hasFlags(int);
+    method public void hasNoAction();
+    method public void hasPackage(String!);
+    method public void hasType(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.content.IntentSubject!,android.content.Intent!>! intents();
+  }
+
+}
+
+package androidx.test.ext.truth.location {
+
+  public final class LocationCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! at();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! equality();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! nearby(float);
+  }
+
+  public class LocationSubject extends com.google.common.truth.Subject {
+    method public com.google.common.truth.FloatSubject! accuracy();
+    method public com.google.common.truth.DoubleSubject! altitude();
+    method public static androidx.test.ext.truth.location.LocationSubject! assertThat(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearing();
+    method public com.google.common.truth.FloatSubject! bearingAccuracy();
+    method public com.google.common.truth.FloatSubject! bearingTo(double, double);
+    method public com.google.common.truth.FloatSubject! bearingTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! distanceTo(double, double);
+    method public com.google.common.truth.FloatSubject! distanceTo(android.location.Location!);
+    method public void doesNotHaveProvider(String!);
+    method public com.google.common.truth.LongSubject! elapsedRealtimeMillis();
+    method public com.google.common.truth.LongSubject! elapsedRealtimeNanos();
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void hasAccuracy();
+    method public void hasAltitude();
+    method public void hasBearing();
+    method public void hasBearingAccuracy();
+    method public void hasProvider(String!);
+    method public void hasSpeed();
+    method public void hasSpeedAccuracy();
+    method public void hasVerticalAccuracy();
+    method public void isAt(android.location.Location!);
+    method public void isAt(double, double);
+    method public void isFaraway(android.location.Location!, float);
+    method public void isMock();
+    method public void isNearby(android.location.Location!, float);
+    method public void isNotAt(android.location.Location!);
+    method public void isNotAt(double, double);
+    method public void isNotMock();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.location.LocationSubject!,android.location.Location!>! locations();
+    method public com.google.common.truth.FloatSubject! speed();
+    method public com.google.common.truth.FloatSubject! speedAccuracy();
+    method public com.google.common.truth.LongSubject! time();
+    method public com.google.common.truth.FloatSubject! verticalAccuracy();
+  }
+
+}
+
+package androidx.test.ext.truth.os {
+
+  public final class BundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.BundleSubject! assertThat(android.os.Bundle!);
+    method public com.google.common.truth.BooleanSubject! bool(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.BundleSubject!,android.os.Bundle!>! bundles();
+    method public void containsKey(String!);
+    method public void doesNotContainKey(String!);
+    method public com.google.common.truth.DoubleSubject doubleFloat(String);
+    method public void hasSize(int);
+    method public com.google.common.truth.IntegerSubject! integer(String!);
+    method public void isEmpty();
+    method public void isNotEmpty();
+    method public com.google.common.truth.LongSubject! longInt(String!);
+    method public <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! parcelable(String!);
+    method public com.google.common.truth.IterableSubject! parcelableArrayList(String!);
+    method public <T extends android.os.Parcelable, SubjectT extends com.google.common.truth.Subject> SubjectT! parcelableAsType(String!, com.google.common.truth.Subject.Factory<SubjectT!,T!>!);
+    method public com.google.common.truth.Subject! serializable(String!);
+    method public com.google.common.truth.StringSubject! string(String!);
+    method public com.google.common.truth.ObjectArraySubject<java.lang.String!> stringArray(String);
+    method public com.google.common.truth.IterableSubject! stringArrayList(String!);
+  }
+
+  public final class ParcelableSubject<T extends android.os.Parcelable> extends com.google.common.truth.Subject {
+    method public static <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! assertThat(T!);
+    method public void marshallsEquallyTo(android.os.Parcelable!);
+    method public static <T extends android.os.Parcelable> com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.ParcelableSubject<T!>!,T!>! parcelables();
+    method public void recreatesEqual(android.os.Parcelable.Creator<T!>!);
+  }
+
+}
+
+package androidx.test.ext.truth.util {
+
+  public final class SparseBooleanArraySubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.util.SparseBooleanArraySubject! assertThat(android.util.SparseBooleanArray!);
+    method public void containsKey(int);
+    method public void doesNotContainKey(int);
+    method public static AssertionError! expectFailure(com.google.common.truth.ExpectFailure.SimpleSubjectBuilderCallback<androidx.test.ext.truth.util.SparseBooleanArraySubject!,android.util.SparseBooleanArray!>!);
+    method public void hasFalseValueAt(int);
+    method public void hasSize(int);
+    method public void hasTrueValueAt(int);
+    method public void isEmpty();
+    method public void isNotEmpty();
+  }
+
+}
+
+package androidx.test.ext.truth.view {
+
+  public final class MotionEventSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.MotionEventSubject! assertThat(android.view.MotionEvent!);
+    method public void hasAction(int);
+    method public void hasActionButton(int);
+    method public void hasButtonState(int);
+    method public void hasDeviceId(int);
+    method public void hasDownTime(long);
+    method public void hasEdgeFlags(int);
+    method public void hasEventTime(long);
+    method public void hasFlags(int);
+    method public void hasHistorySize(int);
+    method public void hasMetaState(int);
+    method public void hasPointerCount(int);
+    method public com.google.common.truth.LongSubject! historicalEventTime(int);
+    method public com.google.common.truth.FloatSubject! historicalOrientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! historicalPointerCoords(int, int);
+    method public com.google.common.truth.FloatSubject! historicalPressure(int);
+    method public com.google.common.truth.FloatSubject! historicalSize(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalX(int);
+    method public com.google.common.truth.FloatSubject! historicalY(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.MotionEventSubject!,android.view.MotionEvent!>! motionEvents();
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public com.google.common.truth.FloatSubject! orientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! pointerCoords(int);
+    method public com.google.common.truth.IntegerSubject! pointerId(int);
+    method public androidx.test.ext.truth.view.PointerPropertiesSubject! pointerProperties(int);
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! pressure(int);
+    method public com.google.common.truth.FloatSubject! rawX();
+    method public com.google.common.truth.FloatSubject! rawY();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! size(int);
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMajor(int);
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! toolMinor(int);
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMajor(int);
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! touchMinor(int);
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! x(int);
+    method public com.google.common.truth.FloatSubject! xPrecision();
+    method public com.google.common.truth.FloatSubject! y();
+    method public com.google.common.truth.FloatSubject! y(int);
+    method public com.google.common.truth.FloatSubject! yPrecision();
+  }
+
+  public final class PointerCoordsSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerCoordsSubject! assertThat(android.view.MotionEvent.PointerCoords!);
+    method public com.google.common.truth.FloatSubject! axisValue(int);
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerCoordsSubject!,android.view.MotionEvent.PointerCoords!>! pointerCoords();
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! y();
+  }
+
+  public final class PointerPropertiesSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerPropertiesSubject! assertThat(android.view.MotionEvent.PointerProperties!);
+    method public void hasId(int);
+    method public void hasToolType(int);
+    method public void isEqualTo(android.view.MotionEvent.PointerProperties!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerPropertiesSubject!,android.view.MotionEvent.PointerProperties!>! pointerProperties();
+  }
+
+}
+
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.6.0_internal.txt b/ext/truth/java/androidx/test/ext/truth/api/1.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.6.0_public.txt b/ext/truth/java/androidx/test/ext/truth/api/1.6.0_public.txt
new file mode 100644
index 000000000..8cd4d6967
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.6.0_public.txt
@@ -0,0 +1,248 @@
+// Signature format: 3.0
+package androidx.test.ext.truth.app {
+
+  public class NotificationActionSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationActionSubject! assertThat(android.app.Notification.Action!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationActionSubject!,android.app.Notification.Action!>! notificationActions();
+    method public final com.google.common.truth.StringSubject! title();
+  }
+
+  public class NotificationSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationSubject! assertThat(android.app.Notification!);
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! contentIntent();
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! deleteIntent();
+    method public final void doesNotHaveFlags(int);
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public final void hasFlags(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationSubject!,android.app.Notification!>! notifications();
+    method public final com.google.common.truth.StringSubject! tickerText();
+  }
+
+  public class PendingIntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.PendingIntentSubject! assertThat(android.app.PendingIntent!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.PendingIntentSubject!,android.app.PendingIntent!>! pendingIntents();
+  }
+
+}
+
+package androidx.test.ext.truth.content {
+
+  public final class IntentCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! action();
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...!);
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! data();
+  }
+
+  public final class IntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.content.IntentSubject! assertThat(android.content.Intent!);
+    method public com.google.common.truth.IterableSubject! categories();
+    method public androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void filtersEquallyTo(android.content.Intent!);
+    method public void hasAction(String!);
+    method public void hasComponent(android.content.ComponentName!);
+    method public void hasComponent(String!, String!);
+    method public void hasComponentClass(Class<?>!);
+    method public void hasComponentClass(String!);
+    method public void hasComponentPackage(String!);
+    method public void hasData(android.net.Uri!);
+    method public void hasFlags(int);
+    method public void hasNoAction();
+    method public void hasPackage(String!);
+    method public void hasType(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.content.IntentSubject!,android.content.Intent!>! intents();
+  }
+
+}
+
+package androidx.test.ext.truth.location {
+
+  public final class LocationCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! at();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! equality();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! nearby(float);
+  }
+
+  public class LocationSubject extends com.google.common.truth.Subject {
+    method public com.google.common.truth.FloatSubject! accuracy();
+    method public com.google.common.truth.DoubleSubject! altitude();
+    method public static androidx.test.ext.truth.location.LocationSubject! assertThat(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearing();
+    method public com.google.common.truth.FloatSubject! bearingAccuracy();
+    method public com.google.common.truth.FloatSubject! bearingTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearingTo(double, double);
+    method public com.google.common.truth.FloatSubject! distanceTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! distanceTo(double, double);
+    method public void doesNotHaveProvider(String!);
+    method public com.google.common.truth.LongSubject! elapsedRealtimeMillis();
+    method public com.google.common.truth.LongSubject! elapsedRealtimeNanos();
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void hasAccuracy();
+    method public void hasAltitude();
+    method public void hasBearing();
+    method public void hasBearingAccuracy();
+    method public void hasProvider(String!);
+    method public void hasSpeed();
+    method public void hasSpeedAccuracy();
+    method public void hasVerticalAccuracy();
+    method public void isAt(android.location.Location!);
+    method public void isAt(double, double);
+    method public void isFaraway(android.location.Location!, float);
+    method public void isMock();
+    method public void isNearby(android.location.Location!, float);
+    method public void isNotAt(android.location.Location!);
+    method public void isNotAt(double, double);
+    method public void isNotMock();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.location.LocationSubject!,android.location.Location!>! locations();
+    method public com.google.common.truth.FloatSubject! speed();
+    method public com.google.common.truth.FloatSubject! speedAccuracy();
+    method public com.google.common.truth.LongSubject! time();
+    method public com.google.common.truth.FloatSubject! verticalAccuracy();
+  }
+
+}
+
+package androidx.test.ext.truth.os {
+
+  public final class BundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.BundleSubject! assertThat(android.os.Bundle!);
+    method public com.google.common.truth.BooleanSubject! bool(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.BundleSubject!,android.os.Bundle!>! bundles();
+    method public com.google.common.truth.PrimitiveByteArraySubject! byteArray(String!);
+    method public void containsKey(String!);
+    method public void doesNotContainKey(String!);
+    method public com.google.common.truth.DoubleSubject doubleFloat(String);
+    method public void hasSize(int);
+    method public com.google.common.truth.IntegerSubject! integer(String!);
+    method public void isEmpty();
+    method public void isNotEmpty();
+    method public com.google.common.truth.LongSubject! longInt(String!);
+    method public <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! parcelable(String!);
+    method public com.google.common.truth.IterableSubject! parcelableArrayList(String!);
+    method public <T extends android.os.Parcelable, SubjectT extends com.google.common.truth.Subject> SubjectT! parcelableAsType(String!, com.google.common.truth.Subject.Factory<SubjectT!,T!>!);
+    method public com.google.common.truth.Subject! serializable(String!);
+    method public com.google.common.truth.StringSubject! string(String!);
+    method public com.google.common.truth.ObjectArraySubject<java.lang.String!> stringArray(String);
+    method public com.google.common.truth.IterableSubject! stringArrayList(String!);
+  }
+
+  public final class ParcelableSubject<T extends android.os.Parcelable> extends com.google.common.truth.Subject {
+    method public static <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! assertThat(T!);
+    method public void marshallsEquallyTo(android.os.Parcelable!);
+    method public static <T extends android.os.Parcelable> com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.ParcelableSubject<T!>!,T!>! parcelables();
+    method public void recreatesEqual(android.os.Parcelable.Creator<T!>!);
+  }
+
+  @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP) public final class PersistableBundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.PersistableBundleSubject! assertThat(android.os.PersistableBundle!);
+    method @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP_MR1) public com.google.common.truth.BooleanSubject! bool(String!);
+    method public void containsKey(String!);
+    method public void doesNotContainKey(String!);
+    method public com.google.common.truth.DoubleSubject doubleFloat(String);
+    method public void hasSize(int);
+    method public com.google.common.truth.IntegerSubject! integer(String!);
+    method public void isEmpty();
+    method public void isNotEmpty();
+    method public com.google.common.truth.LongSubject! longInt(String!);
+    method public androidx.test.ext.truth.os.PersistableBundleSubject! persistableBundle(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.PersistableBundleSubject!,android.os.PersistableBundle!>! persistableBundles();
+    method public com.google.common.truth.StringSubject! string(String!);
+    method public com.google.common.truth.ObjectArraySubject<java.lang.String!> stringArray(String);
+  }
+
+}
+
+package androidx.test.ext.truth.util {
+
+  public final class SparseBooleanArraySubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.util.SparseBooleanArraySubject! assertThat(android.util.SparseBooleanArray!);
+    method public void containsKey(int);
+    method public void doesNotContainKey(int);
+    method public static AssertionError! expectFailure(com.google.common.truth.ExpectFailure.SimpleSubjectBuilderCallback<androidx.test.ext.truth.util.SparseBooleanArraySubject!,android.util.SparseBooleanArray!>!);
+    method public void hasFalseValueAt(int);
+    method public void hasSize(int);
+    method public void hasTrueValueAt(int);
+    method public void isEmpty();
+    method public void isNotEmpty();
+  }
+
+}
+
+package androidx.test.ext.truth.view {
+
+  public final class MotionEventSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.MotionEventSubject! assertThat(android.view.MotionEvent!);
+    method public void hasAction(int);
+    method public void hasActionButton(int);
+    method public void hasButtonState(int);
+    method public void hasDeviceId(int);
+    method public void hasDownTime(long);
+    method public void hasEdgeFlags(int);
+    method public void hasEventTime(long);
+    method public void hasFlags(int);
+    method public void hasHistorySize(int);
+    method public void hasMetaState(int);
+    method public void hasPointerCount(int);
+    method public com.google.common.truth.LongSubject! historicalEventTime(int);
+    method public com.google.common.truth.FloatSubject! historicalOrientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! historicalPointerCoords(int, int);
+    method public com.google.common.truth.FloatSubject! historicalPressure(int);
+    method public com.google.common.truth.FloatSubject! historicalSize(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalX(int);
+    method public com.google.common.truth.FloatSubject! historicalY(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.MotionEventSubject!,android.view.MotionEvent!>! motionEvents();
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public com.google.common.truth.FloatSubject! orientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! pointerCoords(int);
+    method public com.google.common.truth.IntegerSubject! pointerId(int);
+    method public androidx.test.ext.truth.view.PointerPropertiesSubject! pointerProperties(int);
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! pressure(int);
+    method public com.google.common.truth.FloatSubject! rawX();
+    method public com.google.common.truth.FloatSubject! rawY();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! size(int);
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMajor(int);
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! toolMinor(int);
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMajor(int);
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! touchMinor(int);
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! x(int);
+    method public com.google.common.truth.FloatSubject! xPrecision();
+    method public com.google.common.truth.FloatSubject! y();
+    method public com.google.common.truth.FloatSubject! y(int);
+    method public com.google.common.truth.FloatSubject! yPrecision();
+  }
+
+  public final class PointerCoordsSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerCoordsSubject! assertThat(android.view.MotionEvent.PointerCoords!);
+    method public com.google.common.truth.FloatSubject! axisValue(int);
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerCoordsSubject!,android.view.MotionEvent.PointerCoords!>! pointerCoords();
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! y();
+  }
+
+  public final class PointerPropertiesSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerPropertiesSubject! assertThat(android.view.MotionEvent.PointerProperties!);
+    method public void hasId(int);
+    method public void hasToolType(int);
+    method public void isEqualTo(android.view.MotionEvent.PointerProperties!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerPropertiesSubject!,android.view.MotionEvent.PointerProperties!>! pointerProperties();
+  }
+
+}
+
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.7.0_internal.txt b/ext/truth/java/androidx/test/ext/truth/api/1.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ext/truth/java/androidx/test/ext/truth/api/1.7.0_public.txt b/ext/truth/java/androidx/test/ext/truth/api/1.7.0_public.txt
new file mode 100644
index 000000000..0dc74d0ba
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/1.7.0_public.txt
@@ -0,0 +1,248 @@
+// Signature format: 3.0
+package androidx.test.ext.truth.app {
+
+  public class NotificationActionSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationActionSubject! assertThat(android.app.Notification.Action!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationActionSubject!,android.app.Notification.Action!>! notificationActions();
+    method public final com.google.common.truth.StringSubject! title();
+  }
+
+  public class NotificationSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationSubject! assertThat(android.app.Notification!);
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! contentIntent();
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! deleteIntent();
+    method public final void doesNotHaveFlags(int);
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public final void hasFlags(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationSubject!,android.app.Notification!>! notifications();
+    method public final com.google.common.truth.StringSubject! tickerText();
+  }
+
+  public class PendingIntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.PendingIntentSubject! assertThat(android.app.PendingIntent!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.PendingIntentSubject!,android.app.PendingIntent!>! pendingIntents();
+  }
+
+}
+
+package androidx.test.ext.truth.content {
+
+  public final class IntentCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! action();
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...!);
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! data();
+  }
+
+  public final class IntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.content.IntentSubject! assertThat(android.content.Intent!);
+    method public com.google.common.truth.IterableSubject! categories();
+    method public androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void filtersEquallyTo(android.content.Intent!);
+    method public void hasAction(String!);
+    method public void hasComponent(android.content.ComponentName!);
+    method public void hasComponent(String!, String!);
+    method public void hasComponentClass(Class<? extends java.lang.Object!>!);
+    method public void hasComponentClass(String!);
+    method public void hasComponentPackage(String!);
+    method public void hasData(android.net.Uri!);
+    method public void hasFlags(int);
+    method public void hasNoAction();
+    method public void hasPackage(String!);
+    method public void hasType(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.content.IntentSubject!,android.content.Intent!>! intents();
+  }
+
+}
+
+package androidx.test.ext.truth.location {
+
+  public final class LocationCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! at();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! equality();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! nearby(float);
+  }
+
+  public class LocationSubject extends com.google.common.truth.Subject {
+    method public com.google.common.truth.FloatSubject! accuracy();
+    method public com.google.common.truth.DoubleSubject! altitude();
+    method public static androidx.test.ext.truth.location.LocationSubject! assertThat(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearing();
+    method public com.google.common.truth.FloatSubject! bearingAccuracy();
+    method public com.google.common.truth.FloatSubject! bearingTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearingTo(double, double);
+    method public com.google.common.truth.FloatSubject! distanceTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! distanceTo(double, double);
+    method public void doesNotHaveProvider(String!);
+    method public com.google.common.truth.LongSubject! elapsedRealtimeMillis();
+    method public com.google.common.truth.LongSubject! elapsedRealtimeNanos();
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void hasAccuracy();
+    method public void hasAltitude();
+    method public void hasBearing();
+    method public void hasBearingAccuracy();
+    method public void hasProvider(String!);
+    method public void hasSpeed();
+    method public void hasSpeedAccuracy();
+    method public void hasVerticalAccuracy();
+    method public void isAt(android.location.Location!);
+    method public void isAt(double, double);
+    method public void isFaraway(android.location.Location!, float);
+    method public void isMock();
+    method public void isNearby(android.location.Location!, float);
+    method public void isNotAt(android.location.Location!);
+    method public void isNotAt(double, double);
+    method public void isNotMock();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.location.LocationSubject!,android.location.Location!>! locations();
+    method public com.google.common.truth.FloatSubject! speed();
+    method public com.google.common.truth.FloatSubject! speedAccuracy();
+    method public com.google.common.truth.LongSubject! time();
+    method public com.google.common.truth.FloatSubject! verticalAccuracy();
+  }
+
+}
+
+package androidx.test.ext.truth.os {
+
+  public final class BundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.BundleSubject! assertThat(android.os.Bundle!);
+    method public com.google.common.truth.BooleanSubject! bool(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.BundleSubject!,android.os.Bundle!>! bundles();
+    method public com.google.common.truth.PrimitiveByteArraySubject! byteArray(String!);
+    method public void containsKey(String!);
+    method public void doesNotContainKey(String!);
+    method public com.google.common.truth.DoubleSubject doubleFloat(String);
+    method public void hasSize(int);
+    method public com.google.common.truth.IntegerSubject! integer(String!);
+    method public void isEmpty();
+    method public void isNotEmpty();
+    method public com.google.common.truth.LongSubject! longInt(String!);
+    method public <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! parcelable(String!);
+    method public com.google.common.truth.IterableSubject! parcelableArrayList(String!);
+    method public <T extends android.os.Parcelable, SubjectT extends com.google.common.truth.Subject> SubjectT! parcelableAsType(String!, com.google.common.truth.Subject.Factory<SubjectT!,T!>!);
+    method public com.google.common.truth.Subject! serializable(String!);
+    method public com.google.common.truth.StringSubject! string(String!);
+    method public com.google.common.truth.ObjectArraySubject<java.lang.String!> stringArray(String);
+    method public com.google.common.truth.IterableSubject! stringArrayList(String!);
+  }
+
+  public final class ParcelableSubject<T extends android.os.Parcelable> extends com.google.common.truth.Subject {
+    method public static <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T!>! assertThat(T!);
+    method public void marshallsEquallyTo(android.os.Parcelable!);
+    method public static <T extends android.os.Parcelable> com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.ParcelableSubject<T!>!,T!>! parcelables();
+    method public void recreatesEqual(android.os.Parcelable.Creator<T!>!);
+  }
+
+  @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP) public final class PersistableBundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.PersistableBundleSubject! assertThat(android.os.PersistableBundle!);
+    method @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP_MR1) public com.google.common.truth.BooleanSubject! bool(String!);
+    method public void containsKey(String!);
+    method public void doesNotContainKey(String!);
+    method public com.google.common.truth.DoubleSubject doubleFloat(String);
+    method public void hasSize(int);
+    method public com.google.common.truth.IntegerSubject! integer(String!);
+    method public void isEmpty();
+    method public void isNotEmpty();
+    method public com.google.common.truth.LongSubject! longInt(String!);
+    method public androidx.test.ext.truth.os.PersistableBundleSubject! persistableBundle(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.PersistableBundleSubject!,android.os.PersistableBundle!>! persistableBundles();
+    method public com.google.common.truth.StringSubject! string(String!);
+    method public com.google.common.truth.ObjectArraySubject<java.lang.String!> stringArray(String);
+  }
+
+}
+
+package androidx.test.ext.truth.util {
+
+  public final class SparseBooleanArraySubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.util.SparseBooleanArraySubject! assertThat(android.util.SparseBooleanArray!);
+    method public void containsKey(int);
+    method public void doesNotContainKey(int);
+    method public static AssertionError! expectFailure(com.google.common.truth.ExpectFailure.SimpleSubjectBuilderCallback<androidx.test.ext.truth.util.SparseBooleanArraySubject!,android.util.SparseBooleanArray!>!);
+    method public void hasFalseValueAt(int);
+    method public void hasSize(int);
+    method public void hasTrueValueAt(int);
+    method public void isEmpty();
+    method public void isNotEmpty();
+  }
+
+}
+
+package androidx.test.ext.truth.view {
+
+  public final class MotionEventSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.MotionEventSubject! assertThat(android.view.MotionEvent!);
+    method public void hasAction(int);
+    method public void hasActionButton(int);
+    method public void hasButtonState(int);
+    method public void hasDeviceId(int);
+    method public void hasDownTime(long);
+    method public void hasEdgeFlags(int);
+    method public void hasEventTime(long);
+    method public void hasFlags(int);
+    method public void hasHistorySize(int);
+    method public void hasMetaState(int);
+    method public void hasPointerCount(int);
+    method public com.google.common.truth.LongSubject! historicalEventTime(int);
+    method public com.google.common.truth.FloatSubject! historicalOrientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! historicalPointerCoords(int, int);
+    method public com.google.common.truth.FloatSubject! historicalPressure(int);
+    method public com.google.common.truth.FloatSubject! historicalSize(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalX(int);
+    method public com.google.common.truth.FloatSubject! historicalY(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.MotionEventSubject!,android.view.MotionEvent!>! motionEvents();
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public com.google.common.truth.FloatSubject! orientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! pointerCoords(int);
+    method public com.google.common.truth.IntegerSubject! pointerId(int);
+    method public androidx.test.ext.truth.view.PointerPropertiesSubject! pointerProperties(int);
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! pressure(int);
+    method public com.google.common.truth.FloatSubject! rawX();
+    method public com.google.common.truth.FloatSubject! rawY();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! size(int);
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMajor(int);
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! toolMinor(int);
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMajor(int);
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! touchMinor(int);
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! x(int);
+    method public com.google.common.truth.FloatSubject! xPrecision();
+    method public com.google.common.truth.FloatSubject! y();
+    method public com.google.common.truth.FloatSubject! y(int);
+    method public com.google.common.truth.FloatSubject! yPrecision();
+  }
+
+  public final class PointerCoordsSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerCoordsSubject! assertThat(android.view.MotionEvent.PointerCoords!);
+    method public com.google.common.truth.FloatSubject! axisValue(int);
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerCoordsSubject!,android.view.MotionEvent.PointerCoords!>! pointerCoords();
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! y();
+  }
+
+  public final class PointerPropertiesSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerPropertiesSubject! assertThat(android.view.MotionEvent.PointerProperties!);
+    method public void hasId(int);
+    method public void hasToolType(int);
+    method public void isEqualTo(android.view.MotionEvent.PointerProperties!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerPropertiesSubject!,android.view.MotionEvent.PointerProperties!>! pointerProperties();
+  }
+
+}
+
diff --git a/ext/truth/java/androidx/test/ext/truth/api/current_internal.txt b/ext/truth/java/androidx/test/ext/truth/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/ext/truth/java/androidx/test/ext/truth/api/current_public.txt b/ext/truth/java/androidx/test/ext/truth/api/current_public.txt
new file mode 100644
index 000000000..827288d8f
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/api/current_public.txt
@@ -0,0 +1,259 @@
+// Signature format: 5.0
+package androidx.test.ext.truth.app {
+
+  public class NotificationActionSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationActionSubject! assertThat(android.app.Notification.Action!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationActionSubject!,android.app.Notification.Action!>! notificationActions();
+    method public final com.google.common.truth.StringSubject! title();
+  }
+
+  public class NotificationSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.NotificationSubject! assertThat(android.app.Notification!);
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! contentIntent();
+    method public final androidx.test.ext.truth.app.PendingIntentSubject! deleteIntent();
+    method public final void doesNotHaveFlags(int);
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public final void hasFlags(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.NotificationSubject!,android.app.Notification!>! notifications();
+    method public final com.google.common.truth.StringSubject! tickerText();
+  }
+
+  public class PendingIntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.app.PendingIntentSubject! assertThat(android.app.PendingIntent!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.app.PendingIntentSubject!,android.app.PendingIntent!>! pendingIntents();
+  }
+
+}
+
+package androidx.test.ext.truth.content {
+
+  public final class IntentCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! action();
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! all(com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>!...!);
+    method public static com.google.common.truth.Correspondence<android.content.Intent!,android.content.Intent!>! data();
+  }
+
+  public final class IntentSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.content.IntentSubject! assertThat(android.content.Intent!);
+    method public com.google.common.truth.IterableSubject! categories();
+    method public androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void filtersEquallyTo(android.content.Intent!);
+    method public void hasAction(String!);
+    method public void hasComponent(android.content.ComponentName!);
+    method public void hasComponent(String!, String!);
+    method public void hasComponentClass(Class<? extends java.lang.Object!>!);
+    method public void hasComponentClass(String!);
+    method public void hasComponentPackage(String!);
+    method public void hasData(android.net.Uri!);
+    method public void hasFlags(int);
+    method public void hasNoAction();
+    method public void hasPackage(String!);
+    method public void hasType(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.content.IntentSubject!,android.content.Intent!>! intents();
+  }
+
+}
+
+package androidx.test.ext.truth.location {
+
+  public final class LocationCorrespondences {
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! at();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! equality();
+    method public static com.google.common.truth.Correspondence<android.location.Location!,android.location.Location!>! nearby(float);
+  }
+
+  public class LocationSubject extends com.google.common.truth.Subject {
+    method public com.google.common.truth.FloatSubject! accuracy();
+    method public com.google.common.truth.DoubleSubject! altitude();
+    method public static androidx.test.ext.truth.location.LocationSubject! assertThat(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearing();
+    method public com.google.common.truth.FloatSubject! bearingAccuracy();
+    method public com.google.common.truth.FloatSubject! bearingTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! bearingTo(double, double);
+    method public com.google.common.truth.FloatSubject! distanceTo(android.location.Location!);
+    method public com.google.common.truth.FloatSubject! distanceTo(double, double);
+    method public void doesNotHaveProvider(String!);
+    method public com.google.common.truth.LongSubject! elapsedRealtimeMillis();
+    method public com.google.common.truth.LongSubject! elapsedRealtimeNanos();
+    method public final androidx.test.ext.truth.os.BundleSubject! extras();
+    method public void hasAccuracy();
+    method public void hasAltitude();
+    method public void hasBearing();
+    method public void hasBearingAccuracy();
+    method public void hasProvider(String!);
+    method public void hasSpeed();
+    method public void hasSpeedAccuracy();
+    method public void hasVerticalAccuracy();
+    method public void isAt(android.location.Location!);
+    method public void isAt(double, double);
+    method public void isFaraway(android.location.Location!, float);
+    method public void isMock();
+    method public void isNearby(android.location.Location!, float);
+    method public void isNotAt(android.location.Location!);
+    method public void isNotAt(double, double);
+    method public void isNotMock();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.location.LocationSubject!,android.location.Location!>! locations();
+    method public com.google.common.truth.FloatSubject! speed();
+    method public com.google.common.truth.FloatSubject! speedAccuracy();
+    method public com.google.common.truth.LongSubject! time();
+    method public com.google.common.truth.FloatSubject! verticalAccuracy();
+  }
+
+}
+
+package androidx.test.ext.truth.os {
+
+  public final class BundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.BundleSubject! assertThat(android.os.Bundle!);
+    method public final com.google.common.truth.BooleanSubject! bool(String!);
+    method public final com.google.common.truth.PrimitiveBooleanArraySubject! booleanArray(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.BundleSubject!,android.os.Bundle!>! bundles();
+    method public com.google.common.truth.PrimitiveByteArraySubject! byteArray(String!);
+    method public final void containsKey(String!);
+    method public final void doesNotContainKey(String!);
+    method public final com.google.common.truth.PrimitiveDoubleArraySubject! doubleArray(String!);
+    method public final com.google.common.truth.DoubleSubject! doubleFloat(String!);
+    method public final void hasSize(int);
+    method public final com.google.common.truth.PrimitiveIntArraySubject! intArray(String!);
+    method public final com.google.common.truth.IntegerSubject! integer(String!);
+    method public com.google.common.truth.IterableSubject! integerArrayList(String!);
+    method public final void isEmpty();
+    method public final void isNotEmpty();
+    method public final com.google.common.truth.PrimitiveLongArraySubject! longArray(String!);
+    method public final com.google.common.truth.LongSubject! longInt(String!);
+    method public <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T>! parcelable(String!);
+    method public com.google.common.truth.IterableSubject! parcelableArrayList(String!);
+    method public <T extends android.os.Parcelable, SubjectT extends com.google.common.truth.Subject> SubjectT parcelableAsType(String!, com.google.common.truth.Subject.Factory<SubjectT,T>!);
+    method public com.google.common.truth.Subject! serializable(String!);
+    method public final com.google.common.truth.StringSubject! string(String!);
+    method public final com.google.common.truth.ObjectArraySubject<java.lang.String!>! stringArray(String!);
+    method public com.google.common.truth.IterableSubject! stringArrayList(String!);
+  }
+
+  public final class ParcelableSubject<T extends android.os.Parcelable> extends com.google.common.truth.Subject {
+    method public static <T extends android.os.Parcelable> androidx.test.ext.truth.os.ParcelableSubject<T>! assertThat(T);
+    method public void marshallsEquallyTo(android.os.Parcelable!);
+    method public static <T extends android.os.Parcelable> com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.ParcelableSubject<T>!,T>! parcelables();
+    method public void recreatesEqual(android.os.Parcelable.Creator<T>!);
+  }
+
+  @RequiresApi(android.os.Build.VERSION_CODES.LOLLIPOP) public final class PersistableBundleSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.os.PersistableBundleSubject! assertThat(android.os.PersistableBundle!);
+    method public final com.google.common.truth.BooleanSubject! bool(String!);
+    method public final com.google.common.truth.PrimitiveBooleanArraySubject! booleanArray(String!);
+    method public final void containsKey(String!);
+    method public final void doesNotContainKey(String!);
+    method public final com.google.common.truth.PrimitiveDoubleArraySubject! doubleArray(String!);
+    method public final com.google.common.truth.DoubleSubject! doubleFloat(String!);
+    method public final void hasSize(int);
+    method public final com.google.common.truth.PrimitiveIntArraySubject! intArray(String!);
+    method public final com.google.common.truth.IntegerSubject! integer(String!);
+    method public final void isEmpty();
+    method public void isEqualTo(android.os.PersistableBundle!);
+    method public final void isNotEmpty();
+    method public void isNotEqualTo(android.os.PersistableBundle!);
+    method public final com.google.common.truth.PrimitiveLongArraySubject! longArray(String!);
+    method public final com.google.common.truth.LongSubject! longInt(String!);
+    method public androidx.test.ext.truth.os.PersistableBundleSubject! persistableBundle(String!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.os.PersistableBundleSubject!,android.os.PersistableBundle!>! persistableBundles();
+    method public final com.google.common.truth.StringSubject! string(String!);
+    method public final com.google.common.truth.ObjectArraySubject<java.lang.String!>! stringArray(String!);
+  }
+
+}
+
+package androidx.test.ext.truth.util {
+
+  public final class SparseBooleanArraySubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.util.SparseBooleanArraySubject! assertThat(android.util.SparseBooleanArray!);
+    method public void containsKey(int);
+    method public void doesNotContainKey(int);
+    method public static AssertionError! expectFailure(com.google.common.truth.ExpectFailure.SimpleSubjectBuilderCallback<androidx.test.ext.truth.util.SparseBooleanArraySubject!,android.util.SparseBooleanArray!>!);
+    method public void hasFalseValueAt(int);
+    method public void hasSize(int);
+    method public void hasTrueValueAt(int);
+    method public void isEmpty();
+    method public void isNotEmpty();
+  }
+
+}
+
+package androidx.test.ext.truth.view {
+
+  public final class MotionEventSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.MotionEventSubject! assertThat(android.view.MotionEvent!);
+    method public void hasAction(int);
+    method public void hasActionButton(int);
+    method public void hasButtonState(int);
+    method public void hasDeviceId(int);
+    method public void hasDownTime(long);
+    method public void hasEdgeFlags(int);
+    method public void hasEventTime(long);
+    method public void hasFlags(int);
+    method public void hasHistorySize(int);
+    method public void hasMetaState(int);
+    method public void hasPointerCount(int);
+    method public com.google.common.truth.LongSubject! historicalEventTime(int);
+    method public com.google.common.truth.FloatSubject! historicalOrientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! historicalPointerCoords(int, int);
+    method public com.google.common.truth.FloatSubject! historicalPressure(int);
+    method public com.google.common.truth.FloatSubject! historicalSize(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalToolMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMajor(int);
+    method public com.google.common.truth.FloatSubject! historicalTouchMinor(int);
+    method public com.google.common.truth.FloatSubject! historicalX(int);
+    method public com.google.common.truth.FloatSubject! historicalY(int);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.MotionEventSubject!,android.view.MotionEvent!>! motionEvents();
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public com.google.common.truth.FloatSubject! orientation(int);
+    method public androidx.test.ext.truth.view.PointerCoordsSubject! pointerCoords(int);
+    method public com.google.common.truth.IntegerSubject! pointerId(int);
+    method public androidx.test.ext.truth.view.PointerPropertiesSubject! pointerProperties(int);
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! pressure(int);
+    method public com.google.common.truth.FloatSubject! rawX();
+    method public com.google.common.truth.FloatSubject! rawY();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! size(int);
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMajor(int);
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! toolMinor(int);
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMajor(int);
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! touchMinor(int);
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! x(int);
+    method public com.google.common.truth.FloatSubject! xPrecision();
+    method public com.google.common.truth.FloatSubject! y();
+    method public com.google.common.truth.FloatSubject! y(int);
+    method public com.google.common.truth.FloatSubject! yPrecision();
+  }
+
+  public final class PointerCoordsSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerCoordsSubject! assertThat(android.view.MotionEvent.PointerCoords!);
+    method public com.google.common.truth.FloatSubject! axisValue(int);
+    method public com.google.common.truth.FloatSubject! orientation();
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerCoordsSubject!,android.view.MotionEvent.PointerCoords!>! pointerCoords();
+    method public com.google.common.truth.FloatSubject! pressure();
+    method public com.google.common.truth.FloatSubject! size();
+    method public com.google.common.truth.FloatSubject! toolMajor();
+    method public com.google.common.truth.FloatSubject! toolMinor();
+    method public com.google.common.truth.FloatSubject! touchMajor();
+    method public com.google.common.truth.FloatSubject! touchMinor();
+    method public com.google.common.truth.FloatSubject! x();
+    method public com.google.common.truth.FloatSubject! y();
+  }
+
+  public final class PointerPropertiesSubject extends com.google.common.truth.Subject {
+    method public static androidx.test.ext.truth.view.PointerPropertiesSubject! assertThat(android.view.MotionEvent.PointerProperties!);
+    method public void hasId(int);
+    method public void hasToolType(int);
+    method public void isEqualTo(android.view.MotionEvent.PointerProperties!);
+    method public static com.google.common.truth.Subject.Factory<androidx.test.ext.truth.view.PointerPropertiesSubject!,android.view.MotionEvent.PointerProperties!>! pointerProperties();
+  }
+
+}
+
diff --git a/ext/truth/java/androidx/test/ext/truth/content/IntentCorrespondences.java b/ext/truth/java/androidx/test/ext/truth/content/IntentCorrespondences.java
index 122b7e777..877ffa96d 100644
--- a/ext/truth/java/androidx/test/ext/truth/content/IntentCorrespondences.java
+++ b/ext/truth/java/androidx/test/ext/truth/content/IntentCorrespondences.java
@@ -1,7 +1,6 @@
 package androidx.test.ext.truth.content;
 
 import android.content.Intent;
-import com.google.common.annotations.Beta;
 import com.google.common.base.Objects;
 import com.google.common.truth.Correspondence;
 
@@ -9,7 +8,7 @@
  * Collection of {@link com.google.common.truth.Correspondence} helpers for asserting lists of
  * {@link Intent}s.
  *
- * @see {@link com.google.common.truth.IterableSubject#comparingElementsUsing(Correspondence)}
+ * @see com.google.common.truth.IterableSubject#comparingElementsUsing(Correspondence)
  */
 public final class IntentCorrespondences {
 
@@ -27,7 +26,6 @@ public static Correspondence<Intent, Intent> data() {
         "has getData() equal to");
   }
 
-  @Beta
   public static Correspondence<Intent, Intent> all(
       final Correspondence<Intent, Intent>... correspondences) {
     StringBuilder combinedString = new StringBuilder();
diff --git a/ext/truth/java/androidx/test/ext/truth/content/IntentSubject.java b/ext/truth/java/androidx/test/ext/truth/content/IntentSubject.java
index 4c57c4413..82a98ac3c 100644
--- a/ext/truth/java/androidx/test/ext/truth/content/IntentSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/content/IntentSubject.java
@@ -15,6 +15,8 @@
  */
 package androidx.test.ext.truth.content;
 
+import static com.google.common.truth.Fact.fact;
+
 import android.content.ComponentName;
 import android.content.Intent;
 import android.net.Uri;
@@ -60,22 +62,26 @@ public final void hasComponent(ComponentName component) {
 
   /** @see #hasComponentClass(Class) */
   public final void hasComponentClass(String className) {
+    failIfIntentIsNull();
     check("getComponent().getClassName()")
         .that(actual.getComponent().getClassName())
         .isEqualTo(className);
   }
 
   public final void hasComponentPackage(String packageName) {
+    failIfIntentIsNull();
     check("getComponent().getPackageName()")
         .that(actual.getComponent().getPackageName())
         .isEqualTo(packageName);
   }
 
   public final void hasPackage(String packageName) {
+    failIfIntentIsNull();
     check("getPackage()").that(actual.getPackage()).isEqualTo(packageName);
   }
 
   public final void hasAction(String action) {
+    failIfIntentIsNull();
     check("getAction()").that(actual.getAction()).isEqualTo(action);
   }
 
@@ -84,31 +90,43 @@ public final void hasNoAction() {
   }
 
   public final void hasData(Uri uri) {
+    failIfIntentIsNull();
     check("getData()").that(actual.getData()).isEqualTo(uri);
   }
 
   public final void hasType(String type) {
+    failIfIntentIsNull();
     check("getType()").that(actual.getType()).isEqualTo(type);
   }
 
   public final BundleSubject extras() {
+    failIfIntentIsNull();
     return check("getExtras()").about(BundleSubject.bundles()).that(actual.getExtras());
   }
 
   public final IterableSubject categories() {
+    failIfIntentIsNull();
     return check("getCategories()").that(actual.getCategories());
   }
 
   /** Assert that the intent has the given flag set. */
   public final void hasFlags(int flag) {
+    failIfIntentIsNull();
     List<String> actualFlags = FlagUtil.flagNames(actual.getFlags());
     List<String> expectedFlags = FlagUtil.flagNames(flag);
     check("getFlags()").that(actualFlags).containsAtLeastElementsIn(expectedFlags);
   }
 
   public final void filtersEquallyTo(Intent intent) {
+    failIfIntentIsNull();
     if (!actual.filterEquals(intent)) {
       failWithActual("expected to be equal for intent filters to", intent);
     }
   }
+
+  private final void failIfIntentIsNull() {
+    if (actual == null) {
+      failWithoutActual(fact("Intent not expected to be", null));
+    }
+  }
 }
diff --git a/ext/truth/java/androidx/test/ext/truth/internal/FlagUtil.java b/ext/truth/java/androidx/test/ext/truth/internal/FlagUtil.java
index d0aa820d1..1afb9e962 100644
--- a/ext/truth/java/androidx/test/ext/truth/internal/FlagUtil.java
+++ b/ext/truth/java/androidx/test/ext/truth/internal/FlagUtil.java
@@ -15,6 +15,8 @@
  */
 package androidx.test.ext.truth.internal;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,6 +25,7 @@
  *
  * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 public final class FlagUtil {
 
   private FlagUtil() {}
@@ -33,6 +36,7 @@ private FlagUtil() {}
    *
    * @hide
    */
+  @RestrictTo(Scope.LIBRARY)
   public static List<String> flagNames(int flags) {
     List<String> flagStrings = new ArrayList<>();
     for (int i = 0; i < 32; i++) {
diff --git a/ext/truth/java/androidx/test/ext/truth/location/LocationCorrespondences.java b/ext/truth/java/androidx/test/ext/truth/location/LocationCorrespondences.java
index 07b5a866e..ba449d3c8 100644
--- a/ext/truth/java/androidx/test/ext/truth/location/LocationCorrespondences.java
+++ b/ext/truth/java/androidx/test/ext/truth/location/LocationCorrespondences.java
@@ -16,7 +16,7 @@
 package androidx.test.ext.truth.location;
 
 import android.location.Location;
-import android.os.Build;
+import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import com.google.common.base.Objects;
 import com.google.common.truth.Correspondence;
@@ -32,6 +32,11 @@ public final class LocationCorrespondences {
   public static Correspondence<Location, Location> equality() {
     return Correspondence.from(
         (actual, expected) -> {
+          if (VERSION.SDK_INT >= VERSION_CODES.S) {
+            // from android S+, Location.equals() is well defined
+            return Objects.equal(actual, expected);
+          }
+
           if (actual == expected) {
             return true;
           }
@@ -44,10 +49,8 @@ public static Correspondence<Location, Location> equality() {
           if (actual.getTime() != expected.getTime()) {
             return false;
           }
-          if (Build.VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
-            if (actual.getElapsedRealtimeNanos() != expected.getElapsedRealtimeNanos()) {
-              return false;
-            }
+          if (actual.getElapsedRealtimeNanos() != expected.getElapsedRealtimeNanos()) {
+            return false;
           }
           if (actual.getLatitude() != expected.getLatitude()) {
             return false;
@@ -67,7 +70,7 @@ public static Correspondence<Location, Location> equality() {
           if (actual.getAccuracy() != expected.getAccuracy()) {
             return false;
           }
-          if (Build.VERSION.SDK_INT >= VERSION_CODES.O) {
+          if (VERSION.SDK_INT >= VERSION_CODES.O) {
             if (actual.getVerticalAccuracyMeters() != expected.getVerticalAccuracyMeters()) {
               return false;
             }
diff --git a/ext/truth/java/androidx/test/ext/truth/location/LocationSubject.java b/ext/truth/java/androidx/test/ext/truth/location/LocationSubject.java
index a914bd9bd..563229dc9 100644
--- a/ext/truth/java/androidx/test/ext/truth/location/LocationSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/location/LocationSubject.java
@@ -49,7 +49,7 @@ private LocationSubject(FailureMetadata failureMetadata, Location subject) {
 
   @Override
   public void isEqualTo(@Nullable Object otherObj) {
-    if (VERSION.SDK_INT > VERSION_CODES.R) {
+    if (VERSION.SDK_INT >= VERSION_CODES.S) {
       // from android S+, Location.equals() is well defined
       super.isEqualTo(otherObj);
       return;
@@ -62,11 +62,9 @@ public void isEqualTo(@Nullable Object otherObj) {
 
     check("getProvider()").that(actual.getProvider()).isEqualTo(other.getProvider());
     check("getTime()").that(actual.getTime()).isEqualTo(other.getTime());
-    if (VERSION.SDK_INT >= VERSION_CODES.JELLY_BEAN_MR1) {
-      check("getElapsedRealtimeNanos()")
-          .that(actual.getElapsedRealtimeNanos())
-          .isEqualTo(other.getElapsedRealtimeNanos());
-    }
+    check("getElapsedRealtimeNanos()")
+        .that(actual.getElapsedRealtimeNanos())
+        .isEqualTo(other.getElapsedRealtimeNanos());
     check("getLatitude()").that(actual.getLatitude()).isEqualTo(other.getLatitude());
     check("getLongitude()").that(actual.getLongitude()).isEqualTo(other.getLongitude());
     check("getAltitude()").that(actual.getAltitude()).isEqualTo(other.getAltitude());
diff --git a/ext/truth/java/androidx/test/ext/truth/os/BaseBundleSubject.java b/ext/truth/java/androidx/test/ext/truth/os/BaseBundleSubject.java
new file mode 100644
index 000000000..d98c3ec29
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/os/BaseBundleSubject.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.truth.os;
+
+import static com.google.common.truth.Fact.simpleFact;
+
+import android.os.BaseBundle;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import com.google.common.truth.BooleanSubject;
+import com.google.common.truth.DoubleSubject;
+import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.IntegerSubject;
+import com.google.common.truth.LongSubject;
+import com.google.common.truth.ObjectArraySubject;
+import com.google.common.truth.PrimitiveBooleanArraySubject;
+import com.google.common.truth.PrimitiveDoubleArraySubject;
+import com.google.common.truth.PrimitiveIntArraySubject;
+import com.google.common.truth.PrimitiveLongArraySubject;
+import com.google.common.truth.StringSubject;
+import com.google.common.truth.Subject;
+
+/**
+ * Subject for making assertions about {@link BaseBundle}s.
+ *
+ * <p>Concrete implementations for external users are {@link BundleSubject} and {@link
+ * PersistableBundleSubject}.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public abstract class BaseBundleSubject extends Subject {
+
+  private final BaseBundle actual;
+
+  BaseBundleSubject(FailureMetadata failureMetadata, BaseBundle subject) {
+    super(failureMetadata, subject);
+    this.actual = subject;
+  }
+
+  public final void isEmpty() {
+    if (!actual.isEmpty()) {
+      failWithActual(simpleFact("expected to be empty"));
+    }
+  }
+
+  public final void isNotEmpty() {
+    if (actual.isEmpty()) {
+      failWithActual(simpleFact("expected to be non-empty"));
+    }
+  }
+
+  public final void hasSize(int size) {
+    check("size()").that(actual.size()).isEqualTo(size);
+  }
+
+  public final void containsKey(String key) {
+    if (!actual.containsKey(key)) {
+      failWithActual(simpleFact("expected to contain key " + key));
+    }
+  }
+
+  public final void doesNotContainKey(String key) {
+    if (actual.containsKey(key)) {
+      failWithActual(simpleFact("expected to not contain key " + key));
+    }
+  }
+
+  public final BooleanSubject bool(String key) {
+    return check("getBoolean(%s)", key).that(actual.getBoolean(key));
+  }
+
+  public final IntegerSubject integer(String key) {
+    return check("getInt(%s)", key).that(actual.getInt(key));
+  }
+
+  public final LongSubject longInt(String key) {
+    return check("getLong(%s)", key).that(actual.getLong(key));
+  }
+
+  public final DoubleSubject doubleFloat(String key) {
+    return check("getDouble(%s)", key).that(actual.getDouble(key));
+  }
+
+  public final StringSubject string(String key) {
+    return check("getString(%s)", key).that(actual.getString(key));
+  }
+
+  public final PrimitiveBooleanArraySubject booleanArray(String key) {
+    return check("getBooleanArray(%s)", key).that(actual.getBooleanArray(key));
+  }
+
+  public final PrimitiveIntArraySubject intArray(String key) {
+    return check("getIntArray(%s)", key).that(actual.getIntArray(key));
+  }
+
+  public final PrimitiveLongArraySubject longArray(String key) {
+    return check("getLongArray(%s)", key).that(actual.getLongArray(key));
+  }
+
+  public final PrimitiveDoubleArraySubject doubleArray(String key) {
+    return check("getDoubleArray(%s)", key).that(actual.getDoubleArray(key));
+  }
+
+  public final ObjectArraySubject<String> stringArray(String key) {
+    return check("getStringArray(%s)", key).that(actual.getStringArray(key));
+  }
+}
diff --git a/ext/truth/java/androidx/test/ext/truth/os/BundleSubject.java b/ext/truth/java/androidx/test/ext/truth/os/BundleSubject.java
index 0acff8dc8..85008f783 100644
--- a/ext/truth/java/androidx/test/ext/truth/os/BundleSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/os/BundleSubject.java
@@ -15,22 +15,20 @@
  */
 package androidx.test.ext.truth.os;
 
-import static com.google.common.truth.Fact.simpleFact;
-
 import android.os.Bundle;
 import android.os.Parcelable;
-import com.google.common.truth.BooleanSubject;
-import com.google.common.truth.DoubleSubject;
 import com.google.common.truth.FailureMetadata;
-import com.google.common.truth.IntegerSubject;
 import com.google.common.truth.IterableSubject;
-import com.google.common.truth.LongSubject;
-import com.google.common.truth.StringSubject;
+import com.google.common.truth.PrimitiveByteArraySubject;
 import com.google.common.truth.Subject;
 import com.google.common.truth.Truth;
 
-/** Subject for making assertions about {@link Bundle}s. */
-public final class BundleSubject extends Subject {
+/**
+ * Subject for making assertions about {@link Bundle}s.
+ *
+ * <p>To assert about {@link android.os.PersistableBundle}s, use {@link PersistableBundleSubject}.
+ */
+public final class BundleSubject extends BaseBundleSubject {
 
   public static BundleSubject assertThat(Bundle bundle) {
     return Truth.assertAbout(bundles()).that(bundle);
@@ -47,40 +45,8 @@ public static Subject.Factory<BundleSubject, Bundle> bundles() {
     this.actual = subject;
   }
 
-  public void hasSize(int size) {
-    check("size()").that(actual.size()).isEqualTo(size);
-  }
-
-  public void isEmpty() {
-    if (!actual.isEmpty()) {
-      failWithActual(simpleFact("expected to be empty"));
-    }
-  }
-
-  public void isNotEmpty() {
-    if (actual.isEmpty()) {
-      failWithActual(simpleFact("expected to be non-empty"));
-    }
-  }
-
-  public StringSubject string(String key) {
-    return check("getString(%s)", key).that(actual.getString(key));
-  }
-
-  public IntegerSubject integer(String key) {
-    return check("getInt(%s)", key).that(actual.getInt(key));
-  }
-
-  public LongSubject longInt(String key) {
-    return check("getLong(%s)", key).that(actual.getLong(key));
-  }
-
-  public DoubleSubject doubleFloat(String key) {
-    return check("getDouble(%s)", key).that(actual.getDouble(key));
-  }
-
-  public BooleanSubject bool(String key) {
-    return check("getBoolean(%s)", key).that(actual.getBoolean(key));
+  public PrimitiveByteArraySubject byteArray(String key) {
+    return check("getByteArray(%s)", key).that(actual.getByteArray(key));
   }
 
   public <T extends Parcelable> ParcelableSubject<T> parcelable(String key) {
@@ -94,6 +60,10 @@ public <T extends Parcelable, SubjectT extends Subject> SubjectT parcelableAsTyp
     return check("getParcelable(%s)", key).about(subjectFactory).that(actual.<T>getParcelable(key));
   }
 
+  public IterableSubject integerArrayList(String key) {
+    return check("getIntegerArrayList(%s)", key).that(actual.getIntegerArrayList(key));
+  }
+
   public IterableSubject stringArrayList(String key) {
     return check("getStringArrayList(%s)", key).that(actual.getStringArrayList(key));
   }
@@ -106,16 +76,4 @@ public IterableSubject parcelableArrayList(String key) {
   public Subject serializable(String key) {
     return check("getSerializable(%s)", key).that(actual.getSerializable(key));
   }
-
-  public void containsKey(String key) {
-    if (!actual.containsKey(key)) {
-      failWithActual(simpleFact("expected to contain key " + key));
-    }
-  }
-
-  public void doesNotContainKey(String key) {
-    if (actual.containsKey(key)) {
-      failWithActual(simpleFact("expected to not contain key " + key));
-    }
-  }
 }
diff --git a/ext/truth/java/androidx/test/ext/truth/os/ParcelableSubject.java b/ext/truth/java/androidx/test/ext/truth/os/ParcelableSubject.java
index 864669942..a1152c7d1 100644
--- a/ext/truth/java/androidx/test/ext/truth/os/ParcelableSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/os/ParcelableSubject.java
@@ -16,12 +16,15 @@
 package androidx.test.ext.truth.os;
 
 import static androidx.test.core.os.Parcelables.forceParcel;
+import static com.google.common.truth.Fact.fact;
 
+import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.Parcelable.Creator;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.Subject;
 import com.google.common.truth.Truth;
+import java.util.Arrays;
 
 /** Testing subject for {@link Parcelable}s. */
 public final class ParcelableSubject<T extends Parcelable> extends Subject {
@@ -41,8 +44,28 @@ public static <T extends Parcelable> Subject.Factory<ParcelableSubject<T>, T> pa
     this.actual = subject;
   }
 
+  /**
+   * Asserts that the subject is equal to itself after it goes through marshall/unmarshall cycle.
+   */
   public void recreatesEqual(Creator<T> creator) {
     T recreated = forceParcel(actual, creator);
     check("recreatesEqual()").that(actual).isEqualTo(recreated);
   }
+
+  /** Asserts that the subject serializes to the same bytes as some other one. */
+  public void marshallsEquallyTo(Parcelable other) {
+    Parcel parcel = Parcel.obtain();
+    try {
+      actual.writeToParcel(parcel, 0);
+      byte[] actualBytes = parcel.marshall();
+      parcel.setDataPosition(0);
+      other.writeToParcel(parcel, 0);
+      byte[] otherBytes = parcel.marshall();
+      if (!Arrays.equals(actualBytes, otherBytes)) {
+        failWithActual(fact("expected to serialize like", other));
+      }
+    } finally {
+      parcel.recycle();
+    }
+  }
 }
diff --git a/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java b/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java
new file mode 100644
index 000000000..2a7fd5b37
--- /dev/null
+++ b/ext/truth/java/androidx/test/ext/truth/os/PersistableBundleSubject.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.truth.os;
+
+import android.os.Build;
+import android.os.PersistableBundle;
+import androidx.annotation.RequiresApi;
+import com.google.common.primitives.Booleans;
+import com.google.common.primitives.Doubles;
+import com.google.common.primitives.Ints;
+import com.google.common.primitives.Longs;
+import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.Subject;
+import com.google.common.truth.Truth;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Subject for making assertions about {@link PersistableBundle}s.
+ *
+ * <p>To assert about "regular" {@link android.os.Bundle}s, use {@link BundleSubject}.
+ */
+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)
+public final class PersistableBundleSubject extends BaseBundleSubject {
+
+  public static PersistableBundleSubject assertThat(PersistableBundle persistableBundle) {
+    return Truth.assertAbout(persistableBundles()).that(persistableBundle);
+  }
+
+  public final void isEqualTo(PersistableBundle other) {
+    // If either are null, just fall back to an equals() comparison.
+    if (actual == null || other == null) {
+      super.isEqualTo(other);
+      return;
+    }
+
+    // PersistableBundle doesn't implement equals() so we convert it to a Map so we can use the
+    // existing Truth implementation.
+    Truth.assertThat(toMap(actual)).isEqualTo(toMap(other));
+  }
+
+  public final void isNotEqualTo(PersistableBundle other) {
+    // If either are null, just fall back to an equals() comparison.
+    if (actual == null || other == null) {
+      super.isNotEqualTo(other);
+      return;
+    }
+
+    // PersistableBundle doesn't implement equals() so we convert it to a Map so we can use the
+    // existing Truth implementation.
+    Truth.assertThat(toMap(actual)).isNotEqualTo(toMap(other));
+  }
+
+  /** Converts the {@link PersistableBundle} to a {@link Map} for comparison. */
+  private final Map<String, Object> toMap(PersistableBundle bundle) {
+    Map<String, Object> map = new HashMap<>();
+    for (String key : bundle.keySet()) {
+      Object value = bundle.get(key);
+      if (value instanceof PersistableBundle) {
+        value = toMap((PersistableBundle) value);
+      } else if (value instanceof boolean[]) {
+        // Array types require special handling since arrays use reference equality by default and
+        // MapSubject doesn't work around that.
+        value = Booleans.asList((boolean[]) value);
+      } else if (value instanceof double[]) {
+        value = Doubles.asList((double[]) value);
+      } else if (value instanceof int[]) {
+        value = Ints.asList((int[]) value);
+      } else if (value instanceof long[]) {
+        value = Longs.asList((long[]) value);
+      } else if (value instanceof String[]) {
+        value = Arrays.asList((String[]) value);
+      }
+      map.put(key, value);
+    }
+    return map;
+  }
+
+  public static Subject.Factory<PersistableBundleSubject, PersistableBundle> persistableBundles() {
+    return PersistableBundleSubject::new;
+  }
+
+  private final PersistableBundle actual;
+
+  PersistableBundleSubject(FailureMetadata failureMetadata, PersistableBundle subject) {
+    super(failureMetadata, subject);
+    this.actual = subject;
+  }
+
+  public PersistableBundleSubject persistableBundle(String key) {
+    return check("getPersistableBundle(%s)", key)
+        .about(persistableBundles())
+        .that(actual.getPersistableBundle(key));
+  }
+}
diff --git a/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java b/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java
index 88ae1d855..16ba51c9c 100644
--- a/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/view/MotionEventSubject.java
@@ -16,10 +16,10 @@
 package androidx.test.ext.truth.view;
 
 import android.os.Build;
-import androidx.annotation.Nullable;
 import android.view.MotionEvent;
 import android.view.MotionEvent.PointerCoords;
 import android.view.MotionEvent.PointerProperties;
+import androidx.annotation.Nullable;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.FloatSubject;
 import com.google.common.truth.IntegerSubject;
diff --git a/ext/truth/java/androidx/test/ext/truth/view/PointerCoordsSubject.java b/ext/truth/java/androidx/test/ext/truth/view/PointerCoordsSubject.java
index e0da87e86..d717dfc61 100644
--- a/ext/truth/java/androidx/test/ext/truth/view/PointerCoordsSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/view/PointerCoordsSubject.java
@@ -15,9 +15,9 @@
  */
 package androidx.test.ext.truth.view;
 
-import androidx.annotation.Nullable;
 import android.view.MotionEvent.PointerCoords;
 import android.view.MotionEvent.PointerProperties;
+import androidx.annotation.Nullable;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.FloatSubject;
 import com.google.common.truth.Subject;
diff --git a/ext/truth/java/androidx/test/ext/truth/view/PointerPropertiesSubject.java b/ext/truth/java/androidx/test/ext/truth/view/PointerPropertiesSubject.java
index e26152261..532ef0ce7 100644
--- a/ext/truth/java/androidx/test/ext/truth/view/PointerPropertiesSubject.java
+++ b/ext/truth/java/androidx/test/ext/truth/view/PointerPropertiesSubject.java
@@ -15,8 +15,8 @@
  */
 package androidx.test.ext.truth.view;
 
-import androidx.annotation.Nullable;
 import android.view.MotionEvent.PointerProperties;
+import androidx.annotation.Nullable;
 import com.google.common.truth.FailureMetadata;
 import com.google.common.truth.Subject;
 import com.google.common.truth.Truth;
diff --git a/ext/truth/javatests/androidx/test/ext/truth/BUILD.bazel b/ext/truth/javatests/androidx/test/ext/truth/BUILD.bazel
deleted file mode 100644
index 6a00a4446..000000000
--- a/ext/truth/javatests/androidx/test/ext/truth/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-licenses(["notice"])  # Apache License 2.0
-
-load("//build_extensions:android_library_instrumentation_tests.bzl", "android_library_instrumentation_tests")
-load("//build_extensions:android_library_local_tests.bzl", "android_library_local_tests")
-load("//build_extensions:test_devices.bzl", "devices")
-
-android_library_instrumentation_tests(
-    name = "instrumentation_tests",
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    target_devices = devices(),
-    deps = [
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ext/truth",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_library_local_tests(
-    name = "local_tests",
-    srcs = glob(["**/*.java"]),
-    deps = [
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ext/truth",
-        "//runner/rules",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
diff --git a/ext/truth/javatests/androidx/test/ext/truth/app/BUILD b/ext/truth/javatests/androidx/test/ext/truth/app/BUILD
new file mode 100644
index 000000000..777309fb6
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/app/BUILD
@@ -0,0 +1,35 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "NotificationActionSubjectTest",
+    srcs = ["NotificationActionSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "NotificationSubjectTest",
+    srcs = ["NotificationSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/rules",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ext/truth/javatests/androidx/test/ext/truth/app/NotificationActionSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/app/NotificationActionSubjectTest.java
index eba176234..41eb0c9ca 100644
--- a/ext/truth/javatests/androidx/test/ext/truth/app/NotificationActionSubjectTest.java
+++ b/ext/truth/javatests/androidx/test/ext/truth/app/NotificationActionSubjectTest.java
@@ -18,7 +18,6 @@
 import static androidx.test.ext.truth.app.NotificationActionSubject.assertThat;
 
 import android.app.Notification;
-import android.os.Build;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -30,10 +29,7 @@ public class NotificationActionSubjectTest {
 
   @Test
   public void hasTitle() {
-    if (Build.VERSION.SDK_INT >= 16) {
-      final Notification.Action action = new Notification.Action(0, EXPECTED_TEXT, null);
-
-      assertThat(action).title().isEqualTo(EXPECTED_TEXT);
-    }
+    final Notification.Action action = new Notification.Action(0, EXPECTED_TEXT, null);
+    assertThat(action).title().isEqualTo(EXPECTED_TEXT);
   }
 }
diff --git a/ext/truth/javatests/androidx/test/ext/truth/app/NotificationSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/app/NotificationSubjectTest.java
index 4001d39ea..07e0cfc54 100644
--- a/ext/truth/javatests/androidx/test/ext/truth/app/NotificationSubjectTest.java
+++ b/ext/truth/javatests/androidx/test/ext/truth/app/NotificationSubjectTest.java
@@ -38,7 +38,8 @@ public class NotificationSubjectTest {
   @Test
   public void contentIntent() {
     PendingIntent pendingIntent =
-        PendingIntent.getActivity(activityTestRule.getActivity(), 0, new Intent(), 0);
+        PendingIntent.getActivity(
+            activityTestRule.getActivity(), 0, new Intent(), PendingIntent.FLAG_IMMUTABLE);
     Notification notification = new Notification();
     notification.contentIntent = pendingIntent;
 
@@ -48,7 +49,8 @@ public void contentIntent() {
   @Test
   public void deleteIntent() {
     PendingIntent pendingIntent =
-        PendingIntent.getActivity(activityTestRule.getActivity(), 0, new Intent(), 0);
+        PendingIntent.getActivity(
+            activityTestRule.getActivity(), 0, new Intent(), PendingIntent.FLAG_IMMUTABLE);
     Notification notification = new Notification();
     notification.deleteIntent = pendingIntent;
 
diff --git a/ext/truth/javatests/androidx/test/ext/truth/content/BUILD b/ext/truth/javatests/androidx/test/ext/truth/content/BUILD
new file mode 100644
index 000000000..179e3da1d
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/content/BUILD
@@ -0,0 +1,38 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "IntentSubjectTest",
+    srcs = ["IntentSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/rules",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "IntentSubjectTest_android",
+    srcs = ["IntentSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ext/truth/javatests/androidx/test/ext/truth/content/IntentSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/content/IntentSubjectTest.java
index f66e52e6d..2bd130355 100644
--- a/ext/truth/javatests/androidx/test/ext/truth/content/IntentSubjectTest.java
+++ b/ext/truth/javatests/androidx/test/ext/truth/content/IntentSubjectTest.java
@@ -18,7 +18,7 @@
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.ext.truth.content.IntentSubject.assertThat;
 import static com.google.common.truth.ExpectFailure.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
 
 import android.content.ComponentName;
 import android.content.Intent;
@@ -48,6 +48,13 @@ public void hasAction_noAction() {
     }
   }
 
+  @Test
+  public void hasAction_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(AssertionError.class, () -> assertThat((Intent) null).hasAction("BAR"));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void hasNoAction() {
     Intent intent = new Intent();
@@ -65,6 +72,13 @@ public void hasNoAction_withAction() {
     }
   }
 
+  @Test
+  public void hasNoAction_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(AssertionError.class, () -> assertThat((Intent) null).hasNoAction());
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void hasComponentClass() {
     Intent intent = new Intent();
@@ -72,6 +86,14 @@ public void hasComponentClass() {
     assertThat(intent).hasComponentClass("Foo");
   }
 
+  @Test
+  public void hasComponentClass_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class, () -> assertThat((Intent) null).hasComponentClass("Foo"));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void hasComponentPackage() {
     Intent intent = new Intent();
@@ -79,6 +101,14 @@ public void hasComponentPackage() {
     assertThat(intent).hasComponentPackage("com.foo");
   }
 
+  @Test
+  public void hasComponentPackage_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class, () -> assertThat((Intent) null).hasComponentPackage("com.foo"));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void hasComponent() {
     Intent intent = new Intent();
@@ -87,6 +117,14 @@ public void hasComponent() {
     assertThat(intent).hasComponent(new ComponentName("com.foo", "Foo"));
   }
 
+  @Test
+  public void hasComponent_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class, () -> assertThat((Intent) null).hasComponent("com.foo", "Foo"));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void hasData() {
     Intent intent = new Intent();
@@ -94,22 +132,39 @@ public void hasData() {
     assertThat(intent).hasData(Uri.parse("http://developer.android.com"));
   }
 
+  @Test
+  public void hasData_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> assertThat((Intent) null).hasData(Uri.parse("http://developer.android.com")));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void hasFlags() {
     Intent intent = new Intent();
     intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-    try {
-      assertThat(intent)
-          .hasFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT | Intent.FLAG_ACTIVITY_NEW_TASK);
-      fail("assertion unexpectedly passed");
-    } catch (AssertionError e) {
-      // test error message formatting
-      Truth.assertThat(e.getMessage()).contains("0x2000000, 0x10000000");
-      Truth.assertThat(e.getMessage()).contains("0x8000, 0x400000");
-    }
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () ->
+                assertThat(intent)
+                    .hasFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT | Intent.FLAG_ACTIVITY_NEW_TASK));
+    Truth.assertThat(e.getMessage()).contains("0x2000000, 0x10000000");
+    Truth.assertThat(e.getMessage()).contains("0x8000, 0x400000");
     assertThat(intent).hasFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT);
   }
 
+  @Test
+  public void hasFlags_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> assertThat((Intent) null).hasFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void extras() {
     Intent intent = new Intent();
@@ -118,6 +173,14 @@ public void extras() {
     assertThat(intent).extras().integer("extra").isEqualTo(2);
   }
 
+  @Test
+  public void extras_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class, () -> assertThat((Intent) null).extras().containsKey("extra"));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void categories() {
     Intent intent = new Intent();
@@ -125,6 +188,15 @@ public void categories() {
     assertThat(intent).categories().containsExactly("cat");
   }
 
+  @Test
+  public void categories_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> assertThat((Intent) null).categories().containsExactly("cat"));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
+  }
+
   @Test
   public void filtersEquallyTo_equal() {
     Intent intent = new Intent(Intent.ACTION_ASSIST);
@@ -136,14 +208,22 @@ public void filtersEquallyTo_equal() {
 
   @Test
   public void filtersEquallyTo_notEqual() {
-    try {
-      assertThat(new Intent("FOO")).filtersEquallyTo(new Intent("BAR"));
-      fail("Should have thrown");
-    } catch (AssertionError e) {
-      assertThat(e)
-          .factValue("expected to be equal for intent filters to")
-          .isEqualTo("Intent { act=BAR }");
-      assertThat(e).factValue("but was").isEqualTo("Intent { act=FOO }");
-    }
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> assertThat(new Intent("FOO")).filtersEquallyTo(new Intent("BAR")));
+    assertThat(e)
+        .factValue("expected to be equal for intent filters to")
+        .isEqualTo("Intent { act=BAR }");
+    assertThat(e).factValue("but was").isEqualTo("Intent { act=FOO }");
+  }
+
+  @Test
+  public void filtersEquallyTo_failsWithNullIntent() {
+    AssertionError e =
+        assertThrows(
+            AssertionError.class,
+            () -> assertThat((Intent) null).filtersEquallyTo(new Intent(Intent.ACTION_ASSIST)));
+    assertThat(e).factValue("Intent not expected to be").isEqualTo("null");
   }
 }
diff --git a/ext/truth/javatests/androidx/test/ext/truth/location/BUILD b/ext/truth/javatests/androidx/test/ext/truth/location/BUILD
new file mode 100644
index 000000000..52b718dba
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/location/BUILD
@@ -0,0 +1,38 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "LocationSubjectTest",
+    srcs = ["LocationSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/rules",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "LocationSubjectTest_android",
+    srcs = ["LocationSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ext/truth/javatests/androidx/test/ext/truth/location/LocationSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/location/LocationSubjectTest.java
index 6248e66c5..dd77ec16f 100644
--- a/ext/truth/javatests/androidx/test/ext/truth/location/LocationSubjectTest.java
+++ b/ext/truth/javatests/androidx/test/ext/truth/location/LocationSubjectTest.java
@@ -203,8 +203,6 @@ public void time() {
 
   @Test
   public void elapsedRealtime() {
-    assumeTrue(VERSION.SDK_INT > VERSION_CODES.JELLY_BEAN_MR1);
-
     Location location = new Location(GPS_PROVIDER);
     location.setElapsedRealtimeNanos(100000000);
 
diff --git a/ext/truth/javatests/androidx/test/ext/truth/os/BUILD b/ext/truth/javatests/androidx/test/ext/truth/os/BUILD
new file mode 100644
index 000000000..a97be3442
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/os/BUILD
@@ -0,0 +1,94 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+load("//build_extensions:phone_devices.bzl", "apis", "devices")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "BundleSubjectTest",
+    srcs = ["BundleSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/rules",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "BundleSubjectTest_android",
+    srcs = ["BundleSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "ParcelableSubjectTest",
+    srcs = ["ParcelableSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/rules",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ParcelableSubjectTest_android",
+    srcs = ["ParcelableSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "PersistableBundleSubjectTest",
+    srcs = ["PersistableBundleSubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "PersistableBundleSubjectTest_android",
+    srcs = ["PersistableBundleSubjectTest.java"],
+    device_list = devices(apis()),
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ext/truth/javatests/androidx/test/ext/truth/os/BundleSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/os/BundleSubjectTest.java
index 676234523..a80ffd7bb 100644
--- a/ext/truth/javatests/androidx/test/ext/truth/os/BundleSubjectTest.java
+++ b/ext/truth/javatests/androidx/test/ext/truth/os/BundleSubjectTest.java
@@ -96,6 +96,14 @@ public void bool() {
     assertThat(bundle).bool("foo").isTrue();
   }
 
+  @Test
+  public void byteArray() {
+    Bundle bundle = new Bundle();
+    bundle.putByteArray("foo", new byte[] {1, 2, 3});
+
+    assertThat(bundle).byteArray("foo").isEqualTo(new byte[] {1, 2, 3});
+  }
+
   @Test
   public void parcelable() {
     Bundle bundle = new Bundle();
@@ -114,6 +122,58 @@ public void parcelableAsType() {
     assertThat(bundle).parcelableAsType("foo", IntentSubject.intents()).hasAction("bar");
   }
 
+  @Test
+  public void booleanArray() {
+    Bundle bundle = new Bundle();
+    bundle.putBooleanArray("foo", new boolean[] {true, false});
+
+    assertThat(bundle).booleanArray("foo").asList().containsExactly(true, false).inOrder();
+  }
+
+  @Test
+  public void intArray() {
+    Bundle bundle = new Bundle();
+    bundle.putIntArray("foo", new int[] {1, 2, 3});
+
+    assertThat(bundle).intArray("foo").asList().containsExactly(1, 2, 3).inOrder();
+  }
+
+  @Test
+  public void integerArrayList() {
+    Bundle bundle = new Bundle();
+    bundle.putIntegerArrayList("foo", Lists.newArrayList(1, 2, 3));
+
+    assertThat(bundle).integerArrayList("foo").containsExactly(1, 2, 3).inOrder();
+  }
+
+  @Test
+  public void longArray() {
+    Bundle bundle = new Bundle();
+    bundle.putLongArray("foo", new long[] {1L, 2L, 3L});
+
+    assertThat(bundle).longArray("foo").asList().containsExactly(1L, 2L, 3L).inOrder();
+  }
+
+  @Test
+  public void doubleArray() {
+    Bundle bundle = new Bundle();
+    bundle.putDoubleArray("foo", new double[] {1.0, 2.0, 3.0});
+
+    assertThat(bundle)
+        .doubleArray("foo")
+        .usingExactEquality()
+        .containsExactly(1.0, 2.0, 3.0)
+        .inOrder();
+  }
+
+  @Test
+  public void stringArray() {
+    Bundle bundle = new Bundle();
+    bundle.putStringArray("foo", new String[] {"bar", "baz"});
+
+    assertThat(bundle).stringArray("foo").asList().containsExactly("bar", "baz").inOrder();
+  }
+
   @Test
   public void stringArrayList() {
     Bundle bundle = new Bundle();
diff --git a/ext/truth/javatests/androidx/test/ext/truth/os/ParcelableSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/os/ParcelableSubjectTest.java
new file mode 100644
index 000000000..4fef42c4f
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/os/ParcelableSubjectTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.truth.os;
+
+import static androidx.test.ext.truth.os.ParcelableSubject.assertThat;
+import static androidx.test.ext.truth.os.ParcelableSubject.parcelables;
+import static com.google.common.truth.ExpectFailure.assertThat;
+import static com.google.common.truth.ExpectFailure.expectFailureAbout;
+
+import android.accounts.Account;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class ParcelableSubjectTest {
+
+  @Test
+  public void marshallsEquallyTo() {
+    Account account = new Account("name", "type");
+    Account other = new Account("name", "type");
+    assertThat(account).marshallsEquallyTo(other);
+  }
+
+  @Test
+  public void marshallsEquallyTo_failure() {
+    Account account = new Account("name", "type");
+    Account other = new Account("different name", "type");
+    AssertionError failure =
+        expectFailureAbout(
+            parcelables(), whenTesting -> whenTesting.that(account).marshallsEquallyTo(other));
+    assertThat(failure).factValue("expected to serialize like").isEqualTo(other.toString());
+  }
+}
diff --git a/ext/truth/javatests/androidx/test/ext/truth/os/PersistableBundleSubjectTest.java b/ext/truth/javatests/androidx/test/ext/truth/os/PersistableBundleSubjectTest.java
new file mode 100644
index 000000000..5d2fa75ac
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/os/PersistableBundleSubjectTest.java
@@ -0,0 +1,383 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.ext.truth.os;
+
+import static androidx.test.ext.truth.os.PersistableBundleSubject.assertThat;
+
+import android.os.PersistableBundle;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Test for {@link PersistableBundleSubject}. */
+@RunWith(AndroidJUnit4.class)
+public class PersistableBundleSubjectTest {
+
+  private static final String NULL_KEY = "Null";
+  private static final String BOOLEAN_KEY = "Boolean";
+  private static final String DOUBLE_KEY = "Double";
+  private static final String INT_KEY = "Int";
+  private static final String LONG_KEY = "Long";
+  private static final String STRING_KEY = "String";
+  private static final String BOOLEAN_ARRAY_KEY = "BooleanArray";
+  private static final String DOUBLE_ARRAY_KEY = "DoubleArray";
+  private static final String INT_ARRAY_KEY = "IntArray";
+  private static final String LONG_ARRAY_KEY = "LongArray";
+  private static final String PERSISTABLE_BUNDLE_KEY = "PersistableBundle";
+  private static final String STRING_ARRAY_KEY = "StringArray";
+
+  private static final boolean BOOLEAN_VALUE = true;
+  private static final double DOUBLE_VALUE = 1.0;
+  private static final int INT_VALUE = 1;
+  private static final long LONG_VALUE = 1L;
+  private static final String STRING_VALUE = "bar";
+
+  // Be weary of reference equality here. getTestBundle() uses #clone to perform a shallow copy.
+  private static final boolean[] booleanArrayValue = new boolean[] {true, false};
+  private static final double[] doubleArrayValue = new double[] {1.0, 2.0, 3.0};
+  private static final int[] intArrayValue = new int[] {1, 2, 3};
+  private static final long[] longArrayValue = new long[] {1L, 2L, 3L};
+  private static final String[] stringArrayValue = new String[] {"bar", "baz"};
+
+  // List values: Due to lack of autoboxing of primitive arrays, we define an equivalent list for
+  // comparison using the array subjects. This isn't required for double array value since it has a
+  // PrimitiveDoubleArraySubject.
+  private static final List<Boolean> booleanArrayListValue = Arrays.asList(true, false);
+  private static final List<Integer> intArrayListValue = Arrays.asList(1, 2, 3);
+  private static final List<Long> longArrayListValue = Arrays.asList(1L, 2L, 3L);
+
+  @Test
+  public void isEmpty() {
+    PersistableBundle bundle = new PersistableBundle();
+    assertThat(bundle).isEmpty();
+    bundle.putString(STRING_KEY, STRING_VALUE);
+
+    assertThat(bundle).isNotEmpty();
+  }
+
+  @Test
+  public void hasSize() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putString(STRING_KEY, STRING_VALUE);
+
+    assertThat(bundle).hasSize(1);
+  }
+
+  @Test
+  public void containsKey() {
+    PersistableBundle bundle = new PersistableBundle();
+    assertThat(bundle).doesNotContainKey(STRING_KEY);
+    bundle.putString(STRING_KEY, STRING_VALUE);
+
+    assertThat(bundle).containsKey(STRING_KEY);
+  }
+
+  @Test
+  public void isEqualTo() {
+    // Test all possible values.
+    PersistableBundle bundle = getTestBundle();
+    PersistableBundle bundle2 = getTestBundle();
+
+    assertThat(bundle).isEqualTo(bundle2);
+  }
+
+  @Test
+  public void isEqualTo_nullBundles() {
+    PersistableBundle bundle = null;
+    PersistableBundle bundle2 = null;
+
+    assertThat(bundle).isEqualTo(bundle2);
+  }
+
+  @Test
+  public void isEqualTo_emptyBundles() {
+    assertThat(new PersistableBundle()).isEqualTo(new PersistableBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_nullBundle() {
+    PersistableBundle nullBundle = null;
+
+    assertThat(getTestBundle()).isNotEqualTo(nullBundle);
+    // Test the inverse as well.
+    assertThat(nullBundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_sameSize_differentKeys() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putString(STRING_KEY + "2", STRING_VALUE);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentSize() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.remove(STRING_KEY);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentType_oneIsPersistableBundle() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putString(PERSISTABLE_BUNDLE_KEY, STRING_VALUE);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentType_otherType() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putBoolean(STRING_KEY, false);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentBooleanValue() {
+    PersistableBundle bundle = getTestBundle();
+    // Original value is true.
+    bundle.putBoolean(BOOLEAN_KEY, false);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentIntValue() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putInt(INT_KEY, INT_VALUE * 2);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentDoubleValue() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putDouble(DOUBLE_KEY, DOUBLE_VALUE * 2.0);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentLongValue() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putLong(LONG_KEY, LONG_VALUE * 2L);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentStringValue() {
+    PersistableBundle bundle = getTestBundle();
+    bundle.putString(STRING_KEY, STRING_VALUE + "baz");
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentBooleanArrayValue() {
+    PersistableBundle bundle = getTestBundle();
+    // Original value is {true, false}.
+    bundle.putBooleanArray(BOOLEAN_ARRAY_KEY, new boolean[] {false, true});
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentDoubleArrayValue() {
+    PersistableBundle bundle = getTestBundle();
+    // Original value is {1.0, 2.0, 3.0}.
+    bundle.putDoubleArray(DOUBLE_ARRAY_KEY, new double[] {3.0, 2.0, 1.0});
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentIntArrayValue() {
+    PersistableBundle bundle = getTestBundle();
+    // Original value is {1, 2, 3}.
+    bundle.putIntArray(INT_ARRAY_KEY, new int[] {3, 2, 1});
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentLongArrayValue() {
+    PersistableBundle bundle = getTestBundle();
+    // Original value is {1, 2, 3}.
+    bundle.putLongArray(LONG_ARRAY_KEY, new long[] {3L, 2L, 1L});
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentNestedPersistableBundleValue() {
+    PersistableBundle bundle = getTestBundle();
+    PersistableBundle innerBundle = new PersistableBundle();
+    innerBundle.putString(STRING_KEY, STRING_VALUE + "baz");
+    bundle.putPersistableBundle(PERSISTABLE_BUNDLE_KEY, innerBundle);
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void isNotEqualTo_differentStringArrayValue() {
+    PersistableBundle bundle = getTestBundle();
+    // Original value is {"bar", "baz"}.
+    bundle.putStringArray(STRING_ARRAY_KEY, new String[] {"foo", "bar"});
+
+    assertThat(bundle).isNotEqualTo(getTestBundle());
+  }
+
+  @Test
+  public void string() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putString(STRING_KEY, STRING_VALUE);
+
+    assertThat(bundle).string(STRING_KEY).isEqualTo(STRING_VALUE);
+  }
+
+  @Test
+  public void integer() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putInt(INT_KEY, INT_VALUE);
+
+    assertThat(bundle).integer(INT_KEY).isEqualTo(INT_VALUE);
+  }
+
+  @Test
+  public void longInt() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putLong(LONG_KEY, LONG_VALUE);
+
+    assertThat(bundle).longInt(LONG_KEY).isEqualTo(LONG_VALUE);
+  }
+
+  @Test
+  public void doubleFloat() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putDouble(DOUBLE_KEY, DOUBLE_VALUE);
+
+    assertThat(bundle).doubleFloat(DOUBLE_KEY).isEqualTo(DOUBLE_VALUE);
+  }
+
+  @Test
+  public void bool() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putBoolean(BOOLEAN_KEY, BOOLEAN_VALUE);
+
+    assertThat(bundle).bool(BOOLEAN_KEY).isTrue();
+  }
+
+  @Test
+  public void booleanArray() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putBooleanArray(BOOLEAN_ARRAY_KEY, booleanArrayValue);
+
+    assertThat(bundle)
+        .booleanArray(BOOLEAN_ARRAY_KEY)
+        .asList()
+        .containsExactlyElementsIn(booleanArrayListValue)
+        .inOrder();
+  }
+
+  @Test
+  public void intArray() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putIntArray(INT_ARRAY_KEY, intArrayValue);
+
+    assertThat(bundle)
+        .intArray(INT_ARRAY_KEY)
+        .asList()
+        .containsExactlyElementsIn(intArrayListValue)
+        .inOrder();
+  }
+
+  @Test
+  public void longArray() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putLongArray(LONG_ARRAY_KEY, longArrayValue);
+
+    assertThat(bundle)
+        .longArray(LONG_ARRAY_KEY)
+        .asList()
+        .containsExactlyElementsIn(longArrayListValue)
+        .inOrder();
+  }
+
+  @Test
+  public void doubleArray() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putDoubleArray(DOUBLE_ARRAY_KEY, doubleArrayValue);
+
+    assertThat(bundle)
+        .doubleArray(DOUBLE_ARRAY_KEY)
+        .usingExactEquality()
+        .containsExactly(doubleArrayValue)
+        .inOrder();
+  }
+
+  @Test
+  public void stringArray() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putStringArray(STRING_ARRAY_KEY, stringArrayValue);
+
+    List<String> expectedList = Arrays.asList(stringArrayValue);
+    assertThat(bundle)
+        .stringArray(STRING_ARRAY_KEY)
+        .asList()
+        .containsExactlyElementsIn(expectedList)
+        .inOrder();
+  }
+
+  @Test
+  public void persistableBundle() {
+    PersistableBundle bundle = new PersistableBundle();
+    PersistableBundle innerBundle = new PersistableBundle();
+    innerBundle.putString(STRING_KEY, STRING_VALUE);
+    bundle.putPersistableBundle(PERSISTABLE_BUNDLE_KEY, innerBundle);
+
+    assertThat(bundle).persistableBundle("invalid").isNull();
+    assertThat(bundle).persistableBundle(PERSISTABLE_BUNDLE_KEY).isNotNull();
+    assertThat(bundle).persistableBundle(PERSISTABLE_BUNDLE_KEY).hasSize(1);
+    assertThat(bundle).persistableBundle(PERSISTABLE_BUNDLE_KEY).containsKey(STRING_KEY);
+  }
+
+  private PersistableBundle getTestBundle() {
+    PersistableBundle bundle = new PersistableBundle();
+    bundle.putString(NULL_KEY, null);
+    bundle.putBoolean(BOOLEAN_KEY, BOOLEAN_VALUE);
+    bundle.putDouble(DOUBLE_KEY, DOUBLE_VALUE);
+    bundle.putInt(INT_KEY, INT_VALUE);
+    bundle.putLong(LONG_KEY, LONG_VALUE);
+    bundle.putString(STRING_KEY, STRING_VALUE);
+    // Perform a shallow copy with clone to avoid reference equality. The underlying types support
+    // content equals just fine, so we don't have to worry about them being the same reference.
+    bundle.putBooleanArray(BOOLEAN_ARRAY_KEY, booleanArrayValue.clone());
+    bundle.putDoubleArray(DOUBLE_ARRAY_KEY, doubleArrayValue.clone());
+    bundle.putIntArray(INT_ARRAY_KEY, intArrayValue.clone());
+    bundle.putLongArray(LONG_ARRAY_KEY, longArrayValue.clone());
+    bundle.putStringArray(STRING_ARRAY_KEY, stringArrayValue.clone());
+    PersistableBundle innerBundle = new PersistableBundle();
+    innerBundle.putString(STRING_KEY, STRING_VALUE);
+    bundle.putPersistableBundle(PERSISTABLE_BUNDLE_KEY, innerBundle);
+    return bundle;
+  }
+}
diff --git a/ext/truth/javatests/androidx/test/ext/truth/util/BUILD b/ext/truth/javatests/androidx/test/ext/truth/util/BUILD
new file mode 100644
index 000000000..6ccbe71fd
--- /dev/null
+++ b/ext/truth/javatests/androidx/test/ext/truth/util/BUILD
@@ -0,0 +1,37 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "SparseBooleanArraySubjectTest",
+    srcs = ["SparseBooleanArraySubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//runner/rules",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "SparseBooleanArraySubjectTest_android",
+    srcs = ["SparseBooleanArraySubjectTest.java"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/gradle-tests/.gitignore b/gradle-tests/.gitignore
new file mode 100644
index 000000000..cd29f5bfb
--- /dev/null
+++ b/gradle-tests/.gitignore
@@ -0,0 +1,4 @@
+.idea
+.gradle
+build
+local.properties
diff --git a/gradle-tests/BUILD.bazel b/gradle-tests/BUILD.bazel
new file mode 100644
index 000000000..5de80c6d5
--- /dev/null
+++ b/gradle-tests/BUILD.bazel
@@ -0,0 +1,55 @@
+load("@bazel_skylib//rules:expand_template.bzl", "expand_template")
+load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
+load(
+    "//build_extensions:axt_versions.bzl",
+    "ANDROIDX_JUNIT_VERSION",
+    "ANDROIDX_TRUTH_VERSION",
+    "CORE_VERSION",
+    "ESPRESSO_VERSION",
+    "ESPRESSO_DEVICE_VERSION",
+    "MONITOR_VERSION",
+    "ORCHESTRATOR_VERSION",
+    "RULES_VERSION",
+    "RUNNER_VERSION",
+    "SERVICES_VERSION",
+)
+
+package(
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+expand_template(
+    name = "update_settings_gradle",
+    out = "settings.gradle.out",
+    substitutions = {
+        "{ANDROIDX_JUNIT_VERSION}": ANDROIDX_JUNIT_VERSION,
+        "{ANDROIDX_TRUTH_VERSION}": ANDROIDX_TRUTH_VERSION,
+        "{CORE_VERSION}": CORE_VERSION,
+        "{ESPRESSO_VERSION}": ESPRESSO_VERSION,
+        "{ESPRESSO_DEVICE_VERSION}": ESPRESSO_DEVICE_VERSION,
+        "{MONITOR_VERSION}": MONITOR_VERSION,
+        "{ORCHESTRATOR_VERSION}": ORCHESTRATOR_VERSION,
+        "{RULES_VERSION}": RULES_VERSION,
+        "{RUNNER_VERSION}": RUNNER_VERSION,
+        "{SERVICES_VERSION}": SERVICES_VERSION,
+        "{MODIFY_WARNING}": "// This file is auto-generated from tools/release/validation_and_propagate_versions.sh\n// DO NOT MODIFY locally",
+    },
+    template = "settings.gradle.template",
+)
+
+genrule(
+    name = "update_settings_gradle_rule",
+    srcs = [":update_settings_gradle"],
+    outs = ["settings.gradle.generated"],
+    cmd = "cp $(location :update_settings_gradle) \"$@\"",
+)
+
+diff_test(
+    name = "settings_gradle_diff_test",
+    file1 = "settings.gradle",
+    file2 = ":settings.gradle.generated",
+    failure_message = "Unexpected diff detected in settings.gradle. Have you run tools/release/validate_and_propagate_versions.sh?",
+    tags = ["fast"],
+)
diff --git a/gradle-tests/build.gradle b/gradle-tests/build.gradle
new file mode 100644
index 000000000..7ceaa6ccf
--- /dev/null
+++ b/gradle-tests/build.gradle
@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    id 'com.android.library' version '8.9.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
+}
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+ext {
+    minSdk = 23
+    targetSdk = 36
+    compileSdk = 36
+    emulatorApi = 33
+}
diff --git a/gradle-tests/espresso/.gitignore b/gradle-tests/espresso/.gitignore
new file mode 100644
index 000000000..10cfdbfaf
--- /dev/null
+++ b/gradle-tests/espresso/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/gradle-tests/espresso/accessibility/build.gradle b/gradle-tests/espresso/accessibility/build.gradle
new file mode 100644
index 000000000..1d1c972d8
--- /dev/null
+++ b/gradle-tests/espresso/accessibility/build.gradle
@@ -0,0 +1,50 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.espresso.accessibility'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.espresso.accessibility
+    androidTestImplementation libs.espresso.core
+    androidTestImplementation libs.espresso.intents
+}
diff --git a/gradle-tests/espresso/accessibility/src/androidTest/java/androidx/test/gradletests/espresso/accessibility/EspressoAccessibilityTest.kt b/gradle-tests/espresso/accessibility/src/androidTest/java/androidx/test/gradletests/espresso/accessibility/EspressoAccessibilityTest.kt
new file mode 100644
index 000000000..1c175f32e
--- /dev/null
+++ b/gradle-tests/espresso/accessibility/src/androidTest/java/androidx/test/gradletests/espresso/accessibility/EspressoAccessibilityTest.kt
@@ -0,0 +1,24 @@
+package androidx.test.gradletests.espresso.accessibility
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.accessibility.AccessibilityChecks
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/** Basic test using AccessibilityChecks. */
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class EspressoAccessibilityTest {
+  @Test
+  fun accessibilityChecks() {
+    AccessibilityChecks.enable()
+    ActivityScenario.launch(EspressoAccessibilityActivity::class.java).use {
+      onView(withId(R.id.openBrowserButton)).perform(click())
+    }
+  }
+}
diff --git a/gradle-tests/espresso/accessibility/src/main/AndroidManifest.xml b/gradle-tests/espresso/accessibility/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..e7e8651c8
--- /dev/null
+++ b/gradle-tests/espresso/accessibility/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".EspressoAccessibilityActivity"
+            android:label="Espresso Accessibility Activity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/espresso/accessibility/src/main/java/androidx/test/gradletests/espresso/accessibility/EspressoAccessibilityActivity.kt b/gradle-tests/espresso/accessibility/src/main/java/androidx/test/gradletests/espresso/accessibility/EspressoAccessibilityActivity.kt
new file mode 100644
index 000000000..b3827a039
--- /dev/null
+++ b/gradle-tests/espresso/accessibility/src/main/java/androidx/test/gradletests/espresso/accessibility/EspressoAccessibilityActivity.kt
@@ -0,0 +1,21 @@
+package androidx.test.gradletests.espresso.accessibility
+
+import android.app.Activity
+import android.content.Intent
+import android.net.Uri
+import android.os.Bundle
+import android.view.View
+
+class EspressoAccessibilityActivity : Activity(), View.OnClickListener {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_espresso_accessibility)
+  }
+
+  override fun onClick(view: View) {
+    val intent = Intent(Intent.ACTION_VIEW)
+    intent.setData(Uri.parse("http://developer.android.com"))
+    startActivity(intent)
+  }
+}
diff --git a/gradle-tests/espresso/accessibility/src/main/res/layout/activity_espresso_accessibility.xml b/gradle-tests/espresso/accessibility/src/main/res/layout/activity_espresso_accessibility.xml
new file mode 100644
index 000000000..85bd19c59
--- /dev/null
+++ b/gradle-tests/espresso/accessibility/src/main/res/layout/activity_espresso_accessibility.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+
+    <Button
+      android:id="@+id/openBrowserButton"
+      style="?android:attr/buttonStyleSmall"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:onClick="onClick"
+      android:text="@string/open_browser_text" />
+</LinearLayout>
\ No newline at end of file
diff --git a/gradle-tests/espresso/accessibility/src/main/res/values/strings.xml b/gradle-tests/espresso/accessibility/src/main/res/values/strings.xml
new file mode 100644
index 000000000..aec28f8d6
--- /dev/null
+++ b/gradle-tests/espresso/accessibility/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string name="open_browser_text">Open browser</string>
+</resources>
\ No newline at end of file
diff --git a/gradle-tests/espresso/build.gradle b/gradle-tests/espresso/build.gradle
new file mode 100644
index 000000000..816c82018
--- /dev/null
+++ b/gradle-tests/espresso/build.gradle
@@ -0,0 +1,55 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.espresso'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    // Also use the AOSP Automated Test Device image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.ext.truth
+    androidTestImplementation libs.espresso.core
+    androidTestImplementation libs.espresso.intents
+    androidTestImplementation libs.runner
+    androidTestImplementation libs.monitor
+    androidTestImplementation libs.core
+}
diff --git a/gradle-tests/espresso/contrib/build.gradle b/gradle-tests/espresso/contrib/build.gradle
new file mode 100644
index 000000000..da25de942
--- /dev/null
+++ b/gradle-tests/espresso/contrib/build.gradle
@@ -0,0 +1,51 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.espresso.contrib'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    // Also use the AOSP Automated Test Device image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    androidTestImplementation libs.espresso.contrib
+    androidTestImplementation libs.ext.junit
+}
diff --git a/gradle-tests/espresso/contrib/src/androidTest/java/androidx/test/gradletests/espresso/contrib/EspressoContribTest.kt b/gradle-tests/espresso/contrib/src/androidTest/java/androidx/test/gradletests/espresso/contrib/EspressoContribTest.kt
new file mode 100644
index 000000000..2231c37e6
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/androidTest/java/androidx/test/gradletests/espresso/contrib/EspressoContribTest.kt
@@ -0,0 +1,42 @@
+package androidx.test.gradletests.espresso.contrib
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class EspressoContribTest {
+  @get:Rule val activityScenarioRule = ActivityScenarioRule(EspressoContribActivity::class.java)
+
+  @Test
+  fun scrollToItemBelowFold_checkItsText() {
+    onView(withId(R.id.recyclerView))
+      .perform(
+        RecyclerViewActions.actionOnItemAtPosition<CustomAdapter.ViewHolder>(
+          ITEM_BELOW_THE_FOLD,
+          click()
+        )
+      )
+
+    val itemElementText =
+      ApplicationProvider.getApplicationContext<Context>()
+        .getResources()
+        .getString(R.string.item_element_text) + ITEM_BELOW_THE_FOLD.toString()
+    onView(withText(itemElementText)).check(matches(isDisplayed()))
+  }
+
+  companion object {
+    private const val ITEM_BELOW_THE_FOLD = 40
+  }
+}
diff --git a/gradle-tests/espresso/contrib/src/main/AndroidManifest.xml b/gradle-tests/espresso/contrib/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..7c9d02491
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".EspressoContribActivity"
+            android:label="Espresso Contrib Activity" 
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/espresso/contrib/src/main/java/androidx/test/gradletests/espresso/contrib/CustomAdapter.kt b/gradle-tests/espresso/contrib/src/main/java/androidx/test/gradletests/espresso/contrib/CustomAdapter.kt
new file mode 100644
index 000000000..caabb6189
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/main/java/androidx/test/gradletests/espresso/contrib/CustomAdapter.kt
@@ -0,0 +1,41 @@
+package androidx.test.gradletests.espresso.contrib
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+
+class CustomAdapter(val dataSet: List<String>, val context: Context) :
+  RecyclerView.Adapter<CustomAdapter.ViewHolder>() {
+
+  override fun getItemCount() = dataSet.size
+
+  override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+    if (position == dataSet.size / 2) {
+      holder.isInTheMiddle = true
+      holder.textView.text = context.resources.getString(R.string.middle)
+    } else {
+      holder.isInTheMiddle = false
+      holder.textView.text = dataSet[position]
+    }
+  }
+
+  override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
+    val view =
+      LayoutInflater.from(viewGroup.context).inflate(R.layout.text_row_item, viewGroup, false)
+    return ViewHolder(view)
+  }
+
+  inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    var textView: TextView
+      private set
+
+    var isInTheMiddle = false
+
+    init {
+      textView = view.findViewById(R.id.textView) as TextView
+    }
+  }
+}
diff --git a/gradle-tests/espresso/contrib/src/main/java/androidx/test/gradletests/espresso/contrib/EspressoContribActivity.kt b/gradle-tests/espresso/contrib/src/main/java/androidx/test/gradletests/espresso/contrib/EspressoContribActivity.kt
new file mode 100644
index 000000000..3491c68c3
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/main/java/androidx/test/gradletests/espresso/contrib/EspressoContribActivity.kt
@@ -0,0 +1,28 @@
+package androidx.test.gradletests.espresso.contrib
+
+import android.app.Activity
+import android.os.Bundle
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+
+class EspressoContribActivity : Activity() {
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_espresso_contrib)
+
+    val recyclerView = findViewById<RecyclerView>(R.id.recyclerView)
+    val linearLayoutManager = LinearLayoutManager(getApplicationContext())
+    recyclerView.setLayoutManager(linearLayoutManager)
+
+    val dataSet: List<String> =
+      0.until(DATASET_COUNT).map { i -> getString(R.string.item_element_text) + i }
+
+    val adapter = CustomAdapter(dataSet, getApplicationContext())
+    recyclerView.setAdapter(adapter)
+  }
+
+  companion object {
+    const val DATASET_COUNT = 50
+  }
+}
diff --git a/gradle-tests/espresso/contrib/src/main/res/layout/activity_espresso_contrib.xml b/gradle-tests/espresso/contrib/src/main/res/layout/activity_espresso_contrib.xml
new file mode 100644
index 000000000..e9b8e4d4d
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/main/res/layout/activity_espresso_contrib.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/gradle-tests/espresso/contrib/src/main/res/layout/text_row_item.xml b/gradle-tests/espresso/contrib/src/main/res/layout/text_row_item.xml
new file mode 100644
index 000000000..889602226
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/main/res/layout/text_row_item.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="72dp"
+    android:gravity="center_vertical">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/element_text"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/gradle-tests/espresso/contrib/src/main/res/values/strings.xml b/gradle-tests/espresso/contrib/src/main/res/values/strings.xml
new file mode 100644
index 000000000..c642cdd4f
--- /dev/null
+++ b/gradle-tests/espresso/contrib/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string name="element_text">Element</string>
+    <string name="item_element_text">This is element #</string>
+    <string name="middle">This is the middle!</string>
+</resources>
\ No newline at end of file
diff --git a/gradle-tests/espresso/device/build.gradle b/gradle-tests/espresso/device/build.gradle
new file mode 100644
index 000000000..34b55e4ca
--- /dev/null
+++ b/gradle-tests/espresso/device/build.gradle
@@ -0,0 +1,55 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.espresso.device'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    // Also use the AOSP Automated Test Device image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+        emulatorControl {
+            enable = true
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation libs.espresso.core
+    androidTestImplementation libs.espresso.device
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.ext.truth
+}
\ No newline at end of file
diff --git a/gradle-tests/espresso/device/src/androidTest/java/test/gradletests/espresso/device/EspressoDeviceTest.kt b/gradle-tests/espresso/device/src/androidTest/java/test/gradletests/espresso/device/EspressoDeviceTest.kt
new file mode 100644
index 000000000..f248fb4d2
--- /dev/null
+++ b/gradle-tests/espresso/device/src/androidTest/java/test/gradletests/espresso/device/EspressoDeviceTest.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.gradletests.espresso.device
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.device.EspressoDevice.Companion.onDevice
+import androidx.test.espresso.device.action.ScreenOrientation
+import androidx.test.espresso.device.action.setScreenOrientation
+import androidx.test.espresso.device.rules.ScreenOrientationRule
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.RuleChain
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class EspressoDeviceTest {
+  private val activityRule: ActivityScenarioRule<ScreenOrientationActivity> =
+    ActivityScenarioRule(ScreenOrientationActivity::class.java)
+
+  private val screenOrientationRule: ScreenOrientationRule =
+    ScreenOrientationRule(ScreenOrientation.PORTRAIT)
+
+  @get:Rule
+  val ruleChain: RuleChain = RuleChain.outerRule(activityRule).around(screenOrientationRule)
+
+  @Test
+  fun onDevice_setScreenOrientationToLandscape() {
+    onDevice().perform(setScreenOrientation(ScreenOrientation.LANDSCAPE))
+
+    onView(withId(R.id.current_screen_orientation)).check(matches(withText("landscape")))
+  }
+
+  @Test
+  fun onDevice_setScreenOrientationToLandscapeAndThenToPortrait() {
+    onDevice().perform(setScreenOrientation(ScreenOrientation.LANDSCAPE))
+
+    onView(withId(R.id.current_screen_orientation)).check(matches(withText("landscape")))
+
+    onDevice().perform(setScreenOrientation(ScreenOrientation.PORTRAIT))
+
+    onView(withId(R.id.current_screen_orientation)).check(matches(withText("portrait")))
+  }
+
+  @Test
+  fun onDevice_clickAndThenSetScreenOrientationToLandscape() {
+    onView(withId(R.id.current_screen_orientation)).perform(click())
+
+    onDevice().perform(setScreenOrientation(ScreenOrientation.LANDSCAPE))
+
+    onView(withId(R.id.current_screen_orientation)).check(matches(withText("landscape")))
+  }
+}
diff --git a/gradle-tests/espresso/device/src/main/AndroidManifest.xml b/gradle-tests/espresso/device/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..ad30b19b8
--- /dev/null
+++ b/gradle-tests/espresso/device/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".ScreenOrientationActivity"
+            android:label="Screen Orientation Activity"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/espresso/device/src/main/java/androidx/test/gradletests/espresso/device/ScreenOrientationActivity.kt b/gradle-tests/espresso/device/src/main/java/androidx/test/gradletests/espresso/device/ScreenOrientationActivity.kt
new file mode 100644
index 000000000..b19974191
--- /dev/null
+++ b/gradle-tests/espresso/device/src/main/java/androidx/test/gradletests/espresso/device/ScreenOrientationActivity.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.gradletests.espresso.device
+
+import android.app.Activity
+import android.content.res.Configuration
+import android.os.Bundle
+import android.util.Log
+import android.widget.TextView
+
+/** Activity that updates a TextView when its screen orientation is changed. */
+class ScreenOrientationActivity : Activity() {
+  companion object {
+    private val TAG = "ScreenOrientationActivity"
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_screen_orientation)
+
+    // Set orientation in onCreate the first time it's called.
+    val textView: TextView = findViewById<TextView>(R.id.current_screen_orientation)
+    if (
+      textView
+        .getText()
+        .toString()
+        .equals(getResources().getString(R.string.screen_orientation_text))
+    ) {
+      val orientation = setOrientationString(getResources().getConfiguration().orientation)
+      Log.d(TAG, "onCreate. Orientation set to " + orientation)
+    }
+  }
+
+  override fun onConfigurationChanged(newConfig: Configuration) {
+    super.onConfigurationChanged(newConfig)
+    val newOrientation = setOrientationString(newConfig.orientation)
+    Log.d(TAG, "onConfigurationChanged. New orientation is " + newOrientation)
+  }
+
+  private fun setOrientationString(orientation: Int): String {
+    val orientationString =
+      if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+        "landscape"
+      } else {
+        "portrait"
+      }
+
+    val textView: TextView = findViewById<TextView>(R.id.current_screen_orientation)
+    textView.setText(orientationString)
+    return orientationString
+  }
+}
diff --git a/gradle-tests/espresso/device/src/main/res/layout/activity_screen_orientation.xml b/gradle-tests/espresso/device/src/main/res/layout/activity_screen_orientation.xml
new file mode 100644
index 000000000..3dbddd996
--- /dev/null
+++ b/gradle-tests/espresso/device/src/main/res/layout/activity_screen_orientation.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/current_screen_orientation"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/screen_orientation_text" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/gradle-tests/espresso/device/src/main/res/values/strings.xml b/gradle-tests/espresso/device/src/main/res/values/strings.xml
new file mode 100644
index 000000000..5ca58d0b6
--- /dev/null
+++ b/gradle-tests/espresso/device/src/main/res/values/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2024 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+  <string name="screen_orientation_text"
+          description="Displays the current orientation of the test device [CHAR_LIMIT=NONE]">
+    screen orientation has not been set
+  </string>
+</resources>
\ No newline at end of file
diff --git a/gradle-tests/espresso/idling_resource/build.gradle b/gradle-tests/espresso/idling_resource/build.gradle
new file mode 100644
index 000000000..f7e0eb6cd
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/build.gradle
@@ -0,0 +1,53 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.espresso.idling_resource'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    // Also use the AOSP Automated Test Device image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation "androidx.annotation:annotation:1.7.0-beta01"
+    implementation libs.espresso.idlingresource
+    androidTestImplementation libs.espresso.core
+    androidTestImplementation libs.espresso.intents
+    androidTestImplementation libs.ext.junit
+}
diff --git a/gradle-tests/espresso/idling_resource/src/androidTest/java/androidx/test/gradletests/espresso/idling_resource/EspressoIdlingResourceTest.kt b/gradle-tests/espresso/idling_resource/src/androidTest/java/androidx/test/gradletests/espresso/idling_resource/EspressoIdlingResourceTest.kt
new file mode 100644
index 000000000..a51bbf464
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/src/androidTest/java/androidx/test/gradletests/espresso/idling_resource/EspressoIdlingResourceTest.kt
@@ -0,0 +1,64 @@
+package androidx.test.gradletests.espresso.idling_resource
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.IdlingResource
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class EspressoIdlingResourceTest {
+  private lateinit var idlingResource: IdlingResource
+
+  /**
+   * Use {@link ActivityScenario to launch and get access to the activity. {@link
+   * ActivityScenario#onActivity(ActivityScenario.ActivityAction)} provides a thread-safe mechanism
+   * to access the activity.
+   */
+  @Before
+  fun registerIdlingResource() {
+    val activityScenario = ActivityScenario.launch(EspressoIdlingResourceActivity::class.java)
+    activityScenario.onActivity(
+      object : ActivityScenario.ActivityAction<EspressoIdlingResourceActivity> {
+        override fun perform(activity: EspressoIdlingResourceActivity) {
+          idlingResource = activity.idlingResource
+          IdlingRegistry.getInstance().register(idlingResource)
+        }
+      }
+    )
+  }
+
+  @Test
+  fun changeText_sameActivity() {
+    // Type text and then press the button.
+    onView(withId(R.id.editTextUserInput))
+      .perform(typeText(STRING_TO_BE_TYPED), closeSoftKeyboard())
+    onView(withId(R.id.changeTextBt)).perform(click())
+
+    // Check that the text was changed.
+    onView(withId(R.id.textToBeChanged)).check(matches(withText(STRING_TO_BE_TYPED)))
+  }
+
+  @After
+  fun unregisterIdlingResource() {
+    if (idlingResource != null) {
+      IdlingRegistry.getInstance().unregister(idlingResource)
+    }
+  }
+
+  companion object {
+    private const val STRING_TO_BE_TYPED = "Espresso"
+  }
+}
diff --git a/gradle-tests/espresso/idling_resource/src/main/AndroidManifest.xml b/gradle-tests/espresso/idling_resource/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..b02985edc
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/src/main/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <activity
+            android:name=".EspressoIdlingResourceActivity"
+            android:label="Espresso IdlingResource Activity"
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/EspressoIdlingResourceActivity.kt b/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/EspressoIdlingResourceActivity.kt
new file mode 100644
index 000000000..c8e1adb88
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/EspressoIdlingResourceActivity.kt
@@ -0,0 +1,42 @@
+package androidx.test.gradletests.espresso.idling_resource
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.View
+import android.widget.EditText
+import android.widget.TextView
+
+/** Gets a text String from the user and displays it back after a while. */
+class EspressoIdlingResourceActivity :
+  Activity(), View.OnClickListener, MessageDelayer.DelayerCallback {
+
+  private lateinit var textView: TextView
+  private lateinit var editText: EditText
+  var idlingResource: SimpleIdlingResource = SimpleIdlingResource()
+    private set
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_espresso_idling_resource)
+
+    // Set the listeners for the buttons.
+    findViewById<View>(R.id.changeTextBt).setOnClickListener(this)
+    textView = findViewById<TextView>(R.id.textToBeChanged)
+    editText = findViewById<EditText>(R.id.editTextUserInput)
+  }
+
+  override fun onClick(view: View) {
+    // Get the text from the EditText view.
+    val text = editText.text.toString()
+    if (view.id == R.id.changeTextBt) {
+      // Set a temporary text.
+      textView.text = "Waiting for message..."
+      // Submit the message to the delayer.
+      MessageDelayer.processMessage(text, this, idlingResource)
+    }
+  }
+
+  override fun onDone(text: String?) {
+    textView.text = text
+  }
+}
diff --git a/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/MessageDelayer.kt b/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/MessageDelayer.kt
new file mode 100644
index 000000000..743658b07
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/MessageDelayer.kt
@@ -0,0 +1,40 @@
+package androidx.test.gradletests.espresso.idling_resource
+
+import android.os.Handler
+
+internal class MessageDelayer {
+
+  internal interface DelayerCallback {
+    fun onDone(text: String?)
+  }
+
+  companion object {
+    private const val DELAY_MILLIS = 3000L
+
+    /**
+     * Takes a String and returns it after [.DELAY_MILLIS] via a [DelayerCallback].
+     *
+     * @param message the String that will be returned via the callback
+     * @param callback used to notify the caller asynchronously
+     */
+    fun processMessage(
+      message: String,
+      callback: DelayerCallback?,
+      idlingResource: SimpleIdlingResource
+    ) {
+      idlingResource.setIdleState(false)
+
+      // Delay the execution, return message via callback.
+      val handler = Handler()
+      handler.postDelayed(
+        {
+          if (callback != null) {
+            callback.onDone(message)
+            idlingResource.setIdleState(true)
+          }
+        },
+        DELAY_MILLIS
+      )
+    }
+  }
+}
diff --git a/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/SimpleIdlingResource.kt b/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/SimpleIdlingResource.kt
new file mode 100644
index 000000000..41fba7c21
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/src/main/java/androidx/test/gradletests/espresso/idling_resource/SimpleIdlingResource.kt
@@ -0,0 +1,34 @@
+package androidx.test.gradletests.espresso.idling_resource
+
+import androidx.annotation.Nullable
+import androidx.test.espresso.IdlingResource
+import androidx.test.espresso.IdlingResource.ResourceCallback
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * A very simple implementation of {@link IdlingResource}.
+ *
+ * <p>
+ * Consider using CountingIdlingResource from espresso-contrib package if you use this class from
+ * multiple threads or need to keep a count of pending operations.
+ */
+class SimpleIdlingResource : IdlingResource {
+  @Volatile @Nullable private var callback: ResourceCallback? = null
+
+  private val isIdleNow = AtomicBoolean(true)
+
+  override fun getName() = this::class.java.name
+
+  override fun isIdleNow() = isIdleNow.get()
+
+  override fun registerIdleTransitionCallback(callback: ResourceCallback) {
+    this.callback = callback
+  }
+
+  fun setIdleState(isIdleNow: Boolean) {
+    this.isIdleNow.set(isIdleNow)
+    if (isIdleNow && callback != null) {
+      callback!!.onTransitionToIdle()
+    }
+  }
+}
diff --git a/gradle-tests/espresso/idling_resource/src/main/res/layout/activity_espresso_idling_resource.xml b/gradle-tests/espresso/idling_resource/src/main/res/layout/activity_espresso_idling_resource.xml
new file mode 100644
index 000000000..6329d6e9b
--- /dev/null
+++ b/gradle-tests/espresso/idling_resource/src/main/res/layout/activity_espresso_idling_resource.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+
+    <TextView
+            android:id="@+id/textToBeChanged"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="Hello World!"/>
+
+    <EditText
+            android:id="@+id/editTextUserInput"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:hint="Enter Text Here"/>
+
+    <Button
+            style="?android:attr/buttonStyleSmall"
+            android:id="@+id/changeTextBt"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Editing Text..."
+            android:layout_gravity="center_horizontal"/>
+
+</LinearLayout>
diff --git a/gradle-tests/espresso/src/androidTest/java/androidx/test/gradletests/espresso/EspressoTest.kt b/gradle-tests/espresso/src/androidTest/java/androidx/test/gradletests/espresso/EspressoTest.kt
new file mode 100644
index 000000000..9997e68f1
--- /dev/null
+++ b/gradle-tests/espresso/src/androidTest/java/androidx/test/gradletests/espresso/EspressoTest.kt
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.gradletests.espresso;
+
+import  androidx.test.espresso.Espresso.onView
+import  androidx.test.espresso.action.ViewActions.click
+import  androidx.test.espresso.assertion.ViewAssertions.matches
+import  androidx.test.espresso.intent.Intents.getIntents
+import  androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import  androidx.test.espresso.matcher.ViewMatchers.withId
+import  androidx.test.espresso.matcher.ViewMatchers.withText
+import  androidx.test.ext.truth.content.IntentCorrespondences.action
+import  com.google.common.truth.Truth.assertThat
+
+import android.content.Intent
+
+import androidx.test.espresso.intent.rule.IntentsRule
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Basic integration test for espresso
+ */
+@RunWith(AndroidJUnit4::class)
+class EspressoTest {
+
+    @get:Rule val activityScenarioRule = ActivityScenarioRule(EspressoActivity::class.java);
+    @get:Rule val intentsRule = IntentsRule()
+
+    @Test
+    fun espressoCheck() {
+        onView(withText("Text View")).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun espressoIntents() {
+        onView(withId(R.id.button)).perform(click())
+        assertThat(getIntents())
+                .comparingElementsUsing(action())
+                .contains(Intent(Intent.ACTION_VIEW))
+    }
+}
\ No newline at end of file
diff --git a/gradle-tests/espresso/src/main/AndroidManifest.xml b/gradle-tests/espresso/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..c121586b9
--- /dev/null
+++ b/gradle-tests/espresso/src/main/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".EspressoActivity"
+            android:exported="true"
+            android:label="Espresso Activity"
+           />
+
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/espresso/src/main/java/androidx/test/gradletests/espresso/EspressoActivity.kt b/gradle-tests/espresso/src/main/java/androidx/test/gradletests/espresso/EspressoActivity.kt
new file mode 100644
index 000000000..43f400b4e
--- /dev/null
+++ b/gradle-tests/espresso/src/main/java/androidx/test/gradletests/espresso/EspressoActivity.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.gradletests.espresso
+
+import android.app.Activity
+import android.os.Bundle
+import android.content.Intent
+import android.view.View
+
+class EspressoActivity : Activity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_espresso)
+
+        findViewById<View>(R.id.button).setOnClickListener { v ->
+            v.context.startActivity(Intent(Intent.ACTION_VIEW))
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle-tests/espresso/src/main/res/layout/activity_espresso.xml b/gradle-tests/espresso/src/main/res/layout/activity_espresso.xml
new file mode 100644
index 000000000..1443f72cf
--- /dev/null
+++ b/gradle-tests/espresso/src/main/res/layout/activity_espresso.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/text_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Text View" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/gradle-tests/espresso/web/build.gradle b/gradle-tests/espresso/web/build.gradle
new file mode 100644
index 000000000..c50435f7e
--- /dev/null
+++ b/gradle-tests/espresso/web/build.gradle
@@ -0,0 +1,50 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.espresso.web'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+  androidTestImplementation libs.core
+  androidTestImplementation libs.ext.junit
+  androidTestImplementation libs.espresso.web
+}
diff --git a/gradle-tests/espresso/web/src/androidTest/java/androidx/test/gradletests/espresso/web/EspressoWebTest.kt b/gradle-tests/espresso/web/src/androidTest/java/androidx/test/gradletests/espresso/web/EspressoWebTest.kt
new file mode 100644
index 000000000..ae84c93e1
--- /dev/null
+++ b/gradle-tests/espresso/web/src/androidTest/java/androidx/test/gradletests/espresso/web/EspressoWebTest.kt
@@ -0,0 +1,30 @@
+package androidx.test.gradletests.espresso.web
+
+import android.webkit.WebView
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
+import androidx.test.espresso.web.assertion.WebViewAssertions.webContent
+import androidx.test.espresso.web.matcher.DomMatchers.elementById
+import androidx.test.espresso.web.matcher.DomMatchers.withTextContent
+import androidx.test.espresso.web.sugar.Web.onWebView
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class EspressoWebTest {
+
+  @Before
+  fun setup() {
+    ActivityScenario.launch(EspressoWebActivity::class.java)
+  }
+
+  @Test
+  fun testWebContent() {
+    onWebView(isAssignableFrom(WebView::class.java))
+      .check(
+        webContent(elementById("info", withTextContent("Enter input and click the Submit button.")))
+      )
+  }
+}
diff --git a/gradle-tests/espresso/web/src/main/AndroidManifest.xml b/gradle-tests/espresso/web/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..235ab94a5
--- /dev/null
+++ b/gradle-tests/espresso/web/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application>
+        <activity
+            android:name=".EspressoWebActivity"
+            android:label="Espresso Web Activity" 
+            android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/espresso/web/src/main/java/androidx/test/gradletests/espresso/web/EspressoWebActivity.kt b/gradle-tests/espresso/web/src/main/java/androidx/test/gradletests/espresso/web/EspressoWebActivity.kt
new file mode 100644
index 000000000..245d4e5de
--- /dev/null
+++ b/gradle-tests/espresso/web/src/main/java/androidx/test/gradletests/espresso/web/EspressoWebActivity.kt
@@ -0,0 +1,35 @@
+package androidx.test.gradletests.espresso.web
+
+import android.app.Activity
+import android.os.Bundle
+import android.webkit.WebView
+
+class EspressoWebActivity : Activity() {
+  private lateinit var webView: WebView
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.activity_espresso_web)
+    webView = findViewById<WebView>(R.id.web_view)
+    webView.loadData(
+      "<html>" +
+        "<body>" +
+        "<script>" +
+        "  function onSubmit() {" +
+        "    value = document.getElementById('input').value;" +
+        "    document.getElementById('info').innerHTML = 'Submitted: ' + value;" +
+        "  }" +
+        "</script>" +
+        "<form action='javascript:onSubmit()'>" +
+        "  Input: <input type='text' id='input' value='sample'>" +
+        "  <input type='submit' id='submit' value='Submit'>" +
+        "</form>" +
+        "<p id='info'>Enter input and click the Submit button.</p>" +
+        "</body>" +
+        "</html>",
+      "text/html",
+      null
+    )
+    webView.getSettings().setJavaScriptEnabled(true)
+  }
+}
diff --git a/gradle-tests/espresso/web/src/main/res/layout/activity_espresso_web.xml b/gradle-tests/espresso/web/src/main/res/layout/activity_espresso_web.xml
new file mode 100644
index 000000000..a99932ec5
--- /dev/null
+++ b/gradle-tests/espresso/web/src/main/res/layout/activity_espresso_web.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+
+    <WebView
+            android:id="@+id/web_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:focusable="true"
+            android:focusableInTouchMode="true"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/gradle-tests/gradle.properties b/gradle-tests/gradle.properties
new file mode 100644
index 000000000..ad500c0da
--- /dev/null
+++ b/gradle-tests/gradle.properties
@@ -0,0 +1,22 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
+android.experimental.androidTest.enableEmulatorControl=true
\ No newline at end of file
diff --git a/gradle-tests/gradle/wrapper/gradle-wrapper.jar b/gradle-tests/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..b1b8ef56b
Binary files /dev/null and b/gradle-tests/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle-tests/gradle/wrapper/gradle-wrapper.properties b/gradle-tests/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..883e43efe
--- /dev/null
+++ b/gradle-tests/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Jun 26 12:45:45 PDT 2024
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradle-tests/gradlew b/gradle-tests/gradlew
new file mode 100755
index 000000000..249efbb03
--- /dev/null
+++ b/gradle-tests/gradlew
@@ -0,0 +1,248 @@
+#!/bin/sh
+
+#
+# Copyright © 2015 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+##############################################################################
+#
+#   gradlew start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh gradlew
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradle-tests/gradlew.bat b/gradle-tests/gradlew.bat
new file mode 100755
index 000000000..8508ef684
--- /dev/null
+++ b/gradle-tests/gradlew.bat
@@ -0,0 +1,82 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  gradlew startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables, and ensure extensions are enabled
+setlocal EnableExtensions
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+"%COMSPEC%" /c exit 1
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute gradlew
+@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
+@rem which allows us to clear the local environment before executing the java command
+endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+
+:exitWithErrorLevel
+@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
+"%COMSPEC%" /c exit %ERRORLEVEL%
diff --git a/gradle-tests/orchestrator/.gitignore b/gradle-tests/orchestrator/.gitignore
new file mode 100644
index 000000000..10cfdbfaf
--- /dev/null
+++ b/gradle-tests/orchestrator/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/gradle-tests/orchestrator/build.gradle b/gradle-tests/orchestrator/build.gradle
new file mode 100644
index 000000000..c4f98cf60
--- /dev/null
+++ b/gradle-tests/orchestrator/build.gradle
@@ -0,0 +1,56 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.orchestrator'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        // test with whitespace requires min sdk 30
+        minSdk 30
+        targetSdk rootProject.ext.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunnerArguments clearPackageData: 'true'
+    }
+
+    buildTypes {
+
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        execution 'ANDROIDX_TEST_ORCHESTRATOR'
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    // Also use the AOSP Automated Test Device image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation libs.ext.junit
+    androidTestImplementation libs.runner
+    androidTestImplementation libs.monitor
+    androidTestImplementation libs.ext.truth
+    androidTestUtil libs.orchestrator
+}
diff --git a/gradle-tests/orchestrator/src/androidTest/java/androidx/test/gradletests/orchestrator/OrchestratorTest.kt b/gradle-tests/orchestrator/src/androidTest/java/androidx/test/gradletests/orchestrator/OrchestratorTest.kt
new file mode 100644
index 000000000..474b45123
--- /dev/null
+++ b/gradle-tests/orchestrator/src/androidTest/java/androidx/test/gradletests/orchestrator/OrchestratorTest.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.gradletests.orchestrator
+
+import android.content.Context
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import java.io.File
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OrchestratorTest {
+  // create two tests, and verify storage is cleared between them by running the same actions in
+  // each
+  @Test
+  fun storage1() {
+    verifyStorageClearedThenAdd()
+  }
+
+  @Test
+  fun storage2() {
+    verifyStorageClearedThenAdd()
+  }
+
+  @Test
+  fun `test with whitespace`() {
+
+  }
+
+  private fun verifyStorageClearedThenAdd() {
+    val savedFile =
+      File(ApplicationProvider.getApplicationContext<Context>().filesDir, "myfile.txt")
+    assertThat(savedFile.exists()).isFalse()
+
+    savedFile.writeText("hi")
+  }
+}
diff --git a/gradle-tests/orchestrator/src/main/AndroidManifest.xml b/gradle-tests/orchestrator/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..a5918e68a
--- /dev/null
+++ b/gradle-tests/orchestrator/src/main/AndroidManifest.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
\ No newline at end of file
diff --git a/gradle-tests/runner/.gitignore b/gradle-tests/runner/.gitignore
new file mode 100644
index 000000000..10cfdbfaf
--- /dev/null
+++ b/gradle-tests/runner/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+.cxx
+local.properties
diff --git a/gradle-tests/runner/build.gradle b/gradle-tests/runner/build.gradle
new file mode 100644
index 000000000..bc65f16ff
--- /dev/null
+++ b/gradle-tests/runner/build.gradle
@@ -0,0 +1,49 @@
+plugins {
+    id 'com.android.library'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
+    kotlinOptions {
+        jvmTarget = "17"
+    }
+}
+
+android {
+    namespace 'androidx.test.gradletests.runner'
+    compileSdk rootProject.ext.compileSdk
+
+    defaultConfig {
+        minSdk rootProject.ext.minSdk
+        targetSdk rootProject.ext.targetSdk
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    testOptions {
+        animationsDisabled = true
+        managedDevices {
+            devices {
+                // run with ../gradlew  nexusOneDebugAndroidTest
+                nexusOne(com.android.build.api.dsl.ManagedVirtualDevice) {
+                    // A lower resolution device is used here for better emulator performance
+                    device = "Nexus One"
+                    apiLevel = rootProject.ext.emulatorApi
+                    // Also use the AOSP Automated Test Device image for better emulator performance
+                    systemImageSource = "aosp-atd"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    androidTestImplementation libs.runner
+    androidTestImplementation libs.monitor
+}
+
diff --git a/gradle-tests/runner/gradle.properties b/gradle-tests/runner/gradle.properties
new file mode 100644
index 000000000..3e927b11e
--- /dev/null
+++ b/gradle-tests/runner/gradle.properties
@@ -0,0 +1,21 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
\ No newline at end of file
diff --git a/gradle-tests/runner/src/androidTest/java/androidx/test/gradletests/runner/SimpleTest.java b/gradle-tests/runner/src/androidTest/java/androidx/test/gradletests/runner/SimpleTest.java
new file mode 100644
index 000000000..c6e51c2c1
--- /dev/null
+++ b/gradle-tests/runner/src/androidTest/java/androidx/test/gradletests/runner/SimpleTest.java
@@ -0,0 +1,17 @@
+package androidx.test.gradletests.runner;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import androidx.test.platform.app.InstrumentationRegistry;
+import org.junit.Test;
+
+/** Simplest possible test */
+public class SimpleTest {
+  @Test
+  public void useAppContext() {
+    // Context of the app under test.
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+    assertEquals("androidx.test.gradletests.runner.test", appContext.getPackageName());
+  }
+}
diff --git a/gradle-tests/settings.gradle b/gradle-tests/settings.gradle
new file mode 100644
index 000000000..7cf08b1f2
--- /dev/null
+++ b/gradle-tests/settings.gradle
@@ -0,0 +1,47 @@
+// This file is auto-generated from tools/release/validation_and_propagate_versions.sh
+// DO NOT MODIFY locally
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+    versionCatalogs {
+        libs {
+            library('core', 'androidx.test:core:1.8.0-alpha01')
+            library('monitor', 'androidx.test:monitor:1.9.0-alpha02')
+            library('runner', 'androidx.test:runner:1.8.0-alpha01')
+            library('ext.junit', 'androidx.test.ext:junit:1.4.0-alpha01')
+            library('ext.truth', 'androidx.test.ext:truth:1.8.0-alpha01')
+            library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.8.0-alpha01')
+            library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.8.0-alpha01')
+            library('espresso.core', 'androidx.test.espresso:espresso-core:3.8.0-alpha01')
+            library('espresso.device', 'androidx.test.espresso:espresso-device:1.2.0-alpha01')
+            library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.8.0-alpha01')
+            library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.8.0-alpha01')
+            library('espresso.web', 'androidx.test.espresso:espresso-web:3.8.0-alpha01')
+            library('orchestrator', 'androidx.test:orchestrator:1.7.0-alpha01')
+
+        }
+    }
+}
+
+rootProject.name = "Gradle Tests"
+include ':runner'
+include ':espresso'
+include ':espresso:accessibility'
+include ':espresso:contrib'
+include ':espresso:device'
+include ':espresso:idling_resource'
+include ':espresso:web'
+include ':orchestrator'
diff --git a/gradle-tests/settings.gradle.template b/gradle-tests/settings.gradle.template
new file mode 100644
index 000000000..ccb7d4d20
--- /dev/null
+++ b/gradle-tests/settings.gradle.template
@@ -0,0 +1,46 @@
+{MODIFY_WARNING}
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        mavenLocal()
+    }
+    versionCatalogs {
+        libs {
+            library('core', 'androidx.test:core:{CORE_VERSION}')
+            library('monitor', 'androidx.test:monitor:{MONITOR_VERSION}')
+            library('runner', 'androidx.test:runner:{RUNNER_VERSION}')
+            library('ext.junit', 'androidx.test.ext:junit:{ANDROIDX_JUNIT_VERSION}')
+            library('ext.truth', 'androidx.test.ext:truth:{ANDROIDX_TRUTH_VERSION}')
+            library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:{ESPRESSO_VERSION}')
+            library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:{ESPRESSO_VERSION}')
+            library('espresso.core', 'androidx.test.espresso:espresso-core:{ESPRESSO_VERSION}')
+            library('espresso.device', 'androidx.test.espresso:espresso-device:{ESPRESSO_DEVICE_VERSION}')
+            library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:{ESPRESSO_VERSION}')
+            library('espresso.intents', 'androidx.test.espresso:espresso-intents:{ESPRESSO_VERSION}')
+            library('espresso.web', 'androidx.test.espresso:espresso-web:{ESPRESSO_VERSION}')
+            library('orchestrator', 'androidx.test:orchestrator:{ORCHESTRATOR_VERSION}')
+
+        }
+    }
+}
+
+rootProject.name = "Gradle Tests"
+include ':runner'
+include ':espresso'
+include ':espresso:accessibility'
+include ':espresso:contrib'
+include ':espresso:device'
+include ':espresso:idling_resource'
+include ':espresso:web'
+include ':orchestrator'
diff --git a/kokoro/axt_attest_artifacts.cfg b/kokoro/axt_attest_artifacts.cfg
new file mode 100644
index 000000000..e6d1b412e
--- /dev/null
+++ b/kokoro/axt_attest_artifacts.cfg
@@ -0,0 +1,12 @@
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
+build_file: "piper/google3/third_party/android/androidx_test/kokoro/axt_attest_artifacts.sh"
+
+action {
+  define_artifacts {
+    regex: "output_dir/axt_m2repository_unsigned_and_attested.zip"
+    strip_prefix: "output_dir"
+    fail_if_no_artifacts: true
+  }
+}
\ No newline at end of file
diff --git a/kokoro/axt_attest_artifacts.sh b/kokoro/axt_attest_artifacts.sh
new file mode 100644
index 000000000..e8d7f9765
--- /dev/null
+++ b/kokoro/axt_attest_artifacts.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+# Fail on any error.
+set -e
+
+mkdir -p "${KOKORO_ARTIFACTS_DIR}/output_dir"
+cd "${KOKORO_ARTIFACTS_DIR}/output_dir"
+
+GCS_BUCKET="androidx-test-staging/release"
+ATTESTATION_FILE="attestation.intoto.jsonl"
+INPUT_ZIP="axt_m2repository_unsigned.zip"
+OUTPUT_ZIP="axt_m2repository_unsigned_and_attested.zip"
+
+# 1. Find the full GCS path of the zip file
+ZIP_GCS_PATH=$(gcloud storage ls "gs://${GCS_BUCKET}/*/*/${CANDIDATE_NAME}/axt_m2repository_unsigned.zip" | head -n 1)
+
+if [[ -z "${ZIP_GCS_PATH}" ]]; then
+  echo "Error: Could not find the zip file for candidate ${CANDIDATE_NAME}."
+  exit 1
+fi
+
+# 2. Extract the parent path: gs://[BUCKET_NAME]/[timestamp]/[build id]
+# Removes '/axt_m2repository_unsigned.zip'
+DIR_PATH="${ZIP_GCS_PATH%/*}"
+# Removes '/[CANDIDATE_NAME]'
+DIR_PATH="${DIR_PATH%/*}"
+
+echo "Target build directory identified: ${DIR_PATH}"
+
+# 3. Download and rename the ZIP file to current working directory
+echo "Downloading zip file..."
+gcloud storage cp "${ZIP_GCS_PATH}" "./${INPUT_ZIP}"
+
+# 4. Download and rename the attestation file
+if gcloud storage ls "${DIR_PATH}/${CANDIDATE_NAME}.intoto.jsonl" > /dev/null 2>&1; then
+  echo "Downloading attestation..."
+  gcloud storage cp "${DIR_PATH}/${CANDIDATE_NAME}.intoto.jsonl" "./${ATTESTATION_FILE}"
+else
+  echo "Error: Could not find an attestation file in ${DIR_PATH}"
+  exit 1
+fi
+
+SCRATCH_DIR=$(mktemp -d -t axt_attest_XXXXXX)
+
+echo "Unzipping $INPUT_ZIP to temporary directory..."
+unzip -q "$INPUT_ZIP" -d "$SCRATCH_DIR"
+
+echo "Scanning for .pom files..."
+find "$SCRATCH_DIR" -type f -name "*.pom" | while IFS= read -r pom_path; do
+  pom_dir=$(dirname "$pom_path")
+  pom_filename=$(basename "$pom_path")
+
+  # Remove .pom extension to get artifactid-version
+  artifact_prefix="${pom_filename%.pom}"
+
+  target_attestation="$pom_dir/$artifact_prefix.intoto.jsonl"
+
+  cp "$ATTESTATION_FILE" "$target_attestation"
+  echo "Added attestation: $target_attestation"
+done
+
+echo "Re-zipping content to $OUTPUT_ZIP..."
+OUTPUT_ZIP_ABS="$(pwd)/$OUTPUT_ZIP"
+
+# Delete output zip if it already exists to avoid appending
+rm -f "$OUTPUT_ZIP_ABS"
+
+(cd "$SCRATCH_DIR" && zip -r -q "$OUTPUT_ZIP_ABS" .)
+
+echo "Success! Created $OUTPUT_ZIP"
diff --git a/kokoro/axt_build_artifacts.cfg b/kokoro/axt_build_artifacts.cfg
new file mode 100644
index 000000000..938a6e96b
--- /dev/null
+++ b/kokoro/axt_build_artifacts.cfg
@@ -0,0 +1,26 @@
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
+build_file: "android-test-releases/kokoro/build_artifacts.sh"
+
+fileset_artifacts {
+  # make the generated attestation bundle name equal to the Rapid candidate name
+  name: "$[CANDIDATE_NAME]"
+
+  # Globs replace the legacy 'regex' field.
+  artifact_globs: "github/android-test-releases/axt_m2repository_unsigned.zip"
+
+  # Removes the directory path prefix from the artifact output.
+  strip_prefix: "github/android-test-releases"
+
+  # Fails the build if the zip file is not generated
+  error_if_missing: true
+
+  destinations {
+    store_attestation: true
+
+    gcs {
+      gcs_root_path: "androidx-test-staging/release"
+    }
+  }
+}
diff --git a/kokoro/axt_test_artifacts.cfg b/kokoro/axt_test_artifacts.cfg
new file mode 100644
index 000000000..e9cf28500
--- /dev/null
+++ b/kokoro/axt_test_artifacts.cfg
@@ -0,0 +1,6 @@
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
+build_file: "android-test-releases/kokoro/test_artifacts.sh"
+
+gfile_resources: "/bigstore/androidx-test-staging/release/axt_m2repository.zip"
\ No newline at end of file
diff --git a/kokoro/build_artifacts.sh b/kokoro/build_artifacts.sh
new file mode 100644
index 000000000..3c54e3f1d
--- /dev/null
+++ b/kokoro/build_artifacts.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Fail on any error.
+set -e
+
+# this directory must exist for artifacts to be uploaded
+mkdir -p "${KOKORO_ARTIFACTS_DIR}/artifacts"
+cd "${KOKORO_ARTIFACTS_DIR}/github/android-test-releases"
+
+source kokoro/common.sh
+install_bazelisk
+# building :axt_m2_repository uses @androidsdk//:build-tools/33.0.2/aapt2
+/opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --sdk_root=/opt/android-sdk "build-tools;33.0.2"
+/opt/android-sdk/cmdline-tools/latest/bin/sdkmanager --sdk_root=/opt/android-sdk "platforms;android-36" "build-tools;36.0.0"
+
+bazelisk build :axt_m2repository
+
+# copy the zip here so that we don't follow symlinks to get the files to upload
+cp bazel-bin/axt_m2repository.zip axt_m2repository_unsigned.zip
diff --git a/kokoro/common.sh b/kokoro/common.sh
new file mode 100644
index 000000000..226364298
--- /dev/null
+++ b/kokoro/common.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+#------------------------------------------------------------------------------
+# Install bazelisk
+#------------------------------------------------------------------------------
+function install_bazelisk() {
+  bazelisk_version="v1.16.0"
+  download_url="https://github.com/bazelbuild/bazelisk/releases/download/${bazelisk_version}/bazelisk-linux-amd64"
+  mkdir -p "${TMPDIR}/bazelisk-release"
+  wget -nv ${download_url} -O "${TMPDIR}/bazelisk-release/bazelisk"
+  chmod +x "${TMPDIR}/bazelisk-release/bazelisk"
+  export PATH="${TMPDIR}/bazelisk-release:${PATH}"
+}
+
diff --git a/kokoro/test_artifacts.sh b/kokoro/test_artifacts.sh
new file mode 100644
index 000000000..444682dc5
--- /dev/null
+++ b/kokoro/test_artifacts.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Fail on any error.
+set -e
+
+# move to where kokoro put the repository root
+cd "${KOKORO_ARTIFACTS_DIR}/github/android-test-releases"
+
+unzip "${KOKORO_GFILE_DIR}/axt_m2repository.zip" -d "/root/.m2"
+
+curl -s https://repos.azul.com/azul-repo.key | sudo gpg --dearmor -o /usr/share/keyrings/azul.gpg
+echo "deb [signed-by=/usr/share/keyrings/azul.gpg] https://repos.azul.com/zulu/deb stable main" | sudo tee /etc/apt/sources.list.d/zulu.list
+apt-get update
+apt-get install -y zulu21-jdk
+export JAVA_HOME="$(update-java-alternatives -l | grep "1.21" | head -n 1 | tr -s " " | cut -d " " -f 3)"
+
+cd gradle-tests
+# TODO(b/406071564): remove exclusion of espresso-device tests once they work in kokoro env
+./gradlew nexusOneDebugAndroidTest --stacktrace -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect -Dandroid.experimental.androidTest.numManagedDeviceShards=1 -x :espresso:device:nexusOneDebugAndroidTest
diff --git a/ktx/BUILD b/ktx/BUILD
new file mode 100644
index 000000000..9fe27304c
--- /dev/null
+++ b/ktx/BUILD
@@ -0,0 +1,13 @@
+# # androidx.test ktx extensions
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+exports_files([
+    "LICENSE",
+])
diff --git a/ktx/core/BUILD b/ktx/core/BUILD
new file mode 100644
index 000000000..0e3af153a
--- /dev/null
+++ b/ktx/core/BUILD
@@ -0,0 +1,14 @@
+# Publicly visible androidx.test.core Kotlin extension library
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "core",
+    actual = "//ktx/core/java/androidx/test/core",
+    visibility = ["//visibility:public"],
+)
diff --git a/ktx/core/BUILD.bazel b/ktx/core/BUILD.bazel
deleted file mode 100644
index a96a21579..000000000
--- a/ktx/core/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-# Publicly visible androidx.test.core Kotlin extension library
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "core",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = ["//ktx/core/java/androidx/test/core"],
-)
diff --git a/ktx/core/java/androidx/test/core/AndroidManifest.xml b/ktx/core/java/androidx/test/core/AndroidManifest.xml
index 2d82b2483..c3ed3734a 100644
--- a/ktx/core/java/androidx/test/core/AndroidManifest.xml
+++ b/ktx/core/java/androidx/test/core/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.test.core.ktx" >
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 </manifest>
diff --git a/ktx/core/java/androidx/test/core/BUILD b/ktx/core/java/androidx/test/core/BUILD
new file mode 100644
index 000000000..87b2501d9
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/BUILD
@@ -0,0 +1,68 @@
+# androidx.test.core Kotlin extensions
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+kt_android_library(
+    name = "core",
+    srcs = glob(["**/*.kt"]),
+    custom_package = "androidx.test.core.ktx",
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+    ],
+)
+
+# Group of targets to use to produce release binary
+# kt_android)library doesn't produce an aar, so wrap inside a android_library
+android_library(
+    name = "core_aar_lib",
+    custom_package = "androidx.test.core.ktx",
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:private"],
+    exports = [
+        ":core",
+    ],
+)
+
+axt_android_aar(
+    name = "core_aar",
+
+    # we'll be super explicit with the expected classes here since this is effectively a
+    # stale artifact. All future classes should just go into //core
+    expected_class_prefixes = [
+        "androidx.test.core.app.ActivityScenarioKt",
+    ],
+    included_dep = ":core_aar_lib",
+)
+
+maven_artifact(
+    name = "core_maven_artifact",
+    last_updated = "20181029000000",
+    target = ":core_aar",
+)
+
+dackka_test(
+    name = "core_doc",
+    runtime_dep = ":core_aar_lib",
+    src_jar = ":core_aar-src.jar",
+)
+
+api_checks(
+    name = "core_api",
+    runtime_dep = ":core_aar_lib",
+    src_jar = ":core_aar-src.jar",
+)
diff --git a/ktx/core/java/androidx/test/core/BUILD.bazel b/ktx/core/java/androidx/test/core/BUILD.bazel
deleted file mode 100644
index cc45a4865..000000000
--- a/ktx/core/java/androidx/test/core/BUILD.bazel
+++ /dev/null
@@ -1,72 +0,0 @@
-# androidx.test.core Kotlin extensions
-
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "RUNNER_VERSION", "KOTLIN_VERSION")
-
-
-package(
-    default_visibility = [
-        "//:__subpackages__",
-    ],
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-
-
-kt_android_library(
-    name = "core",
-    srcs = glob(
-        ["**/*.kt"],
-    ),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-    ],
-)
-
-load("//build_extensions:release.bzl", "axt_release_lib")
-
-# Group of targets to use to produce release binary
-android_library(
-    name = "core_release_lib",
-    exports = [
-        ":core",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: core_release_no_deps.jar and core_release.aar
-# a java_library target libcore_release_no_deps
-axt_release_lib(
-    name = "core_release",
-    custom_package = "androidx.test.core.ktx",
-    keep_spec = "androidx/test/core|META-INF/androidx.test.core.kotlin_module",
-    overlapping_jars = [
-        "//core/java/androidx/test/core:core_release_no_deps.jar",
-    ],
-    remove_spec = "androidx/test/core/ktx/R[$$\\.]|androidx/test/core/R[$$\\.]",
-    resource_files = glob(
-        ["res/**/*"],
-    ),
-    deps = [
-        ":core_release_lib",
-    ],
-)
-
-
-maven_artifact(
-    name = "core_maven_artifact",
-    src = ":core_release.aar",
-    artifact_deps = [
-        "androidx.test:core:%s" % CORE_VERSION,
-        "androidx.lifecycle:lifecycle-common:%s" % ANDROIDX_LIFECYCLE_VERSION,
-        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
-    ],
-    artifact_id = "core-ktx",
-    group_id = "androidx.test",
-    last_updated = "20181029000000",
-    src_jar = ":libcore-src.jar",
-    version = "%s" % CORE_VERSION,
-)
diff --git a/ktx/core/java/androidx/test/core/api/current.txt b/ktx/core/java/androidx/test/core/api/1.4.0_public.txt
similarity index 100%
rename from ktx/core/java/androidx/test/core/api/current.txt
rename to ktx/core/java/androidx/test/core/api/1.4.0_public.txt
diff --git a/ktx/core/java/androidx/test/core/api/1.5.0_internal.txt b/ktx/core/java/androidx/test/core/api/1.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/1.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ktx/core/java/androidx/test/core/api/1.5.0_public.txt b/ktx/core/java/androidx/test/core/api/1.5.0_public.txt
new file mode 100644
index 000000000..3bbeb6c00
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/1.5.0_public.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenarioKt {
+    method public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launchActivity(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+    method public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A>! launchActivityForResult(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+  }
+
+}
+
diff --git a/ktx/core/java/androidx/test/core/api/1.6.0_internal.txt b/ktx/core/java/androidx/test/core/api/1.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/1.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ktx/core/java/androidx/test/core/api/1.6.0_public.txt b/ktx/core/java/androidx/test/core/api/1.6.0_public.txt
new file mode 100644
index 000000000..6ff53377a
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/1.6.0_public.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenarioKt {
+    method public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivity(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+    method public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+  }
+
+}
+
diff --git a/ktx/core/java/androidx/test/core/api/1.7.0_internal.txt b/ktx/core/java/androidx/test/core/api/1.7.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/1.7.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ktx/core/java/androidx/test/core/api/1.7.0_public.txt b/ktx/core/java/androidx/test/core/api/1.7.0_public.txt
new file mode 100644
index 000000000..6ff53377a
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/1.7.0_public.txt
@@ -0,0 +1,10 @@
+// Signature format: 3.0
+package androidx.test.core.app {
+
+  public final class ActivityScenarioKt {
+    method public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivity(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+    method public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+  }
+
+}
+
diff --git a/ktx/core/java/androidx/test/core/api/current_internal.txt b/ktx/core/java/androidx/test/core/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/ktx/core/java/androidx/test/core/api/current_public.txt b/ktx/core/java/androidx/test/core/api/current_public.txt
new file mode 100644
index 000000000..700d8ecb6
--- /dev/null
+++ b/ktx/core/java/androidx/test/core/api/current_public.txt
@@ -0,0 +1,10 @@
+// Signature format: 5.0
+package androidx.test.core.app {
+
+  public final class ActivityScenarioKt {
+    method @KotlinOnly public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivity(optional android.content.Intent? intent, optional android.os.Bundle? activityOptions);
+    method @KotlinOnly public static inline <reified A extends android.app.Activity> androidx.test.core.app.ActivityScenario<A> launchActivityForResult(optional android.content.Intent? intent, optional android.os.Bundle? activityOptions);
+  }
+
+}
+
diff --git a/ktx/core/java/androidx/test/core/app/ActivityScenario.kt b/ktx/core/java/androidx/test/core/app/ActivityScenario.kt
index 758b0b1f8..f6eb4eade 100644
--- a/ktx/core/java/androidx/test/core/app/ActivityScenario.kt
+++ b/ktx/core/java/androidx/test/core/app/ActivityScenario.kt
@@ -30,7 +30,7 @@ import androidx.lifecycle.Lifecycle.State
  *
  * @param intent an intent to start activity or null to use the default one
  * @param activityOptions an activity options bundle to be passed along with the intent to start
- *        activity
+ * activity
  * @throws AssertionError if the lifecycle state transition never completes within the timeout
  * @return ActivityScenario which you can use to make further state transitions
  */
@@ -42,3 +42,26 @@ inline fun <reified A : Activity> launchActivity(
     null -> ActivityScenario.launch(A::class.java, activityOptions)
     else -> ActivityScenario.launch(intent, activityOptions)
   }
+
+/**
+ * Launches an activity of a given class and constructs ActivityScenario with the activity. Waits
+ * for the lifecycle state transitions to be complete. Broadcasts activity result.
+ *
+ * Normally this would be [State.RESUMED], but may be another state.
+ *
+ * This method cannot be called from the main thread except in Robolectric tests.
+ *
+ * @param intent an intent to start activity or null to use the default one
+ * @param activityOptions an activity options bundle to be passed along with the intent to start
+ * activity
+ * @throws AssertionError if the lifecycle state transition never completes within the timeout
+ * @return ActivityScenario which you can use to make further state transitions
+ */
+inline fun <reified A : Activity> launchActivityForResult(
+  intent: Intent? = null,
+  activityOptions: Bundle? = null
+): ActivityScenario<A> =
+  when (intent) {
+    null -> ActivityScenario.launchActivityForResult(A::class.java, activityOptions)
+    else -> ActivityScenario.launchActivityForResult(intent, activityOptions)
+  }
diff --git a/ktx/core/javatests/androidx/test/core/app/ActivityScenarioKotlinTest.kt b/ktx/core/javatests/androidx/test/core/app/ActivityScenarioKotlinTest.kt
index fe392a9d0..e31a73580 100644
--- a/ktx/core/javatests/androidx/test/core/app/ActivityScenarioKotlinTest.kt
+++ b/ktx/core/javatests/androidx/test/core/app/ActivityScenarioKotlinTest.kt
@@ -40,6 +40,43 @@ class ActivityScenarioKotlinTest {
   @Test
   fun basicUseCase() {
     launchActivity<RecreationRecordingActivity>().use { scenario ->
+      with(scenario) {
+        assertThat(state).isEqualTo(State.RESUMED)
+        onActivity {
+          assertThat(it.numberOfRecreations).isEqualTo(0)
+          assertThat(lastLifeCycleTransition(it)).isEqualTo(Stage.RESUMED)
+        }
+
+        recreate()
+        assertThat(state).isEqualTo(State.RESUMED)
+        onActivity {
+          assertThat(it.numberOfRecreations).isEqualTo(1)
+          assertThat(lastLifeCycleTransition(it)).isEqualTo(Stage.RESUMED)
+        }
+
+        moveToState(State.STARTED)
+        assertThat(state).isEqualTo(State.STARTED)
+        onActivity {
+          assertThat(it.numberOfRecreations).isEqualTo(1)
+          assertThat(lastLifeCycleTransition(it)).isEqualTo(Stage.PAUSED)
+        }
+
+        moveToState(State.CREATED)
+        assertThat(state).isEqualTo(State.CREATED)
+        onActivity {
+          assertThat(it.numberOfRecreations).isEqualTo(1)
+          assertThat(lastLifeCycleTransition(it)).isEqualTo(Stage.STOPPED)
+        }
+
+        moveToState(State.RESUMED)
+        assertThat(state).isEqualTo(State.RESUMED)
+      }
+    }
+  }
+
+  @Test
+  fun basicUseCaseWithResult() {
+    launchActivityForResult<RecreationRecordingActivity>().use { scenario ->
       with(scenario) {
         assertThat(state).isEqualTo(State.RESUMED)
         onActivity {
diff --git a/ktx/core/javatests/androidx/test/core/app/AndroidManifest_target.xml b/ktx/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
deleted file mode 100644
index 2e4376cd8..000000000
--- a/ktx/core/javatests/androidx/test/core/app/AndroidManifest_target.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.core.app" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application />
-
-</manifest>
diff --git a/ktx/core/javatests/androidx/test/core/app/AndroidManifest_test.xml b/ktx/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
deleted file mode 100644
index 89dd07023..000000000
--- a/ktx/core/javatests/androidx/test/core/app/AndroidManifest_test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.core.app.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-  <application />
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="androidx.test.core.app">
-  </instrumentation>
-
-</manifest>
diff --git a/ktx/core/javatests/androidx/test/core/app/BUILD b/ktx/core/javatests/androidx/test/core/app/BUILD
new file mode 100644
index 000000000..a30e44ef6
--- /dev/null
+++ b/ktx/core/javatests/androidx/test/core/app/BUILD
@@ -0,0 +1,46 @@
+# Description: Tests for androidx.test.core ktx extension
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+axt_android_local_test(
+    name = "ActivityScenarioKotlinTest",
+    srcs = ["ActivityScenarioKotlinTest.kt"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//ktx/core",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ActivityScenarioKotlinTest_android",
+    srcs = ["ActivityScenarioKotlinTest.kt"],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//ktx/core",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ktx/core/javatests/androidx/test/core/app/BUILD.bazel b/ktx/core/javatests/androidx/test/core/app/BUILD.bazel
deleted file mode 100644
index d5cfd77ed..000000000
--- a/ktx/core/javatests/androidx/test/core/app/BUILD.bazel
+++ /dev/null
@@ -1,72 +0,0 @@
-# Description: Tests for androidx.test.core Kotlin extension
-
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_binary(
-    name = "target_stub",
-    manifest = "AndroidManifest_target.xml",
-    deps = [
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-    ],
-)
-
-java_library(
-    name = "robolectric_config",
-    resources = ["robolectric.properties"],
-)
-
-kt_android_library(
-    name = "ActivityScenarioKotlinTest_lib",
-    srcs = ["ActivityScenarioKotlinTest.kt"],
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//ext/truth",
-        "//ktx/core",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-    testonly = 1,
-)
-
-android_binary(
-    name = "ActivityScenarioKotlinTest_test_apk",
-    instruments = ":target_stub",
-    manifest = "AndroidManifest_test.xml",
-    deps = [
-        ":ActivityScenarioKotlinTest_lib",
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//ext/truth",
-        "//ktx/core",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_instrumentation_test(
-    name = "ActivityScenarioKotlinTest_android",
-    args = [
-        "--clear_package_data",
-        "--install_test_services=True",  # required for Bazel 0.11, can be removed in 0.12
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_23_x86",
-    test_app = ":ActivityScenarioKotlinTest_test_apk",
-)
diff --git a/ktx/core/javatests/androidx/test/core/app/robolectric.properties b/ktx/core/javatests/androidx/test/core/app/robolectric.properties
deleted file mode 100644
index 58f7e1ac8..000000000
--- a/ktx/core/javatests/androidx/test/core/app/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-sdk=ALL_SDKS
\ No newline at end of file
diff --git a/ktx/espresso/core/java/androidx/test/espresso/AndroidManifest.xml b/ktx/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
deleted file mode 100644
index 1f7fa139e..000000000
--- a/ktx/espresso/core/java/androidx/test/espresso/AndroidManifest.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.espresso" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-</manifest>
diff --git a/ktx/espresso/core/java/androidx/test/espresso/HelloKtx.kt b/ktx/espresso/core/java/androidx/test/espresso/HelloKtx.kt
deleted file mode 100644
index 57f5b1a7a..000000000
--- a/ktx/espresso/core/java/androidx/test/espresso/HelloKtx.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.espresso
-
-class HelloKtx {
-  val testing = "rocks"
-}
diff --git a/ktx/espresso/core/javatests/androidx/test/espresso/AndroidManifest.xml b/ktx/espresso/core/javatests/androidx/test/espresso/AndroidManifest.xml
deleted file mode 100644
index 5130d516d..000000000
--- a/ktx/espresso/core/javatests/androidx/test/espresso/AndroidManifest.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.espresso.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.espresso.tests" />
-
-</manifest>
diff --git a/ktx/espresso/core/javatests/androidx/test/espresso/AndroidManifest_stub.xml b/ktx/espresso/core/javatests/androidx/test/espresso/AndroidManifest_stub.xml
deleted file mode 100644
index b8a19af53..000000000
--- a/ktx/espresso/core/javatests/androidx/test/espresso/AndroidManifest_stub.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.espresso.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-</manifest>
diff --git a/ktx/espresso/core/javatests/androidx/test/espresso/HelloKtxTest.kt b/ktx/espresso/core/javatests/androidx/test/espresso/HelloKtxTest.kt
deleted file mode 100644
index fbc0c4397..000000000
--- a/ktx/espresso/core/javatests/androidx/test/espresso/HelloKtxTest.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.espresso
-
-import androidx.test.runner.AndroidJUnit4
-import com.google.common.truth.Truth.assertThat
-import org.junit.Test
-import org.junit.runner.RunWith
-
-@RunWith(AndroidJUnit4::class)
-class HelloKtxTest {
-
-  @Test
-  fun doesTestingRock() = assertThat(HelloKtx().testing).isEqualTo("rocks")
-}
diff --git a/ktx/ext/junit/BUILD b/ktx/ext/junit/BUILD
new file mode 100644
index 000000000..3c8240401
--- /dev/null
+++ b/ktx/ext/junit/BUILD
@@ -0,0 +1,14 @@
+# Publicly visible androidx.ext.junit Kotlin extension library
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "junit",
+    actual = "//ktx/ext/junit/java/androidx/test/ext/junit",
+    visibility = ["//visibility:public"],
+)
diff --git a/ktx/ext/junit/BUILD.bazel b/ktx/ext/junit/BUILD.bazel
deleted file mode 100644
index 4fbe38456..000000000
--- a/ktx/ext/junit/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-# Publicly visible androidx.ext.junit Kotlin extension library
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "junit",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = ["//ktx/ext/junit/java/androidx/test/ext/junit"],
-)
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml b/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
index 61012a652..5002b04f1 100644
--- a/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/AndroidManifest.xml
@@ -17,6 +17,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.test.ext.junit.ktx" >
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 </manifest>
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/BUILD b/ktx/ext/junit/java/androidx/test/ext/junit/BUILD
new file mode 100644
index 000000000..78b6f6c11
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/BUILD
@@ -0,0 +1,66 @@
+# androidx.ext.junit Kotlin extensions
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+kt_android_library(
+    name = "junit",
+    srcs = glob(["**/*.kt"]),
+    deps = [
+        "//ext/junit",
+    ],
+)
+
+# Group of targets to use to produce release binary
+# kt_android_library doesn't produce an aar, so wrap inside a android_library
+android_library(
+    name = "aar_lib",
+    custom_package = "androidx.test.ext.junit.ktx",
+    manifest = "AndroidManifest.xml",
+    visibility = ["//visibility:private"],
+    exports = [
+        ":junit",
+    ],
+)
+
+# Generate rules for the release artifacts.
+axt_android_aar(
+    name = "junit_aar",
+
+    # we'll be super explicit with the expected classes here since this is effectively a
+    # stale artifact. All future classes should just go into //ext/junit
+    expected_class_prefixes = [
+        "androidx.test.ext.junit.rules.ActivityScenarioRuleKt",
+    ],
+    included_dep = ":aar_lib",
+)
+
+maven_artifact(
+    name = "junit_maven_artifact",
+    last_updated = "20181029000000",
+    target = ":junit_aar",
+)
+
+dackka_test(
+    name = "junit_doc",
+    runtime_dep = ":aar_lib",
+    src_jar = ":junit_aar-src.jar",
+)
+
+api_checks(
+    name = "junit_api",
+    runtime_dep = ":aar_lib",
+    src_jar = ":junit_aar-src.jar",
+)
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/BUILD.bazel b/ktx/ext/junit/java/androidx/test/ext/junit/BUILD.bazel
deleted file mode 100644
index ee2d60bb5..000000000
--- a/ktx/ext/junit/java/androidx/test/ext/junit/BUILD.bazel
+++ /dev/null
@@ -1,72 +0,0 @@
-# androidx.ext.junit Kotlin extensions
-
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_JUNIT_VERSION", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "RUNNER_VERSION", "KOTLIN_VERSION")
-
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//:__subpackages__",
-    ],
-)
-
-
-
-kt_android_library(
-    name = "junit",
-    srcs = glob(
-        ["**/*.kt"],
-    ),
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//ext/junit",
-    ],
-)
-
-load("//build_extensions:release.bzl", "axt_release_lib")
-
-# Group of targets to use to produce release binary
-android_library(
-    name = "junit_release_lib",
-    exports = [
-        ":junit",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: junit_release_no_deps.jar and junit_release.aar
-# a java_library target libjunit_release_no_deps
-axt_release_lib(
-    name = "junit_release",
-    custom_package = "androidx.test.ext.junit.ktx",
-    keep_spec = "androidx/test/ext/junit|META-INF/androidx.test.ext.junit.kotlin_module",
-    overlapping_jars = [
-        "//ext/junit/java/androidx/test/ext/junit:junit_release_no_deps.jar",
-    ],
-    remove_spec = "androidx/test/ext/junit/ktx/R[$$\\.]|androidx/test/ext/junit/R[$$\\.]",
-    resource_files = glob(
-        ["res/**/*"],
-    ),
-    deps = [
-        ":junit_release_lib",
-    ],
-)
-
-
-maven_artifact(
-    name = "junit_maven_artifact",
-    src = ":junit_release.aar",
-    artifact_deps = [
-        "androidx.test.ext:junit:%s" % ANDROIDX_JUNIT_VERSION,
-        "androidx.lifecycle:lifecycle-common:%s" % ANDROIDX_LIFECYCLE_VERSION,
-        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
-    ],
-    artifact_id = "junit-ktx",
-    group_id = "androidx.test.ext",
-    last_updated = "20181029000000",
-    src_jar = ":libjunit-src.jar",
-    version = "%s" % ANDROIDX_JUNIT_VERSION,
-)
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/current.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.1.3_public.txt
similarity index 100%
rename from ktx/ext/junit/java/androidx/test/ext/junit/api/current.txt
rename to ktx/ext/junit/java/androidx/test/ext/junit/api/1.1.3_public.txt
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/1.1.4_internal.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.1.4_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.1.4_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/1.2.0_internal.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.2.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.2.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/1.2.0_public.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.2.0_public.txt
new file mode 100644
index 000000000..4e026be74
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.2.0_public.txt
@@ -0,0 +1,9 @@
+// Signature format: 3.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRuleKt {
+    method public static inline <reified A extends android.app.Activity> androidx.test.ext.junit.rules.ActivityScenarioRule<A> activityScenarioRule(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+  }
+
+}
+
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/1.3.0_internal.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.3.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.3.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/1.3.0_public.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.3.0_public.txt
new file mode 100644
index 000000000..4e026be74
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/1.3.0_public.txt
@@ -0,0 +1,9 @@
+// Signature format: 3.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRuleKt {
+    method public static inline <reified A extends android.app.Activity> androidx.test.ext.junit.rules.ActivityScenarioRule<A> activityScenarioRule(android.content.Intent? intent = null, android.os.Bundle? activityOptions = null);
+  }
+
+}
+
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/current_internal.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/api/current_public.txt b/ktx/ext/junit/java/androidx/test/ext/junit/api/current_public.txt
new file mode 100644
index 000000000..10db064e2
--- /dev/null
+++ b/ktx/ext/junit/java/androidx/test/ext/junit/api/current_public.txt
@@ -0,0 +1,9 @@
+// Signature format: 5.0
+package androidx.test.ext.junit.rules {
+
+  public final class ActivityScenarioRuleKt {
+    method @KotlinOnly public static inline <reified A extends android.app.Activity> androidx.test.ext.junit.rules.ActivityScenarioRule<A> activityScenarioRule(optional android.content.Intent? intent, optional android.os.Bundle? activityOptions);
+  }
+
+}
+
diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/AndroidManifest_target.xml b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/AndroidManifest_target.xml
deleted file mode 100644
index f045400d4..000000000
--- a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/AndroidManifest_target.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.ext.junit.rules" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application />
-
-</manifest>
diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/AndroidManifest_test.xml b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/AndroidManifest_test.xml
deleted file mode 100644
index 061a32375..000000000
--- a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/AndroidManifest_test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.ext.junit.rules.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-  <application />
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="androidx.test.ext.junit.rules">
-  </instrumentation>
-
-</manifest>
diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
new file mode 100644
index 000000000..fe498a2f5
--- /dev/null
+++ b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD
@@ -0,0 +1,89 @@
+# Description: Tests for androidx.test.ext.junit.rules Kotlin extension
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+axt_android_local_test(
+    name = "ActivityScenarioRuleKotlinTest",
+    srcs = [
+        "ActivityScenarioRuleKotlinTest.kt",
+    ],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ktx/core",
+        "//ktx/ext/junit",
+        "//runner/monitor",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ActivityScenarioRuleKotlinTest_android",
+    srcs = [
+        "ActivityScenarioRuleKotlinTest.kt",
+    ],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ktx/core",
+        "//ktx/ext/junit",
+        "//runner/monitor",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "ActivityScenarioRuleWithCustomIntentKotlinTest",
+    srcs = [
+        "ActivityScenarioRuleWithCustomIntentKotlinTest.kt",
+    ],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//ktx/core",
+        "//ktx/ext/junit",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "ActivityScenarioRuleWithCustomIntentKotlinTest_android",
+    srcs = [
+        "ActivityScenarioRuleWithCustomIntentKotlinTest.kt",
+    ],
+    deps = [
+        "//core",
+        "//core/javatests/androidx/test/core/app/testing",
+        "//core/javatests/androidx/test/core/app/testing:manifest",
+        "//ext/junit",
+        "//ext/truth",
+        "//ktx/core",
+        "//ktx/ext/junit",
+        "//runner/monitor",
+        "@maven//:androidx_lifecycle_lifecycle_common",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD.bazel b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD.bazel
deleted file mode 100644
index 925be446b..000000000
--- a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/BUILD.bazel
+++ /dev/null
@@ -1,171 +0,0 @@
-# Description: Tests for androidx.test.ext.junit.rules Kotlin extension
-
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_binary(
-    name = "target_stub",
-    manifest = "AndroidManifest_target.xml",
-    deps = [
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-    ],
-)
-
-java_library(
-    name = "robolectric_config",
-    resources = ["robolectric.properties"],
-)
-
-kt_android_library(
-    name = "ActivityScenarioRuleKotlinTest_lib",
-    srcs = [
-        "ActivityScenarioRuleKotlinTest.kt",
-    ],
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//ktx/core",
-        "//ktx/ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-    testonly = 1,
-)
-
-android_local_test(
-    name = "ActivityScenarioRuleKotlinTest",
-    manifest = "AndroidManifest_target.xml",
-    deps = [
-        ":ActivityScenarioRuleKotlinTest_lib",
-        ":robolectric_config",
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ktx/core",
-        "//ktx/ext/junit",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_robolectric_robolectric",
-        "@robolectric//bazel:android-all",
-    ],
-)
-
-android_binary(
-    name = "ActivityScenarioRuleKotlinTest_test_apk",
-    instruments = ":target_stub",
-    manifest = "AndroidManifest_test.xml",
-    deps = [
-        ":ActivityScenarioRuleKotlinTest_lib",
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//ktx/core",
-        "//ktx/ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_instrumentation_test(
-    name = "ActivityScenarioRuleKotlinTest_android",
-    args = [
-        "--clear_package_data",
-        "--install_test_services=True",  # required for Bazel 0.11, can be removed in 0.12
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_23_x86",
-    test_app = ":ActivityScenarioRuleKotlinTest_test_apk",
-)
-
-kt_android_library(
-    name = "ActivityScenarioRuleWithCustomIntentKotlinTest_lib",
-    srcs = [
-        "ActivityScenarioRuleWithCustomIntentKotlinTest.kt",
-    ],
-    deps = [
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//ext/truth",
-        "//ktx/core",
-        "//ktx/ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-    testonly = 1,
-)
-
-android_local_test(
-    name = "ActivityScenarioRuleWithCustomIntentKotlinTest",
-    manifest = "AndroidManifest_target.xml",
-    deps = [
-        ":ActivityScenarioRuleWithCustomIntentKotlinTest_lib",
-        ":robolectric_config",
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//core/javatests/androidx/test/core/app/testing:manifest",
-        "//ext/junit",
-        "//ext/truth",
-        "//ktx/core",
-        "//ktx/ext/junit",
-        "//runner/monitor",
-        "@guava_jar//jar",
-        "@junit//jar",
-        "@robolectric//bazel:robolectric",
-        "@truth//jar",
-    ],
-)
-
-android_binary(
-    name = "ActivityScenarioRuleWithCustomIntentKotlinTest_test_apk",
-    instruments = ":target_stub",
-    manifest = "AndroidManifest_test.xml",
-    deps = [
-        ":ActivityScenarioRuleWithCustomIntentKotlinTest_lib",
-        "//:androidx_lifecycle_common",
-        "//core",
-        "//core/javatests/androidx/test/core/app/testing",
-        "//ext/junit",
-        "//ext/truth",
-        "//ktx/core",
-        "//ktx/ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_instrumentation_test(
-    name = "ActivityScenarioRuleWithCustomIntentKotlinTest_android",
-    args = [
-        "--clear_package_data",
-        "--install_test_services=True",  # required for Bazel 0.11, can be removed in 0.12
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_23_x86",
-    test_app = ":ActivityScenarioRuleWithCustomIntentKotlinTest_test_apk",
-)
diff --git a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/robolectric.properties b/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/robolectric.properties
deleted file mode 100644
index 58f7e1ac8..000000000
--- a/ktx/ext/junit/javatests/androidx/test/ext/junit/rules/robolectric.properties
+++ /dev/null
@@ -1 +0,0 @@
-sdk=ALL_SDKS
\ No newline at end of file
diff --git a/opensource/BUILD b/opensource/BUILD
new file mode 100644
index 000000000..fd61124df
--- /dev/null
+++ b/opensource/BUILD
@@ -0,0 +1,14 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+# aliases that creates bazel targets that are equivalent to blaze
+
+java_import(
+    name = "androidsdk_compiletime",
+    jars = [
+        "@androidsdk//:platforms/android-36/android.jar",
+    ],
+    neverlink = 1,
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/opensource/BUILD.bazel b/opensource/BUILD.bazel
deleted file mode 100644
index 6427b246f..000000000
--- a/opensource/BUILD.bazel
+++ /dev/null
@@ -1,5 +0,0 @@
-java_import(
-    name = "entry_point_import",
-    jars = ["entry_point_deploy.jar"],
-    visibility = ["//visibility:public"],
-)
diff --git a/opensource/androidx/BUILD b/opensource/androidx/BUILD
new file mode 100644
index 000000000..f5c439014
--- /dev/null
+++ b/opensource/androidx/BUILD
@@ -0,0 +1,28 @@
+# Targets to handle androidx dependencies in bazel
+
+load(
+    "//build_extensions:axt_deps_versions.bzl",
+    "ANDROIDX_ANNOTATION_VERSION",
+)
+
+package(default_visibility = ["//visibility:public"])
+
+# Alias target for androidx.annotation
+# Ideally libraries could directly depend on the @maven targets instead, but:
+# 1. Directly depending on annotation doesn't work since it contains no classes,
+# and results in 'error: [strict] Using type androidx.annotation.RestrictTo
+# from an indirect dependency (TOOL_INFO:
+# "@maven//:androidx_annotation_annotation_jvm").'
+# 2. Directly depending on annotation-jvm doesn't work since that can result in
+# duplicate class errors when transitive dependencies depend on older versions
+# of androidx.annotation
+java_library(
+    name = "annotation",
+    tags = [
+        "maven_coordinates=androidx.annotation:annotation:" + ANDROIDX_ANNOTATION_VERSION,
+    ],
+    exports = [
+        "@maven//:androidx_annotation_annotation",
+        "@maven//:androidx_annotation_annotation_jvm",
+    ],
+)
diff --git a/opensource/auto_value/BUILD.bazel b/opensource/auto_value/BUILD.bazel
deleted file mode 100644
index 92de0c199..000000000
--- a/opensource/auto_value/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-java_plugin(
-    name = "auto_value_plugin",
-    processor_class = "com.google.auto.value.processor.AutoValueProcessor",
-    deps = [
-        "@maven//:com_google_auto_value_auto_value",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-java_library(
-    name = "auto_value",
-    neverlink = 1,
-    exported_plugins = [":auto_value_plugin"],
-    visibility = ["//visibility:public"],
-    exports = ["@maven//:com_google_auto_value_auto_value"],
-)
diff --git a/opensource/dagger/BUILD b/opensource/dagger/BUILD
new file mode 100644
index 000000000..fe09a2c8a
--- /dev/null
+++ b/opensource/dagger/BUILD
@@ -0,0 +1,28 @@
+# Essential dagger libraries for AXT in Bazel
+
+package(default_visibility = ["//visibility:public"])
+
+java_library(
+    name = "dagger",
+    exported_plugins = [":dagger_plugin"],
+    exports = [
+        "@maven//:com_google_dagger_dagger",
+    ],
+)
+
+java_plugin(
+    name = "dagger_plugin",
+    generates_api = 1,
+    processor_class = "dagger.internal.codegen.ComponentProcessor",
+    deps = [
+        "@maven//:com_google_dagger_dagger",
+        "@maven//:com_google_dagger_dagger_compiler",
+        "@maven//:com_google_dagger_dagger_producers",
+        "@maven//:com_google_errorprone_javac_shaded",
+        "@maven//:com_google_googlejavaformat_google_java_format",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_squareup_javapoet",
+        "@maven//:javax_annotation_javax_annotation_api",
+        "@maven//:javax_inject_javax_inject",
+    ],
+)
diff --git a/opensource/dagger/BUILD.bazel b/opensource/dagger/BUILD.bazel
deleted file mode 100644
index 01da4be65..000000000
--- a/opensource/dagger/BUILD.bazel
+++ /dev/null
@@ -1,29 +0,0 @@
-# Essential dagger libraries for AXT in Bazel
-
-package(default_visibility = ["//visibility:public"])
-
-java_library(
-    name = "dagger",
-    exported_plugins = [":dagger_plugin"],
-    exports = [
-        "@maven//:com_google_dagger_dagger",
-        "@maven//:javax_inject_javax_inject",
-    ],
-)
-
-java_plugin(
-    name = "dagger_plugin",
-    generates_api = 1,
-    processor_class = "dagger.internal.codegen.ComponentProcessor",
-    deps = [
-        "@maven//:com_google_dagger_dagger",
-        "@maven//:com_google_dagger_dagger_compiler",
-        "@maven//:com_google_dagger_dagger_producers",
-        "@maven//:com_google_errorprone_javac_shaded",
-        "@maven//:com_google_googlejavaformat_google_java_format",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_squareup_javapoet",
-        "@maven//:javax_annotation_javax_annotation_api",
-        "@maven//:javax_inject_javax_inject",
-    ],
-)
diff --git a/opensource/emulator/proto/BUILD b/opensource/emulator/proto/BUILD
new file mode 100644
index 000000000..bccbbbdab
--- /dev/null
+++ b/opensource/emulator/proto/BUILD
@@ -0,0 +1,34 @@
+# Protos for interacting with emulator
+
+load("@grpc-java//:java_grpc_library.bzl", "java_grpc_library")
+
+package(
+    default_applicable_licenses = ["//espresso:license"],
+    default_visibility = [
+        "//espresso/device/java/androidx/test/espresso/device:device_pkg",
+    ],
+)
+
+proto_library(
+    name = "emulator_controller_proto",
+    srcs = ["emulator_controller.proto"],
+    deps = [
+        "@com_google_protobuf//:empty_proto",
+    ],
+)
+
+java_lite_proto_library(
+    name = "emulator_controller_java_proto_lite",
+    deps = [":emulator_controller_proto"],
+)
+
+java_grpc_library(
+    name = "emulator_controller_java_grpc",
+    srcs = [":emulator_controller_proto"],
+    flavor = "lite",
+    deps = [
+        ":emulator_controller_java_proto_lite",
+        # explicitly depend on grpc-protobuf-lite so protobuf classes can be shaded
+        "@grpc-java//protobuf-lite:protobuf-lite",
+    ],
+)
diff --git a/opensource/emulator/proto/emulator_controller.proto b/opensource/emulator/proto/emulator_controller.proto
new file mode 100644
index 000000000..dcba53d1a
--- /dev/null
+++ b/opensource/emulator/proto/emulator_controller.proto
@@ -0,0 +1,1273 @@
+// Copyright (C) 2018 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Note that if you add/remove methods in this file you must update
+// the metrics sql as well ./android/scripts/gen-grpc-sql.py
+//
+// Please group deleted methods in a block including the date (MM/DD/YY)
+// it was removed. This enables us to easily keep metrics around after removal
+//
+// List of deleted methods
+// rpc iWasDeleted (03/12/12)
+// ...
+syntax = "proto3";
+
+package android.emulation.control;
+
+import "google/protobuf/empty.proto";
+
+option java_multiple_files = true;
+option java_package = "com.android.emulator.control";
+option objc_class_prefix = "AEC";
+
+// An EmulatorController service lets you control the emulator.
+// Note that this is currently an experimental feature, and that the
+// service definition might change without notice. Use at your own risk!
+//
+// We use the following rough conventions:
+//
+// streamXXX --> streams values XXX (usually for emulator lifetime). Values
+//               are updated as soon as they become available.
+// getXXX    --> gets a single value XXX
+// setXXX    --> sets a single value XXX, does not returning state, these
+//               usually have an observable lasting side effect.
+// sendXXX   --> send a single event XXX, possibly returning state information.
+//               android usually responds to these events.
+service EmulatorController {
+  // set/get/stream the sensor data
+  rpc streamSensor(SensorValue) returns (stream SensorValue) {}
+  rpc getSensor(SensorValue) returns (SensorValue) {}
+  rpc setSensor(SensorValue) returns (google.protobuf.Empty) {}
+
+  // set/get/stream the physical model, this is likely the one you are
+  // looking for when you wish to modify the device state.
+  rpc setPhysicalModel(PhysicalModelValue) returns (google.protobuf.Empty) {}
+  rpc getPhysicalModel(PhysicalModelValue) returns (PhysicalModelValue) {}
+  rpc streamPhysicalModel(PhysicalModelValue)
+      returns (stream PhysicalModelValue) {}
+
+  // Atomically set/get the current primary clipboard data.
+  rpc setClipboard(ClipData) returns (google.protobuf.Empty) {}
+  rpc getClipboard(google.protobuf.Empty) returns (ClipData) {}
+
+  // Streams the current data on the clipboard. This will immediately produce
+  // a result with the current state of the clipboard after which the stream
+  // will block and wait until a new clip event is available from the guest.
+  // Calling the setClipboard method above will not result in generating a
+  // clip event. It is possible to lose clipboard events if the clipboard
+  // updates very rapidly.
+  rpc streamClipboard(google.protobuf.Empty) returns (stream ClipData) {}
+
+  // Set/get the battery to the given state.
+  rpc setBattery(BatteryState) returns (google.protobuf.Empty) {}
+  rpc getBattery(google.protobuf.Empty) returns (BatteryState) {}
+
+  // Set the state of the gps.
+  // Note: Setting the gps position will not be reflected in the user interface.
+  // Keep in mind that android usually only samples the gps at 1 hz.
+  rpc setGps(GpsState) returns (google.protobuf.Empty) {}
+
+  // Gets the latest gps state as delivered by the setGps call, or location ui
+  // if active.
+  //
+  // Note: this is not necessarily the actual gps coordinate visible at the
+  // time, due to gps sample frequency (usually 1hz).
+  rpc getGps(google.protobuf.Empty) returns (GpsState) {}
+
+  // Simulate a touch event on the finger print sensor.
+  rpc sendFingerprint(Fingerprint) returns (google.protobuf.Empty) {}
+
+  // Send a keyboard event. Translating the event.
+  rpc sendKey(KeyboardEvent) returns (google.protobuf.Empty) {}
+
+  // Send touch/mouse events. Note that mouse events can be simulated
+  // by touch events.
+  rpc sendTouch(TouchEvent) returns (google.protobuf.Empty) {}
+  rpc sendMouse(MouseEvent) returns (google.protobuf.Empty) {}
+  rpc injectWheel(stream WheelEvent) returns (google.protobuf.Empty) {}
+
+  // Make a phone call.
+  rpc sendPhone(PhoneCall) returns (PhoneResponse) {}
+
+  // Sends an sms message to the emulator.
+  rpc sendSms(SmsMessage) returns (PhoneResponse) {}
+
+  // Sends an sms message to the emulator.
+  rpc setPhoneNumber(PhoneNumber) returns (PhoneResponse) {}
+
+  // Retrieve the status of the emulator. This will contain general
+  // hardware information, and whether the device has booted or not.
+  rpc getStatus(google.protobuf.Empty) returns (EmulatorStatus) {}
+
+  // Gets an individual screenshot in the desired format.
+  //
+  // The image will be scaled to the desired ImageFormat, while maintaining
+  // the aspect ratio. The returned image will never exceed resolution of the
+  // device display. Not setting the width or height (i.e. they are 0) will
+  // result in using the display width and height.
+  //
+  // The resulting image will be properly oriented and can be displayed
+  // directly without post processing. For example, if the device has a
+  // 1080x1920 screen and is in landscape mode and called with no width or
+  // height parameter, it will return a 1920x1080 image.
+  //
+  // The dimensions of the returned image will never exceed the corresponding
+  // display dimensions. For example, this method will return a 1920x1080
+  // screenshot, if the display resolution is 1080x1920 and a screenshot of
+  // 2048x2048 is requested when the device is in landscape mode.
+  //
+  // This method will return an empty image if the display is not visible.
+  rpc getScreenshot(ImageFormat) returns (Image) {}
+
+  // Streams a series of screenshots in the desired format.
+  //
+  // A new frame will be delivered whenever the device produces a new frame.
+  // Beware that this can produce a significant amount of data and that
+  // certain translations can be very costly. For example, streaming a series
+  // of png images is very cpu intensive.
+  //
+  // Images are produced according to the getScreenshot API described above.
+  //
+  // If the display is inactive, or becomes inactive, an empty image will be
+  // delivered. Images will be delived again if the display becomes active and
+  // new frames are produced.
+  rpc streamScreenshot(ImageFormat) returns (stream Image) {}
+
+  // Streams a series of audio packets in the desired format.
+  // A new frame will be delivered whenever the emulated device
+  // produces a new audio frame. You can expect packets to be
+  // delivered in intervals of 20-30ms.
+  //
+  // Be aware that this can block when the emulator does not
+  // produce any audio whatsoever!
+  rpc streamAudio(AudioFormat) returns (stream AudioPacket) {}
+
+  // Injects a series of audio packets to the android microphone.
+  // A new frame will be delivered whenever the emulated device
+  // requests a new audio frame. Audio is usually delivered at a rate
+  // that the emulator is requesting frames. Audio will be stored in a
+  // temporary buffer that can hold 300ms of audio.
+  //
+  // Notes:
+  //  - Only the first audio format packet that is delivered will be
+  // honored. There is no need to send the audio format multiple times.
+  //  - Real time audio currently immediately overrides the buffer. This
+  // means you must provide a constant rate of audio packets. The real
+  // time mode is experimental. Timestamps of audio packets might be
+  // used in the future to improve synchronization.
+  //
+  // -  INVALID_ARGUMENT (code 3) The sampling rate was too high/low
+  // -  INVALID_ARGUMENT (code 3) The audio packet was too large to handle.
+  // -  FAILED_PRECONDITION (code 9) If there was a microphone registered
+  // already.
+  rpc injectAudio(stream AudioPacket) returns (google.protobuf.Empty) {}
+
+  // Returns the last 128Kb of logcat output from the emulator
+  // Note that parsed logcat messages are only available after L (Api >23).
+  // it is possible that the logcat buffer gets overwritten, or falls behind.
+  rpc getLogcat(LogMessage) returns (LogMessage) {}
+
+  // Streams the logcat output from the emulator. The first call
+  // can retrieve up to 128Kb. This call will not return.
+  // Note that parsed logcat messages are only available after L (Api >23)
+  // it is possible that the logcat buffer gets overwritten, or falls behind.
+  rpc streamLogcat(LogMessage) returns (stream LogMessage) {}
+
+  // Transition the virtual machine to the desired state. Note that
+  // some states are only observable. For example you cannot transition
+  // to the error state.
+  rpc setVmState(VmRunState) returns (google.protobuf.Empty) {}
+
+  // Gets the state of the virtual machine.
+  rpc getVmState(google.protobuf.Empty) returns (VmRunState) {}
+
+  // Atomically changes the current multi-display configuration.
+  // After this call the given display configurations will be activated. You
+  // can only update secondary displays. Displays with id 0 will be ignored.
+  //
+  // This call can result in the removal or addition of secondary displays,
+  // the final display state can be observed by the returned configuration.
+  //
+  // The following gRPC error codes can be returned:
+  // -  FAILED_PRECONDITION (code 9) if the AVD does not support a
+  // configurable
+  //    secondary display.
+  // -  INVALID_ARGUMENT (code 3) if:
+  //     - The same display id is defined multiple times.
+  //     - The display configurations are outside valid ranges.
+  //       See DisplayConfiguration for details on valid ranges.
+  // -  INTERNAL (code 13) if there was an internal emulator failure.
+  rpc setDisplayConfigurations(DisplayConfigurations)
+      returns (DisplayConfigurations) {}
+
+  // Returns all currently valid logical displays.
+  //
+  // The gRPC error code FAILED_PRECONDITION (code 9) is returned if the AVD
+  // does not support a configurable secondary display.
+  rpc getDisplayConfigurations(google.protobuf.Empty)
+      returns (DisplayConfigurations) {}
+
+  // Notifies client of the following changes:
+  //
+  // - Virtual scene camera status change.
+  // - Display configuration changes from extended ui. This will only be fired
+  //   if the user makes modifications the extended displays through the
+  //   extended control tab.
+  //
+  // Note that this method will send the initial virtual scene state
+  // immediately.
+  rpc streamNotification(google.protobuf.Empty) returns (stream Notification) {}
+
+  // RotationRadian is relative to the camera's current orientation.
+  rpc rotateVirtualSceneCamera(RotationRadian) returns (google.protobuf.Empty) {
+  }
+  // Velocity is absolute
+  rpc setVirtualSceneCameraVelocity(Velocity) returns (google.protobuf.Empty) {}
+  // Set foldable posture
+  rpc setPosture(Posture) returns (google.protobuf.Empty) {}
+
+  // Get the backlight brightness.
+  // The following gRPC error codes can be returned:
+  // -  FAILED_PRECONDITION (code 9) if the AVD does not support hw-control.
+  rpc getBrightness(BrightnessValue) returns (BrightnessValue) {}
+
+  // Set the backlight brightness.
+  // The following gRPC error codes can be returned:
+  // -  FAILED_PRECONDITION (code 9) if the AVD does not support hw-control.
+  // -  INVALID_ARGUMENT (code 3) The brightness exceeds the valid range.
+  rpc setBrightness(BrightnessValue) returns (google.protobuf.Empty) {}
+
+  // Returns the current mode of the primary display of a resizable AVD.
+  // The following gRPC error codes can be returned:
+  // -  FAILED_PRECONDITION (code 9) if the AVD is not resizable.
+  rpc getDisplayMode(google.protobuf.Empty) returns (DisplayMode) {}
+
+  // Sets the size of the primary display of a resizable AVD. Fails if the AVD
+  // is not resizable. The following gRPC error codes can be returned:
+  // -  FAILED_PRECONDITION (code 9) if the AVD is not resizable.
+  rpc setDisplayMode(DisplayMode) returns (google.protobuf.Empty) {}
+}
+
+// A Run State that describes the state of the Virtual Machine.
+message VmRunState {
+  enum RunState {
+    // The emulator is in an unknown state. You cannot transition to this
+    // state.
+    UNKNOWN = 0;
+    // Guest is actively running. You can transition to this state from the
+    // paused state.
+    RUNNING = 1;
+    // Guest is paused to load a snapshot. You cannot transition to this
+    // state.
+    RESTORE_VM = 2;
+    // Guest has been paused. Transitioning to this state will pause the
+    // emulator the guest will not be consuming any cpu cycles.
+    PAUSED = 3;
+    // Guest is paused to take or export a snapshot. You cannot
+    // transition to this state.
+    SAVE_VM = 4;
+    // System shutdown, note that it is similar to power off. It tries to
+    // set the system status and notify guest. The system is likely going to
+    // disappear soon and do proper cleanup of resources, possibly taking
+    // a snapshot. This is the same behavior as closing the emulator by
+    // clicking the X (close) in the user interface.
+    SHUTDOWN = 5;
+    // Immediately terminate the emulator. No resource cleanup will take
+    // place. There is a good change to corrupt the system.
+    TERMINATE = 7;
+    // Will cause the emulator to reset. This is not a state you can
+    // observe.
+    RESET = 9;
+    // Guest experienced some error state, you cannot transition to this
+    // state.
+    INTERNAL_ERROR = 10;
+  }
+
+  RunState state = 1;
+}
+
+message ParameterValue {
+  repeated float data = 1 [packed = true];
+}
+
+message PhysicalModelValue {
+  enum State {
+    OK = 0;
+    NO_SERVICE = -3;  // qemud service is not available/initiated.
+    DISABLED = -2;    // Sensor is disabled.
+    UNKNOWN = -1;     // Unknown sensor (should not happen)
+  }
+
+  // Details on the sensors documentation can be found here:
+  // https://developer.android.com/reference/android/hardware/Sensor.html#TYPE_
+  // The types must follow the order defined in
+  // "external/qemu/android/hw-sensors.h"
+  enum PhysicalType {
+    POSITION = 0;
+
+    // All values are angles in degrees.
+    // values = [x,y,z]
+    ROTATION = 1;
+
+    MAGNETIC_FIELD = 2;
+
+    // Temperature in °C
+    TEMPERATURE = 3;
+
+    // Proximity sensor distance measured in centimeters
+    PROXIMITY = 4;
+
+    // Ambient light level in SI lux units
+    LIGHT = 5;
+
+    // Atmospheric pressure in hPa (millibar)
+    PRESSURE = 6;
+
+    // Relative ambient air humidity in percent
+    HUMIDITY = 7;
+
+    VELOCITY = 8;
+    AMBIENT_MOTION = 9;
+
+    // Describing a hinge angle sensor in degrees.
+    HINGE_ANGLE0 = 10;
+    HINGE_ANGLE1 = 11;
+    HINGE_ANGLE2 = 12;
+
+    ROLLABLE0 = 13;
+    ROLLABLE1 = 14;
+    ROLLABLE2 = 15;
+
+    // Describing the device posture; the value should be an enum defined
+    // in Posture::PostureValue.
+    POSTURE = 16;
+
+    // Heart rate in bpm
+    HEART_RATE = 17;
+
+    // Ambient RGBC light intensity. Values are in order (Red, Green, Blue,
+    // Clear).
+    RGBC_LIGHT = 18;
+
+    // Wrist tilt gesture (1 = gaze, 0 = ungaze)
+    WRIST_TILT = 19;
+  }
+  PhysicalType target = 1;
+
+  // [Output Only]
+  State status = 2;
+
+  // Value interpretation depends on sensor.
+  ParameterValue value = 3;
+}
+
+// A single sensor value.
+message SensorValue {
+  enum State {
+    OK = 0;
+    NO_SERVICE = -3;  // qemud service is not available/initiated.
+    DISABLED = -2;    // Sensor is disabled.
+    UNKNOWN = -1;     // Unknown sensor (should not happen)
+  }
+
+  // These are the various sensors that can be available in an emulated
+  // devices.
+  enum SensorType {
+    // Measures the acceleration force in m/s2 that is applied to a device
+    // on all three physical axes (x, y, and z), including the force of
+    // gravity.
+    ACCELERATION = 0;
+    // Measures a device's rate of rotation in rad/s around each of the
+    // three physical axes (x, y, and z).
+    GYROSCOPE = 1;
+    // Measures the ambient geomagnetic field for all three physical axes
+    // (x, y, z) in μT.
+    MAGNETIC_FIELD = 2;
+    // Measures degrees of rotation that a device makes around all three
+    // physical axes (x, y, z)
+    ORIENTATION = 3;
+    // Measures the temperature of the device in degrees Celsius (°C).
+    TEMPERATURE = 4;
+    // Measures the proximity of an object in cm relative to the view screen
+    // of a device. This sensor is typically used to determine whether a
+    // handset is being held up to a person's ear.
+    PROXIMITY = 5;
+    // Measures the ambient light level (illumination) in lx.
+    LIGHT = 6;
+    // Measures the ambient air pressure in hPa or mbar.
+    PRESSURE = 7;
+    // Measures the relative ambient humidity in percent (%).
+    HUMIDITY = 8;
+    MAGNETIC_FIELD_UNCALIBRATED = 9;
+    GYROSCOPE_UNCALIBRATED = 10;
+
+    // HINGE_ANGLE0 (11), HINGE_ANGLE1 (12), HINGE_ANGLE2 (13) are
+    // skipped; clients should use get/setPhysicalModel() instead for these
+    // "sensors".
+
+    // Measures the heart rate in bpm.
+    HEART_RATE = 14;
+    // Measures the ambient RGBC light intensity.
+    // Values are in order (Red, Green, Blue, Clear).
+    RGBC_LIGHT = 15;
+    // WIRST_TILT (16) is skipped; clients should use get/setPhysicalModel()
+    // instead.
+    // Measures acceleration force and provides bias data.
+    ACCELERATION_UNCALIBRATED = 17;
+  }
+
+  // Type of sensor
+  SensorType target = 1;
+
+  // [Output Only]
+  State status = 2;
+
+  // Value interpretation depends on sensor enum.
+  ParameterValue value = 3;
+}
+
+// A single backlight brightness value.
+message BrightnessValue {
+  enum LightType {
+    // Display backlight. This will affect all displays.
+    LCD = 0;
+    KEYBOARD = 1;
+    BUTTON = 2;
+  }
+
+  // Type of light
+  LightType target = 1;
+
+  // Light intensity, ranges from 0-255.
+  uint32 value = 2;
+}
+
+// in line with android/emulation/resizable_display_config.h
+enum DisplayModeValue {
+  PHONE = 0;
+  FOLDABLE = 1;
+  TABLET = 2;
+  DESKTOP = 3;
+}
+
+message DisplayMode {
+  DisplayModeValue value = 1;
+}
+
+message LogMessage {
+  // [Output Only] The contents of the log output.
+  string contents = 1;
+  // The starting byte position of the output that was returned. This
+  // should match the start parameter sent with the request. If the serial
+  // console output exceeds the size of the buffer, older output will be
+  // overwritten by newer content and the start values will be mismatched.
+  int64 start = 2;
+  //[Output Only] The position of the next byte of content from the serial
+  // console output. Use this value in the next request as the start
+  // parameter.
+  int64 next = 3;
+
+  // Set the sort of response you are interested it in.
+  // It the type is "Parsed" the entries field will contain the parsed
+  // results. otherwise the contents field will be set.
+  LogType sort = 4;
+
+  // [Output Only] The parsed logcat entries so far. Only set if sort is
+  // set to Parsed
+  repeated LogcatEntry entries = 5;
+
+  enum LogType {
+    Text = 0;
+    Parsed = 1;
+  }
+}
+
+// A parsed logcat entry.
+message LogcatEntry {
+  // The possible log levels.
+  enum LogLevel {
+    UNKNOWN = 0;
+    DEFAULT = 1;
+    VERBOSE = 2;
+    DEBUG = 3;
+    INFO = 4;
+    WARN = 5;
+    ERR = 6;
+    FATAL = 7;
+    SILENT = 8;
+  }
+
+  // A Unix timestamps in  milliseconds (The number of milliseconds that
+  // have elapsed since January 1, 1970 (midnight UTC/GMT), not counting
+  // leap seconds)
+  uint64 timestamp = 1;
+
+  // Process id.
+  uint32 pid = 2;
+
+  // Thread id.
+  uint32 tid = 3;
+  LogLevel level = 4;
+  string tag = 5;
+  string msg = 6;
+}
+
+// Information about the hypervisor that is currently in use.
+message VmConfiguration {
+  enum VmHypervisorType {
+    // An unknown hypervisor
+    UNKNOWN = 0;
+
+    // No hypervisor is in use. This usually means that the guest is
+    // running on a different CPU than the host, or you are using a
+    // platform where no hypervisor is available.
+    NONE = 1;
+
+    // The Kernel based Virtual Machine
+    // (https://www.linux-kvm.org/page/Main_Page)
+    KVM = 2;
+
+    // Intel® Hardware Accelerated Execution Manager (Intel® HAXM)
+    // https://github.com/intel/haxm
+    HAXM = 3;
+
+    // Hypervisor Framework.
+    // https://developer.apple.com/documentation/hypervisor
+    HVF = 4;
+
+    // Window Hypervisor Platform
+    // https://docs.microsoft.com/en-us/virtualization/api/
+    WHPX = 5;
+
+    AEHD = 6;
+  }
+
+  VmHypervisorType hypervisorType = 1;
+  int32 numberOfCpuCores = 2;
+  int64 ramSizeBytes = 3;
+}
+
+// Representation of a clipped data object on the clipboard.
+message ClipData {
+  // UTF-8 Encoded text.
+  string text = 1;
+}
+
+// The Touch interface represents a single contact point on a
+// touch-sensitive device. The contact point is commonly a finger or stylus
+// and the device may be a touchscreen or trackpad.
+message Touch {
+  // The horizontal coordinate. This is the physical location on the
+  // screen For example 0 indicates the leftmost coordinate.
+  int32 x = 1;
+
+  // The vertical coordinate. This is the physical location on the screen
+  // For example 0 indicates the top left coordinate.
+  int32 y = 2;
+
+  // The identifier is an arbitrary non-negative integer that is used to
+  // identify and track each tool independently when multiple tools are
+  // active. For example, when multiple fingers are touching the device,
+  // each finger should be assigned a distinct tracking id that is used as
+  // long as the finger remains in contact. Tracking ids may be reused
+  // when their associated tools move out of range.
+  //
+  // The emulator currently supports up to 10 concurrent touch events. The
+  // identifier can be any uninque value and will be mapped to the next
+  // available internal identifier.
+  int32 identifier = 3;
+
+  // Reports the physical pressure applied to the tip of the tool or the
+  // signal strength of the touch contact.
+  //
+  // The values reported must be non-zero when the tool is touching the
+  // device and zero otherwise to indicate that the touch event is
+  // completed.
+  //
+  // Make sure to deliver a pressure of 0 for the given identifier when
+  // the touch event is completed, otherwise the touch identifier will not
+  // be unregistered!
+  int32 pressure = 4;
+
+  // Optionally reports the cross-sectional area of the touch contact, or
+  // the length of the longer dimension of the touch contact.
+  int32 touch_major = 5;
+
+  // Optionally reports the length of the shorter dimension of the touch
+  // contact. This axis will be ignored if touch_major is reporting an
+  // area measurement greater than 0.
+  int32 touch_minor = 6;
+
+  enum EventExpiration {
+    // The system will use the default time of 120s to track
+    // the touch event with the given identifier. If no update happens
+    // within this timeframe the identifier is considered expired
+    // and can be made available for re-use. This means that a touch event
+    // with pressure 0 for this identifier will be send to the emulator.
+    EVENT_EXPIRATION_UNSPECIFIED = 0;
+
+    // Never expire the given slot. You must *ALWAYS* close the identifier
+    // by sending a touch event with 0 pressure.
+    NEVER_EXPIRE = 1;
+  }
+
+  EventExpiration expiration = 7;
+}
+
+// A TouchEvent contains a list of Touch objects that are in contact with
+// the touch surface.
+//
+// Touch events are delivered in sequence as specified in the touchList.
+//
+// TouchEvents are delivered to the emulated devices using ["Protocol
+// B"](https://www.kernel.org/doc/Documentation/input/multi-touch-protocol.txt)
+message TouchEvent {
+  // The list of Touch objects, note that these do not need to be unique
+  repeated Touch touches = 1;
+
+  // The display device where the touch event occurred.
+  // Omitting or using the value 0 indicates the main display.
+  //
+  // Touch events cannot be send to displays other than 0, due to
+  // https://issuetracker.google.com/issues/150699691
+  int32 display = 2;
+}
+
+// The MouseEvent interface represents events that occur due to the user
+// interacting with a pointing device (such as a mouse).
+message MouseEvent {
+  // The horizontal coordinate. This is the physical location on the
+  // screen For example 0 indicates the leftmost coordinate.
+  int32 x = 1;
+
+  // The vertical coordinate. This is the physical location on the screen
+  // For example 0 indicates the top left coordinate.
+  int32 y = 2;
+
+  // Indicates which buttons are pressed.
+  // 0: No button was pressed
+  // 1: Primary button (left)
+  // 2: Secondary button (right)
+  int32 buttons = 3;
+
+  // The display device where the mouse event occurred.
+  // Omitting or using the value 0 indicates the main display.
+  int32 display = 4;
+}
+
+message WheelEvent {
+  // The value indicating how much the mouse wheel is rotated. Scaled so that
+  // 120 equals to 1 wheel click. (120 is chosen as a multiplier often used to
+  // represent wheel movements less than 1 wheel click. e.g.
+  // https://doc.qt.io/qt-5/qwheelevent.html#angleDelta) Positive delta value
+  // is assigned to dx when the top of wheel is moved to left. Similarly
+  // positive delta value is assigned to dy when the top of wheel is moved
+  // away from the user.
+  int32 dx = 1;
+  int32 dy = 2;
+
+  // The display device where the mouse event occurred.
+  // Omitting or using the value 0 indicates the main display.
+  int32 display = 3;
+}
+
+// KeyboardEvent objects describe a user interaction with the keyboard; each
+// event describes a single interaction between the user and a key (or
+// combination of a key with modifier keys) on the keyboard.
+// This follows the pattern as set by
+// (javascript)[https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent]
+//
+// Note: that only keyCode, key, or text can be set and that the semantics
+// will slightly vary.
+message KeyboardEvent {
+  // Code types that the emulator can receive. Note that the emulator
+  // will do its best to translate the code to an evdev value that
+  // will be send to the emulator. This translation is based on
+  // the chromium translation tables. See
+  // (this)[https://android.googlesource.com/platform/external/qemu/+/refs/heads/emu-master-dev/android/android-grpc/android/emulation/control/keyboard/keycode_converter_data.inc]
+  // for details on the translation.
+  enum KeyCodeType {
+    Usb = 0;
+    Evdev = 1;
+    XKB = 2;
+    Win = 3;
+    Mac = 4;
+  }
+
+  enum KeyEventType {
+    // Indicates that this keyevent should be send to the emulator
+    // as a key down event. Meaning that the key event will be
+    // translated to an EvDev event type and bit 11 (0x400) will be
+    // set before it is sent to the emulator.
+    keydown = 0;
+
+    // Indicates that the keyevent should be send to the emulator
+    // as a key up event. Meaning that the key event will be
+    // translated to an EvDev event type and
+    // sent to the emulator.
+    keyup = 1;
+
+    // Indicates that the keyevent will be send to the emulator
+    // as e key down event and immediately followed by a keyup event.
+    keypress = 2;
+  }
+
+  // Type of keycode contained in the keyCode field.
+  KeyCodeType codeType = 1;
+
+  // The type of keyboard event that should be sent to the emulator
+  KeyEventType eventType = 2;
+
+  // This property represents a physical key on the keyboard (as opposed
+  // to the character generated by pressing the key). In other words, this
+  // property is a value which isn't altered by keyboard layout or the
+  // state of the modifier keys. This value will be interpreted by the
+  // emulator depending on the KeyCodeType. The incoming key code will be
+  // translated to an evdev code type and send to the emulator.
+  // The values in key and text will be ignored.
+  int32 keyCode = 3;
+
+  // The value of the key pressed by the user, taking into consideration
+  // the state of modifier keys such as Shift as well as the keyboard
+  // locale and layout. This follows the w3c standard used in browsers.
+  // You can find an accurate description of valid values
+  // [here](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values)
+  //
+  // Note that some keys can result in multiple evdev events that are
+  // delivered to the emulator. for example the Key "A" will result in a
+  // sequence:
+  // ["Shift", "a"] -> [0x2a, 0x1e] whereas "a" results in ["a"] -> [0x1e].
+  //
+  // Not all documented keys are understood by android, and only printable
+  // ASCII [32-127) characters are properly translated.
+  //
+  // Keep in mind that there are a set of key values that result in android
+  // specific behavior
+  // [see](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key/Key_Values#Phone_keys):
+  //
+  // - "AppSwitch": Behaves as the "Overview" button in android.
+  // - "GoBack": The Back button.
+  // - "GoHome": The Home button, which takes the user to the phone's main
+  //             screen (usually an application launcher).
+  // - "Power":  The Power button.
+  string key = 4;
+
+  // Series of utf8 encoded characters to send to the emulator. An attempt
+  // will be made to translate every character will an EvDev event type and
+  // send to the emulator as a keypress event. The values in keyCode,
+  // eventType, codeType and key will be ignored.
+  //
+  // Note that most printable ASCII characters (range [32-127) can be send
+  // individually with the "key" param. Do not expect arbitrary UTF symbols to
+  // arrive in the emulator (most will be ignored).
+  //
+  // Note that it is possible to overrun the keyboard buffer by slamming this
+  // endpoint with large quantities of text (>1kb). The clipboard api is
+  // better suited for transferring large quantities of text.
+  string text = 5;
+}
+
+message Fingerprint {
+  // True when the fingprint is touched.
+  bool isTouching = 1;
+
+  // The identifier of the registered fingerprint.
+  int32 touchId = 2;
+}
+
+message GpsState {
+  // Setting this to false will disable auto updating  from the LocationUI,
+  // otherwise the location UI will override the location at a frequency of
+  // 1hz.
+  //
+  // - This is unused if the emulator is launched with -no-window, or when he
+  //   location ui is disabled.
+  // - This will BREAK the location ui experience if it is set to false. For
+  //    example routing will no longer function.
+  bool passiveUpdate = 1;
+
+  // The latitude, in degrees.
+  double latitude = 2;
+
+  // The longitude, in degrees.
+  double longitude = 3;
+
+  // The speed if it is available, in meters/second over ground
+  double speed = 4;
+
+  // gets the horizontal direction of travel of this device, and is not
+  // related to the device orientation. It is guaranteed to be in the
+  // range [0.0, 360.0] if the device has a bearing. 0=North, 90=East,
+  // 180=South, etc..
+  double bearing = 5;
+
+  // The altitude if available, in meters above the WGS 84 reference
+  // ellipsoid.
+  double altitude = 6;
+
+  // The number of satellites used to derive the fix
+  int32 satellites = 7;
+}
+
+message BatteryState {
+  enum BatteryStatus {
+    UNKNOWN = 0;
+    CHARGING = 1;
+    DISCHARGING = 2;
+    NOT_CHARGING = 3;
+    FULL = 4;
+  }
+
+  enum BatteryCharger {
+    NONE = 0;
+    AC = 1;
+    USB = 2;
+    WIRELESS = 3;
+  }
+
+  enum BatteryHealth {
+    GOOD = 0;
+    FAILED = 1;
+    DEAD = 2;
+    OVERVOLTAGE = 3;
+    OVERHEATED = 4;
+  }
+
+  bool hasBattery = 1;
+  bool isPresent = 2;
+  BatteryCharger charger = 3;
+  int32 chargeLevel = 4;
+  BatteryHealth health = 5;
+  BatteryStatus status = 6;
+}
+
+// An ImageTransport allows for specifying a side channel for
+// delivering image frames versus using the standard bytes array that is
+// returned with the gRPC request.
+message ImageTransport {
+  enum TransportChannel {
+    // Return full frames over the gRPC transport
+    TRANSPORT_CHANNEL_UNSPECIFIED = 0;
+
+    // Write images to the a file/shared memory handle.
+    MMAP = 1;
+  }
+
+  // The desired transport channel used for delivering image frames. Only
+  // relevant when streaming screenshots.
+  TransportChannel channel = 1;
+
+  // Handle used for writing image frames if transport is mmap. The client
+  // sets and owns this handle. It can be either a shm region, or a mmap. A
+  // mmap should be a url that starts with `file:///` Note: the mmap can
+  // result in tearing.
+  string handle = 2;
+}
+
+// The aspect ratio (width/height) will be different from the one
+// where the device is unfolded.
+message FoldedDisplay {
+  uint32 width = 1;
+  uint32 height = 2;
+  // It is possible for the screen to be folded in different ways depending
+  // on which surface is shown to the user. So xOffset and yOffset indicate
+  // the top left corner of the folded screen within the original unfolded
+  // screen.
+  uint32 xOffset = 3;
+  uint32 yOffset = 4;
+}
+
+message ImageFormat {
+  enum ImgFormat {
+    // Portable Network Graphics format
+    // (https://en.wikipedia.org/wiki/Portable_Network_Graphics)
+    PNG = 0;
+
+    // Three-channel RGB color model supplemented with a fourth alpha
+    // channel. https://en.wikipedia.org/wiki/RGBA_color_model
+    // Each pixel consists of 4 bytes.
+    RGBA8888 = 1;
+
+    // Three-channel RGB color model, each pixel consists of 3 bytes
+    RGB888 = 2;
+  }
+
+  // The (desired) format of the resulting bytes.
+  ImgFormat format = 1;
+
+  // [Output Only] The rotation of the image. The image will be rotated
+  // based upon the coarse grained orientation of the device.
+  Rotation rotation = 2;
+
+  // The (desired) width of the image. When passed as input
+  // the image will be scaled to match the given
+  // width, while maintaining the aspect ratio of the device.
+  // The returned image will never exceed the given width, but can be less.
+  // Omitting this value (or passing in 0) will result in no scaling,
+  // and the width of the actual device will be used.
+  uint32 width = 3;
+
+  // The (desired) height of the image.  When passed as input
+  // the image will be scaled to match the given
+  // height, while maintaining the aspect ratio of the device.
+  // The returned image will never exceed the given height, but can be less.
+  // Omitting this value (or passing in 0) will result in no scaling,
+  // and the height of the actual device will be used.
+  uint32 height = 4;
+
+  // The (desired) display id of the device. Setting this to 0 (or omitting)
+  // indicates the main display.
+  uint32 display = 5;
+
+  // Set this if you wish to use a different transport channel to deliver
+  // image frames.
+  ImageTransport transport = 6;
+
+  // [Output Only] Display configuration when screen is folded. The value is
+  // the original configuration before scaling.
+  FoldedDisplay foldedDisplay = 7;
+
+  // [Output Only] Display mode when AVD is resizable.
+  DisplayModeValue displayMode = 8;
+}
+
+message Image {
+  ImageFormat format = 1;
+
+  uint32 width = 2 [deprecated = true];   // width is contained in format.
+  uint32 height = 3 [deprecated = true];  // height is contained in format.
+
+  // The organization of the pixels in the image buffer is from left to
+  // right and bottom up. This will be empty if an alternative image transport
+  // is requested in the image format. In that case the side channel should
+  // be used to obtain the image data.
+  bytes image = 4;
+
+  // [Output Only] Monotonically increasing sequence number in a stream of
+  // screenshots. The first screenshot will have a sequence of 0. A single
+  // screenshot will always have a sequence number of 0. The sequence is not
+  // necessarily contiguous, and can be used to detect how many frames were
+  // dropped. An example sequence could be: [0, 3, 5, 7, 9, 11].
+  uint32 seq = 5;
+
+  // [Output Only] Unix timestamp in microseconds when the emulator estimates
+  // the frame was generated. The timestamp is before the actual frame is
+  // copied and transformed. This can be used to calculate variance between
+  // frame production time, and frame depiction time.
+  uint64 timestampUs = 6;
+}
+
+message Rotation {
+  enum SkinRotation {
+    PORTRAIT = 0;           // 0 degrees
+    LANDSCAPE = 1;          // 90 degrees
+    REVERSE_PORTRAIT = 2;   // -180 degrees
+    REVERSE_LANDSCAPE = 3;  // -90 degrees
+  }
+
+  // The rotation of the device, derived from the sensor state
+  // of the emulator. The derivation reflects how android observes
+  // the rotation state.
+  SkinRotation rotation = 1;
+
+  // Specifies the angle of rotation, in degrees [-180, 180]
+  double xAxis = 2;
+  double yAxis = 3;
+  double zAxis = 4;
+}
+
+message PhoneCall {
+  enum Operation {
+    InitCall = 0;
+    AcceptCall = 1;
+    RejectCallExplicit = 2;
+    RejectCallBusy = 3;
+    DisconnectCall = 4;
+    PlaceCallOnHold = 5;
+    TakeCallOffHold = 6;
+  }
+  Operation operation = 1;
+  string number = 2;
+}
+
+message PhoneResponse {
+  enum Response {
+    OK = 0;
+    BadOperation = 1;   // Enum out of range
+    BadNumber = 2;      // Mal-formed telephone number
+    InvalidAction = 3;  // E.g., disconnect when no call is in progress
+    ActionFailed = 4;   // Internal error
+    RadioOff = 5;       // Radio power off
+  }
+  Response response = 1;
+}
+
+message Entry {
+  string key = 1;
+  string value = 2;
+}
+
+message EntryList {
+  repeated Entry entry = 1;
+}
+
+message EmulatorStatus {
+  // The emulator version string.
+  string version = 1;
+
+  // The time the emulator has been active in .ms
+  uint64 uptime = 2;
+
+  // True if the device has completed booting.
+  // For P and later this information will accurate,
+  // for older images we rely on adb.
+  bool booted = 3;
+
+  // The current vm configuration
+  VmConfiguration vmConfig = 4;
+
+  // The hardware configuration of the running emulator as
+  // key valure pairs.
+  EntryList hardwareConfig = 5;
+}
+
+message AudioFormat {
+  enum SampleFormat {
+    AUD_FMT_U8 = 0;   // Unsigned 8 bit
+    AUD_FMT_S16 = 1;  // Signed 16 bit (little endian)
+  }
+
+  enum Channels {
+    Mono = 0;
+    Stereo = 1;
+  }
+
+  enum DeliveryMode {
+    // The audio queue will block and wait until the emulator requests
+    // packets. The client does not have to throttle and can push packets at
+    // will. This can result in the client falling behind.
+    MODE_UNSPECIFIED = 0;
+    // Audio packets will be delivered in real time (when possible). The
+    // audio queue will be overwritten with incoming data if data is made
+    // available. This means the client needs to control timing properly, or
+    // packets will get overwritten.
+    MODE_REAL_TIME = 1;  //
+  }
+  // Sampling rate to use, defaulting to 44100 if this is not set.
+  // Note, that android devices typically will not use a sampling
+  // rate higher than 48kHz. See
+  // https://developer.android.com/ndk/guides/audio.
+  uint64 samplingRate = 1;
+  Channels channels = 2;
+  SampleFormat format = 3;
+
+  // [Input Only]
+  // The mode used when delivering audio packets.
+  DeliveryMode mode = 4;
+}
+
+message AudioPacket {
+  AudioFormat format = 1;
+
+  // Unix epoch in us when this frame was captured.
+  uint64 timestamp = 2;
+
+  // Contains a sample in the given audio format.
+  bytes audio = 3;
+}
+
+message SmsMessage {
+  // The source address where this message came from.
+  //
+  // The address should be a valid GSM-formatted address as specified by
+  // 3GPP 23.040 Sec 9.1.2.5.
+  //
+  // For example: +3106225412 or (650) 555-1221
+  string srcAddress = 1;
+
+  // A utf8 encoded text message that should be delivered.
+  string text = 2;
+}
+
+// A DisplayConfiguration describes a primary or secondary
+// display available to the emulator. The screen aspect ratio
+// cannot be longer (or wider) than 21:9 (or 9:21). Screen sizes
+// larger than 4k will be rejected.
+//
+// Common configurations (w x h) are:
+// - 480p  (480x720)   142 dpi
+// - 720p  (720x1280)  213 dpi
+// - 1080p (1080x1920) 320 dpi
+// - 4K  (2160x3840) 320 dpi
+// - 4K  (2160x3840) 640 dpi (upscaled)
+//
+// The behavior of the virtual display depends on the flags that are provided to
+// this method. By default, virtual displays are created to be private,
+// non-presentation and unsecure.
+message DisplayConfiguration {
+  // These are the set of known android flags and their respective values.
+  // you can combine the int values to (de)construct the flags field below.
+  enum DisplayFlags {
+    DISPLAYFLAGS_UNSPECIFIED = 0;
+
+    // When this flag is set, the virtual display is public.
+    // A public virtual display behaves just like most any other display
+    // that is connected to the system such as an external or wireless
+    // display. Applications can open windows on the display and the system
+    // may mirror the contents of other displays onto it. see:
+    // https://developer.android.com/reference/android/hardware/display/DisplayManager#VIRTUAL_DISPLAY_FLAG_PUBLIC
+    VIRTUAL_DISPLAY_FLAG_PUBLIC = 1;
+
+    // When this flag is set, the virtual display is registered as a
+    // presentation display in the presentation display category.
+    // Applications may automatically project their content to presentation
+    // displays to provide richer second screen experiences.
+    // https://developer.android.com/reference/android/hardware/display/DisplayManager#VIRTUAL_DISPLAY_FLAG_PRESENTATION
+    VIRTUAL_DISPLAY_FLAG_PRESENTATION = 2;
+
+    // When this flag is set, the virtual display is considered secure as
+    // defined by the Display#FLAG_SECURE display flag. The caller promises
+    // to take reasonable measures, such as over-the-air encryption, to
+    // prevent the contents of the display from being intercepted or
+    // recorded on a persistent medium.
+    // see:
+    // https://developer.android.com/reference/android/hardware/display/DisplayManager#VIRTUAL_DISPLAY_FLAG_SECURE
+    VIRTUAL_DISPLAY_FLAG_SECURE = 4;
+
+    // This flag is used in conjunction with VIRTUAL_DISPLAY_FLAG_PUBLIC.
+    // Ordinarily public virtual displays will automatically mirror the
+    // content of the default display if they have no windows of their own.
+    // When this flag is specified, the virtual display will only ever show
+    // its own content and will be blanked instead if it has no windows. See
+    // https://developer.android.com/reference/android/hardware/display/DisplayManager#VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY
+    VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY = 8;
+
+    // Allows content to be mirrored on private displays when no content is
+    // being shown.
+    // This flag is mutually exclusive with
+    // VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY. If both flags are specified
+    // then the own-content only behavior will be applied.
+    // see:
+    // https://developer.android.com/reference/android/hardware/display/DisplayManager#VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR)
+    VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR = 16;
+  }
+
+  // The width of the display, restricted to:
+  // 320 * (dpi / 160) <= width
+  uint32 width = 1;
+
+  // The heigh of the display, restricted to:
+  // * 320 * (dpi / 160) <= height
+  uint32 height = 2;
+
+  // The pixel density (dpi).
+  // See https://developer.android.com/training/multiscreen/screendensities
+  // for details. This value should be in the range [120, ..., 640]
+  uint32 dpi = 3;
+
+  // A combination of virtual display flags. These flags can be constructed
+  // by combining the DisplayFlags enum described above.
+  //
+  // The behavior of the virtual display depends on the flags. By default
+  // virtual displays are created to be private, non-presentation and
+  // unsecure.
+  uint32 flags = 4;
+
+  // The id of the display.
+  // The primary (default) display has the display ID of 0.
+  // A secondary display has a display ID not 0.
+  //
+  // A display with the id in the range [1, userConfigurable]
+  // can be modified. See DisplayConfigurations below for details.
+  //
+  // The id can be used to get or stream a screenshot.
+  uint32 display = 5;
+}
+// Provides information about all the displays that can be attached
+// to the emulator. The emulator will always have at least one display.
+//
+// The emulator usually has the following display configurations:
+// 0:      The default display.
+// 1 - 3:  User configurable displays. These can be added/removed.
+//         For example the standalone emulator allows you to modify these
+//         in the extended controls.
+// 6 - 11: Fixed external displays. For example Android Auto uses fixed
+//         displays in this range.
+message DisplayConfigurations {
+  repeated DisplayConfiguration displays = 1;
+
+  // Display configurations with id [1, userConfigurable] are
+  // user configurable, that is they can be added, removed or
+  // updated.
+  uint32 userConfigurable = 2;
+
+  // The maximum number of attached displays this emulator supports.
+  // This is the total number of displays that can be attached to
+  // the emulator.
+  //
+  // Note: A display with an id that is larger than userConfigurable cannot
+  // be modified.
+  uint32 maxDisplays = 3;
+}
+
+message Notification {
+  enum EventType {
+    VIRTUAL_SCENE_CAMERA_INACTIVE = 0;
+    VIRTUAL_SCENE_CAMERA_ACTIVE = 1;
+
+    // Fired when an update to a display event has been fired through
+    // the extended ui. This does not fire events when the display
+    // is changed through the console or gRPC endpoint.
+    DISPLAY_CONFIGURATIONS_CHANGED_UI = 2;
+    // Keep adding more for other event types
+  }
+
+  EventType event = 1;
+}
+
+message RotationRadian {
+  float x = 1;  // x axis is horizontal and orthogonal to the view direction.
+  float y = 2;  // y axis points up and is perpendicular to the floor.
+  float z = 3;  // z axis is the view direction and is set to 0.0 in
+                // rotateVirtualSceneCamera call.
+}
+
+message Velocity {
+  float x = 1;  // x axis is horizontal and orthogonal to the view direction.
+  float y = 2;  // y axis points up and is perpendicular to the floor.
+  float z = 3;  // z axis is the view direction
+}
+
+// must follow the definition in "external/qemu/android/hw-sensors.h"
+message Posture {
+  enum PostureValue {
+    POSTURE_UNKNOWN = 0;
+    POSTURE_CLOSED = 1;
+    POSTURE_HALF_OPENED = 2;
+    POSTURE_OPENED = 3;
+    POSTURE_FLIPPED = 4;
+    POSTURE_TENT = 5;
+    POSTURE_MAX = 6;
+  }
+  PostureValue value = 3;
+}
+
+message PhoneNumber {
+  //
+  // The phone number should be a valid GSM-formatted number as specified by
+  // 3GPP 23.040 Sec 9.1.2.5.
+  //
+  // For example: +3106225412 or (650) 555-1221
+  string number = 1;
+}
diff --git a/opensource/jarjar/BUILD.bazel b/opensource/jarjar/BUILD.bazel
deleted file mode 100644
index dca0afbe7..000000000
--- a/opensource/jarjar/BUILD.bazel
+++ /dev/null
@@ -1,12 +0,0 @@
-# Description: Jar Jar Links, utility for repackaging Java libraries
-
-package(default_visibility = ["//visibility:public"])
-
-licenses(["notice"])  # Apache 2.0
-
-# Binary target for running jarjar
-java_binary(
-    name = "jarjar_bin",
-    main_class = "com.tonicsystems.jarjar.Main",
-    runtime_deps = ["@maven//:org_pantsbuild_jarjar"],
-)
diff --git a/opensource/java_lib/BUILD.bazel b/opensource/java_lib/BUILD.bazel
deleted file mode 100644
index 104810ebd..000000000
--- a/opensource/java_lib/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-java_import(
-    name = "webbridge",
-    jars = [
-        "libbridge.jar",
-    ],
-)
-
-java_import(
-    name = "EvaluationAtom",
-    jars = [
-        "libEvaluationAtom.jar",
-    ],
-)
-
-java_import(
-    name = "WebDriverScripts",
-    jars = [
-        "libWebDriverScripts.jar",
-    ],
-)
diff --git a/opensource/java_lib/libEvaluationAtom.jar b/opensource/java_lib/libEvaluationAtom.jar
deleted file mode 100644
index aef7b02f6..000000000
Binary files a/opensource/java_lib/libEvaluationAtom.jar and /dev/null differ
diff --git a/opensource/java_lib/libWebDriverScripts.jar b/opensource/java_lib/libWebDriverScripts.jar
deleted file mode 100644
index 6676d85fd..000000000
Binary files a/opensource/java_lib/libWebDriverScripts.jar and /dev/null differ
diff --git a/opensource/java_lib/libbridge.jar b/opensource/java_lib/libbridge.jar
deleted file mode 100644
index bbf288ade..000000000
Binary files a/opensource/java_lib/libbridge.jar and /dev/null differ
diff --git a/opensource/proto/BUILD b/opensource/proto/BUILD
new file mode 100644
index 000000000..020e45945
--- /dev/null
+++ b/opensource/proto/BUILD
@@ -0,0 +1,7 @@
+# Common proto build rules for AXT in Bazel
+
+alias(
+    name = "any_java_proto_lite",
+    actual = "@com_google_protobuf//:protobuf_javalite",
+    visibility = ["//visibility:public"],
+)
diff --git a/opensource/visibility/BUILD b/opensource/visibility/BUILD
new file mode 100644
index 000000000..331c6abcd
--- /dev/null
+++ b/opensource/visibility/BUILD
@@ -0,0 +1,7 @@
+package_group(
+    name = "testing_pkg",
+    packages = [
+        "//espresso/...",
+        "//services/...",
+    ],
+)
diff --git a/proguard_binary.cfg b/proguard_binary.cfg
index 8c48a10c5..291859480 100644
--- a/proguard_binary.cfg
+++ b/proguard_binary.cfg
@@ -30,6 +30,9 @@
     java.lang.Object readResolve();
 }
 
+# Preserve Kotlin runtime libraries.
+-keep class kotlin.** { *; }
+
 # Skipping analysis of some classes may make proguard strip something that's
 # needed.
 -dontskipnonpubliclibraryclasses
@@ -51,4 +54,8 @@
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn sun.misc.Unsafe
 -dontwarn org.checkerframework.**
+-dontwarn org.jetbrains.annotations.NotNull
+-dontwarn org.jetbrains.annotations.Nullable
 
+# for 'can't find referenced method 'android.app.Instrumentation$ActivityResult execStartActivity' etc
+-dontwarn androidx.test.runner.MonitoringInstrumentation
diff --git a/repo.bzl b/repo.bzl
index 79418bf7c..526da15c9 100644
--- a/repo.bzl
+++ b/repo.bzl
@@ -18,9 +18,9 @@ def _development_repositories():
 
     http_archive(
         name = "robolectric",
-        sha256 = "d4f2eb078a51f4e534ebf5e18b6cd4646d05eae9b362ac40b93831bdf46112c7",
-        strip_prefix = "robolectric-bazel-4.4",
-        urls = ["https://github.com/robolectric/robolectric-bazel/archive/4.4.tar.gz"],
+        strip_prefix = "robolectric-bazel-4.13",
+        sha256 = "a270fd6fd83f9f024623e787696e6b73c44664b7c95f3d937ed35bf0a94a67ae",
+        urls = ["https://github.com/robolectric/robolectric-bazel/releases/download/4.13/robolectric-bazel-4.13.tar.gz"],
     )
     # uncomment to test with new robolectric version. Change path to point to local filesystem
     # clone of https://github.com/robolectric/robolectric-bazel
@@ -29,17 +29,6 @@ def _development_repositories():
     #     path = "~/github/robolectric-bazel/",
     # )
 
-    http_archive(
-        name = "jsr330",
-        build_file_content = """
-package(default_visibility = ["//visibility:public"])
-java_import(
-    name = "jsr330",
-    jars = ["javax.inject.jar"],
-)""",
-        url = "https://github.com/javax-inject/javax-inject/releases/download/1/javax.inject.zip",
-    )
-
 # These dependencies are for *users* of the Android Test repo,
 # i.e. specifying this repository as @androidx_test in their
 # WORKSPACE using a repository_rule like git_repository or http_archive.
@@ -148,9 +137,9 @@ def android_test_repositories(with_dev_repositories = False):
     http_archive(
         name = "zlib",
         build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
-        sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
-        strip_prefix = "zlib-1.2.11",
-        urls = ["https://zlib.net/zlib-1.2.11.tar.gz"],
+        sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9",
+        strip_prefix = "zlib-1.2.12",
+        urls = ["https://zlib.net/zlib-1.2.12.tar.gz"],
     )
 
     http_archive(
diff --git a/runner/android_junit_runner/BUILD b/runner/android_junit_runner/BUILD
new file mode 100644
index 000000000..521194d76
--- /dev/null
+++ b/runner/android_junit_runner/BUILD
@@ -0,0 +1,16 @@
+# Publicly visible alias to the runner target
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "android_junit_runner",
+    actual = "//runner/android_junit_runner/java/androidx/test:runner",
+    visibility = ["//visibility:public"],
+)
diff --git a/runner/android_junit_runner/BUILD.bazel b/runner/android_junit_runner/BUILD.bazel
deleted file mode 100644
index b203cef82..000000000
--- a/runner/android_junit_runner/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-# Publicly visible alias to the runner target
-
-licenses(["notice"])  # Apache License 2.0
-
-# This needs to be a android_library so manifests are exported
-android_library(
-    name = "android_junit_runner",
-    visibility = ["//visibility:public"],
-    exports = ["//runner/android_junit_runner/java/androidx/test:runner"],
-)
diff --git a/runner/android_junit_runner/CHANGELOG.md b/runner/android_junit_runner/CHANGELOG.md
new file mode 100644
index 000000000..5e886f303
--- /dev/null
+++ b/runner/android_junit_runner/CHANGELOG.md
@@ -0,0 +1,25 @@
+### runner {version} {:#runner-{version}}
+
+{{date}}
+
+`androidx.test:runner:{version}` is released.
+
+**Bug Fixes**
+
+* Catch LinkageError when loading annotation classes (b/536117227)
+
+**New Features**
+
+* Make perfetto trace sections for tests more identifiable by prefixing with "test:" and using fully qualified class name. (b/204992764)
+
+* Add logs at the start and end of RunBefore and RunAfters sections to help bug understanding. (b/445754263)
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml b/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml
index 39b3ceade..cd1a0e574 100644
--- a/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml
+++ b/runner/android_junit_runner/java/androidx/test/AndroidManifest.xml
@@ -23,7 +23,7 @@
     </queries>
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="23"
         android:targetSdkVersion="30" />
 
     <application />
diff --git a/runner/android_junit_runner/java/androidx/test/BUILD b/runner/android_junit_runner/java/androidx/test/BUILD
new file mode 100644
index 000000000..d4c59ddb2
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/BUILD
@@ -0,0 +1,98 @@
+# Description: Build rules for building androidx.test from source
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# all users should reference the equivalent targets in //runner/android_junit_runner
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        ":allowlist",
+    ],
+)
+
+package_group(
+    name = "allowlist",
+    packages = [
+        "//...",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "runner",
+    srcs = glob(
+        include = ["**/*.java"],
+        exclude = ["filters/*.java"],
+    ),
+    custom_package = "androidx.test.runner",
+    idl_srcs = glob(["**/*.aidl"]),
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [
+        "proguard_library.cfg",
+    ],
+    exports = [
+        ":filters",
+        "//runner/monitor",
+    ],
+    deps = [
+        ":filters",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:androidx_tracing_tracing",
+        "@maven//:junit_junit",
+    ],
+)
+
+java_library(
+    name = "filters",
+    srcs = glob(["filters/*.java"]),
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//opensource:androidsdk_compiletime",
+        "//opensource/androidx:annotation",
+        "@maven//:junit_junit",
+    ],
+)
+
+# Generate rules for the release artifacts.
+axt_android_aar(
+    name = "runner_aar",
+    expected_class_prefixes = [
+        "androidx.test.services.events",
+        "androidx.test.runner",
+        "androidx.test.orchestrator",
+        "androidx.test.internal",
+        "androidx.test.filters",
+    ],
+    included_dep = ":runner",
+)
+
+maven_artifact(
+    name = "runner_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":runner_aar",
+)
+
+dackka_test(
+    name = "runner_doc",
+    runtime_dep = ":runner",
+    src_jar = ":runner_aar-src.jar",
+)
+
+api_checks(
+    name = "runner_api",
+    runtime_dep = ":runner",
+    src_jar = ":runner_aar-src.jar",
+)
diff --git a/runner/android_junit_runner/java/androidx/test/BUILD.bazel b/runner/android_junit_runner/java/androidx/test/BUILD.bazel
deleted file mode 100644
index 425dda479..000000000
--- a/runner/android_junit_runner/java/androidx/test/BUILD.bazel
+++ /dev/null
@@ -1,80 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "JUNIT_VERSION", "MONITOR_VERSION", "RUNNER_VERSION", "SERVICES_VERSION")
-
-# Description: Build rules for building androidx.test from source
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-android_library(
-    name = "runner",
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    idl_srcs = glob(["**/*.aidl"]),
-    proguard_specs = [
-        "proguard_library.cfg",
-    ],
-    visibility = ["//visibility:public"],
-    exports = [
-        "//runner/monitor",
-    ],
-    deps = [
-        "//:androidx_annotation",
-        "//runner/monitor",
-        "//services/events/java/androidx/test/services/events",
-        "//services/storage",
-        "@androidsdk//:legacy_test-30",
-        "@maven//:junit_junit",
-    ],
-)
-
-# group of targets to use to produce release binary + docs
-android_library(
-    name = "runner_release_lib",
-    visibility = ["//visibility:public"],
-    exports = [
-        ":runner",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: runner_release_no_deps.jar and runner_release.aar
-# a java_library target librunner_release_no_deps
-axt_release_lib(
-    name = "runner_release",
-    custom_package = "androidx.test.runner",
-    jarjar_rules = "release_jarjar_rules.txt",
-    keep_spec = "androidx/test",
-    overlapping_jars = [
-        "//runner/monitor/java/androidx/test:monitor_release_no_deps.jar",
-        "//services/storage/java/androidx/test/services/storage:test_storage_release_no_deps.jar",
-    ],
-    proguard_library = ":proguard_library.cfg",
-    # remove the generated R class
-    remove_spec = "androidx/test/runner/R[$$\\.]",
-    deps = [
-        ":runner_release_lib",
-    ],
-)
-
-maven_artifact(
-    name = "runner_maven_artifact",
-    src = ":runner_release.aar",
-    artifact_deps = [
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-        "androidx.test:monitor:[%s]" % MONITOR_VERSION,
-        "androidx.test.services:storage:[%s]" % SERVICES_VERSION,
-        "junit:junit:%s" % JUNIT_VERSION,
-    ],
-    artifact_id = "runner",
-    group_id = "androidx.test",
-    last_updated = "20170622000000",
-    src_jar = ":librunner-src.jar",
-    version = "%s" % RUNNER_VERSION,
-)
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.4.0_public.txt b/runner/android_junit_runner/java/androidx/test/api/1.4.0_public.txt
new file mode 100644
index 000000000..610caae30
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.4.0_public.txt
@@ -0,0 +1,282 @@
+// Signature format: 3.0
+package androidx.test.filters {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface FlakyTest {
+    method public abstract int bugId() default -1;
+    method public abstract String detail() default "";
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface LargeTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface MediumTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface RequiresDevice {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface SdkSuppress {
+    method public abstract String codeName() default "unset";
+    method public abstract int maxSdkVersion() default java.lang.Integer.MAX_VALUE;
+    method public abstract int minSdkVersion() default 1;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface SmallTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Suppress {
+  }
+
+}
+
+package androidx.test.orchestrator.callback {
+
+  public interface OrchestratorCallback extends android.os.IInterface {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public abstract static class OrchestratorCallback.Stub implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Stub();
+    method public static androidx.test.orchestrator.callback.OrchestratorCallback! asInterface(android.os.IBinder!);
+    method protected boolean dispatchTransaction(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+  public static class OrchestratorCallback.Stub.Proxy implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public final class OrchestratorV1Connection extends androidx.test.internal.events.client.TestEventServiceConnectionBase<androidx.test.orchestrator.callback.OrchestratorCallback> implements androidx.test.internal.events.client.TestDiscoveryEventService androidx.test.internal.events.client.TestRunEventService {
+    ctor public OrchestratorV1Connection(androidx.test.internal.events.client.TestEventClientConnectListener);
+    method public void send(androidx.test.services.events.run.TestRunEvent) throws androidx.test.internal.events.client.TestEventClientException;
+    method public void send(androidx.test.services.events.discovery.TestDiscoveryEvent) throws androidx.test.internal.events.client.TestEventClientException;
+  }
+
+}
+
+package androidx.test.orchestrator.junit {
+
+  public final class BundleJUnitUtils {
+    method public static android.os.Bundle! getBundleFromDescription(org.junit.runner.Description!);
+    method public static android.os.Bundle! getBundleFromFailure(org.junit.runner.notification.Failure!);
+    method public static android.os.Bundle! getBundleFromResult(org.junit.runner.Result!);
+    method public static android.os.Bundle! getBundleFromThrowable(org.junit.runner.Description!, Throwable!);
+    method public static androidx.test.orchestrator.junit.ParcelableDescription! getDescription(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableFailure! getFailure(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableResult! getResult(android.os.Bundle!);
+  }
+
+  public final class ParcelableDescription implements android.os.Parcelable {
+    ctor public ParcelableDescription(org.junit.runner.Description!);
+    ctor public ParcelableDescription(String!);
+    method public int describeContents();
+    method public String! getClassName();
+    method public String! getDisplayName();
+    method public String! getMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableDescription!>! CREATOR;
+  }
+
+  public final class ParcelableFailure implements android.os.Parcelable {
+    ctor public ParcelableFailure(org.junit.runner.notification.Failure!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, Throwable!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, String!);
+    method public int describeContents();
+    method public androidx.test.orchestrator.junit.ParcelableDescription! getDescription();
+    method public String! getTrace();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableFailure!>! CREATOR;
+  }
+
+  public final class ParcelableResult implements android.os.Parcelable {
+    ctor public ParcelableResult(java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>!);
+    ctor public ParcelableResult(org.junit.runner.Result!);
+    method public int describeContents();
+    method public int getFailureCount();
+    method public java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>! getFailures();
+    method public boolean wasSuccessful();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableResult!>! CREATOR;
+  }
+
+}
+
+package androidx.test.orchestrator.listeners {
+
+  public final class OrchestrationListenerManager {
+    ctor public OrchestrationListenerManager(android.app.Instrumentation!);
+    method public void addListener(androidx.test.orchestrator.listeners.OrchestrationRunListener!);
+    method public void handleNotification(android.os.Bundle!);
+    method public void orchestrationRunStarted(int);
+    method public void testProcessFinished(String!);
+    method public void testProcessStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    field public static final String KEY_TEST_EVENT = "TestEvent";
+  }
+
+  public enum OrchestrationListenerManager.TestEvent {
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_STARTED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_STARTED;
+  }
+
+  public abstract class OrchestrationRunListener {
+    ctor public OrchestrationRunListener();
+    method public android.app.Instrumentation! getInstrumentation();
+    method public void orchestrationRunStarted(int);
+    method public void setInstrumentation(android.app.Instrumentation!);
+    method public void testAssumptionFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFinished(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testIgnored(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testProcessFinished(String!);
+    method public void testRunFinished(androidx.test.orchestrator.junit.ParcelableResult!);
+    method public void testRunStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+  }
+
+}
+
+package androidx.test.orchestrator.listeners.result {
+
+  public interface ITestRunListener {
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+  public class TestIdentifier {
+    ctor public TestIdentifier(String!, String!);
+    method public String! getClassName();
+    method public String! getTestName();
+  }
+
+  public class TestResult {
+    ctor public TestResult();
+    method public long getEndTime();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getMetrics();
+    method public String! getStackTrace();
+    method public long getStartTime();
+    method public androidx.test.orchestrator.listeners.result.TestResult.TestStatus! getStatus();
+    method public void setEndTime(long);
+    method public void setMetrics(java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void setStackTrace(String!);
+    method public androidx.test.orchestrator.listeners.result.TestResult! setStatus(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+  }
+
+  public enum TestResult.TestStatus {
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus INCOMPLETE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus PASSED;
+  }
+
+  public class TestRunResult implements androidx.test.orchestrator.listeners.result.ITestRunListener {
+    ctor public TestRunResult();
+    method public java.util.Set<androidx.test.orchestrator.listeners.result.TestIdentifier!>! getCompletedTests();
+    method public long getElapsedTime();
+    method public String! getName();
+    method public int getNumAllFailedTests();
+    method public int getNumCompleteTests();
+    method public int getNumTests();
+    method public int getNumTestsInState(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+    method public String! getRunFailureMessage();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getRunMetrics();
+    method public java.util.Map<androidx.test.orchestrator.listeners.result.TestIdentifier!,androidx.test.orchestrator.listeners.result.TestResult!>! getTestResults();
+    method public String! getTextSummary();
+    method public boolean hasFailedTests();
+    method public boolean isRunComplete();
+    method public boolean isRunFailure();
+    method public void setAggregateMetrics(boolean);
+    method public void setRunComplete(boolean);
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+}
+
+package androidx.test.runner {
+
+  @Deprecated public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor @Deprecated public AndroidJUnit4(Class<?>!, androidx.test.internal.util.AndroidRunnerParams!) throws org.junit.runners.model.InitializationError;
+    ctor @Deprecated public AndroidJUnit4(Class<?>!) throws org.junit.runners.model.InitializationError;
+    method @Deprecated public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method @Deprecated public org.junit.runner.Description! getDescription();
+    method @Deprecated public void run(org.junit.runner.notification.RunNotifier!);
+    method @Deprecated public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+  public class AndroidJUnitRunner extends androidx.test.runner.MonitoringInstrumentation implements androidx.test.internal.events.client.TestEventClientConnectListener {
+    ctor public AndroidJUnitRunner();
+    method public void onTestEventClientConnect();
+  }
+
+  public class UsageTrackerFacilitator implements androidx.test.internal.runner.tracker.UsageTracker {
+    ctor public UsageTrackerFacilitator(androidx.test.internal.runner.RunnerArgs);
+    ctor public UsageTrackerFacilitator(boolean);
+    method public void registerUsageTracker(androidx.test.internal.runner.tracker.UsageTracker?);
+    method public void sendUsages();
+    method public boolean shouldTrackUsage();
+    method public void trackUsage(String!, String!);
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public abstract class SingleActivityFactory<T extends android.app.Activity> implements androidx.test.runner.intercepting.InterceptingActivityFactory {
+    ctor public SingleActivityFactory(Class<T!>!);
+    method public final android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method protected abstract T! create(android.content.Intent!);
+    method public final Class<T!>! getActivityClassToIntercept();
+    method public final boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.permission {
+
+  @android.support.annotation.VisibleForTesting public abstract class RequestPermissionCallable implements java.util.concurrent.Callable<androidx.test.runner.permission.RequestPermissionCallable.Result> {
+    ctor public RequestPermissionCallable(androidx.test.runner.permission.ShellCommand, android.content.Context, String!);
+    method protected String! getPermission();
+    method protected androidx.test.runner.permission.ShellCommand! getShellCommand();
+    method protected boolean isPermissionGranted();
+  }
+
+  public enum RequestPermissionCallable.Result {
+    enum_constant public static final androidx.test.runner.permission.RequestPermissionCallable.Result FAILURE;
+    enum_constant public static final androidx.test.runner.permission.RequestPermissionCallable.Result SUCCESS;
+  }
+
+  @android.support.annotation.VisibleForTesting public abstract class ShellCommand {
+    ctor public ShellCommand();
+  }
+
+}
+
+package androidx.test.runner.screenshot {
+
+  public class UiAutomationWrapper {
+    method public android.graphics.Bitmap! takeScreenshot();
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.5.0_internal.txt b/runner/android_junit_runner/java/androidx/test/api/1.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.5.0_public.txt b/runner/android_junit_runner/java/androidx/test/api/1.5.0_public.txt
new file mode 100644
index 000000000..08a82a024
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.5.0_public.txt
@@ -0,0 +1,303 @@
+// Signature format: 3.0
+package androidx.test.filters {
+
+  public abstract class AbstractFilter extends org.junit.runner.manipulation.Filter {
+    ctor public AbstractFilter();
+    method protected abstract boolean evaluateTest(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getClassAnnotations(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getMethodAnnotations(org.junit.runner.Description!);
+    method public boolean shouldRun(org.junit.runner.Description!);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface FlakyTest {
+    method public abstract int bugId() default -1;
+    method public abstract String detail() default "";
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface LargeTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface MediumTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface RequiresDevice {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface SdkSuppress {
+    method public abstract String codeName() default "unset";
+    method public abstract int maxSdkVersion() default java.lang.Integer.MAX_VALUE;
+    method public abstract int minSdkVersion() default 1;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface SmallTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Suppress {
+  }
+
+}
+
+package androidx.test.orchestrator.callback {
+
+  public interface OrchestratorCallback extends android.os.IInterface {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public abstract static class OrchestratorCallback.Stub extends com.google.android.aidl.BaseStub implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Stub();
+    method public static androidx.test.orchestrator.callback.OrchestratorCallback! asInterface(android.os.IBinder!);
+  }
+
+  public static class OrchestratorCallback.Stub.Proxy extends com.google.android.aidl.BaseProxy implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.orchestrator.junit {
+
+  public final class BundleJUnitUtils {
+    method public static android.os.Bundle! getBundleFromDescription(org.junit.runner.Description!);
+    method public static android.os.Bundle! getBundleFromFailure(org.junit.runner.notification.Failure!);
+    method public static android.os.Bundle! getBundleFromResult(org.junit.runner.Result!);
+    method public static android.os.Bundle! getBundleFromThrowable(org.junit.runner.Description!, Throwable!);
+    method public static androidx.test.orchestrator.junit.ParcelableDescription! getDescription(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableFailure! getFailure(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableResult! getResult(android.os.Bundle!);
+  }
+
+  public final class ParcelableDescription implements android.os.Parcelable {
+    ctor public ParcelableDescription(org.junit.runner.Description!);
+    ctor public ParcelableDescription(String!);
+    method public int describeContents();
+    method public String! getClassName();
+    method public String! getDisplayName();
+    method public String! getMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableDescription!>! CREATOR;
+  }
+
+  public final class ParcelableFailure implements android.os.Parcelable {
+    ctor public ParcelableFailure(org.junit.runner.notification.Failure!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, Throwable!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, String!);
+    method public int describeContents();
+    method public androidx.test.orchestrator.junit.ParcelableDescription! getDescription();
+    method public String! getTrace();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableFailure!>! CREATOR;
+  }
+
+  public final class ParcelableResult implements android.os.Parcelable {
+    ctor public ParcelableResult(java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>!);
+    ctor public ParcelableResult(org.junit.runner.Result!);
+    method public int describeContents();
+    method public int getFailureCount();
+    method public java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>! getFailures();
+    method public boolean wasSuccessful();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableResult!>! CREATOR;
+  }
+
+}
+
+package androidx.test.orchestrator.listeners {
+
+  public final class OrchestrationListenerManager {
+    ctor public OrchestrationListenerManager(android.app.Instrumentation!);
+    method public void addListener(androidx.test.orchestrator.listeners.OrchestrationRunListener!);
+    method public void handleNotification(android.os.Bundle!);
+    method public void orchestrationRunStarted(int);
+    method public void testProcessFinished(String!);
+    method public void testProcessStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    field public static final String KEY_TEST_EVENT = "TestEvent";
+  }
+
+  public enum OrchestrationListenerManager.TestEvent {
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_STARTED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_STARTED;
+  }
+
+  public abstract class OrchestrationRunListener {
+    ctor public OrchestrationRunListener();
+    method public android.app.Instrumentation! getInstrumentation();
+    method public void orchestrationRunStarted(int);
+    method public void setInstrumentation(android.app.Instrumentation!);
+    method public void testAssumptionFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFinished(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testIgnored(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testProcessFinished(String!);
+    method public void testRunFinished(androidx.test.orchestrator.junit.ParcelableResult!);
+    method public void testRunStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+  }
+
+}
+
+package androidx.test.orchestrator.listeners.result {
+
+  public interface ITestRunListener {
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+  public class TestIdentifier {
+    ctor public TestIdentifier(String!, String!);
+    method public String! getClassName();
+    method public String! getTestName();
+  }
+
+  public class TestResult {
+    ctor public TestResult();
+    method public long getEndTime();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getMetrics();
+    method public String! getStackTrace();
+    method public long getStartTime();
+    method public androidx.test.orchestrator.listeners.result.TestResult.TestStatus! getStatus();
+    method public void setEndTime(long);
+    method public void setMetrics(java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void setStackTrace(String!);
+    method public androidx.test.orchestrator.listeners.result.TestResult! setStatus(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+  }
+
+  public enum TestResult.TestStatus {
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus INCOMPLETE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus PASSED;
+  }
+
+  public class TestRunResult implements androidx.test.orchestrator.listeners.result.ITestRunListener {
+    ctor public TestRunResult();
+    method public java.util.Set<androidx.test.orchestrator.listeners.result.TestIdentifier!>! getCompletedTests();
+    method public long getElapsedTime();
+    method public String! getName();
+    method public int getNumAllFailedTests();
+    method public int getNumCompleteTests();
+    method public int getNumTests();
+    method public int getNumTestsInState(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+    method public String! getRunFailureMessage();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getRunMetrics();
+    method public java.util.Map<androidx.test.orchestrator.listeners.result.TestIdentifier!,androidx.test.orchestrator.listeners.result.TestResult!>! getTestResults();
+    method public String! getTextSummary();
+    method public boolean hasFailedTests();
+    method public boolean isRunComplete();
+    method public boolean isRunFailure();
+    method public void setAggregateMetrics(boolean);
+    method public void setRunComplete(boolean);
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+}
+
+package androidx.test.runner {
+
+  @Deprecated public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor @Deprecated public AndroidJUnit4(Class<?>!) throws org.junit.runners.model.InitializationError;
+    method @Deprecated public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method @Deprecated public org.junit.runner.Description! getDescription();
+    method @Deprecated public void run(org.junit.runner.notification.RunNotifier!);
+    method @Deprecated public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+  public class AndroidJUnitRunner extends androidx.test.runner.MonitoringInstrumentation {
+    ctor public AndroidJUnitRunner();
+  }
+
+  @Deprecated public class UsageTrackerFacilitator {
+    ctor @Deprecated public UsageTrackerFacilitator(boolean);
+    method @Deprecated public void sendUsages();
+    method @Deprecated public boolean shouldTrackUsage();
+    method @Deprecated public void trackUsage(String!, String!);
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public abstract class SingleActivityFactory<T extends android.app.Activity> implements androidx.test.runner.intercepting.InterceptingActivityFactory {
+    ctor public SingleActivityFactory(Class<T!>!);
+    method public final android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method protected abstract T! create(android.content.Intent!);
+    method public final Class<T!>! getActivityClassToIntercept();
+    method public final boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.screenshot {
+
+  @Deprecated public class BasicScreenCaptureProcessor implements androidx.test.runner.screenshot.ScreenCaptureProcessor {
+    ctor @Deprecated public BasicScreenCaptureProcessor();
+    method @Deprecated protected String! getDefaultFilename();
+    method @Deprecated protected String! getFilename(String!);
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+    field @Deprecated protected String! mDefaultFilenamePrefix;
+    field @Deprecated protected java.io.File! mDefaultScreenshotPath;
+    field @Deprecated protected String! mFileNameDelimiter;
+    field @Deprecated protected String! mTag;
+  }
+
+  @Deprecated public final class ScreenCapture {
+    method @Deprecated public android.graphics.Bitmap! getBitmap();
+    method @Deprecated public android.graphics.Bitmap.CompressFormat! getFormat();
+    method @Deprecated public String! getName();
+    method @Deprecated public void process() throws java.io.IOException;
+    method @Deprecated public void process(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>) throws java.io.IOException;
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setFormat(android.graphics.Bitmap.CompressFormat!);
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setName(String!);
+  }
+
+  @Deprecated public interface ScreenCaptureProcessor {
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+  }
+
+  @Deprecated public final class Screenshot {
+    ctor @Deprecated public Screenshot();
+    method @Deprecated public static void addScreenCaptureProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture() throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.app.Activity) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.view.View) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static void setScreenshotProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+  }
+
+  @Deprecated public static final class Screenshot.ScreenShotException extends java.lang.RuntimeException {
+  }
+
+  @Deprecated public class UiAutomationWrapper {
+    method @Deprecated public android.graphics.Bitmap! takeScreenshot();
+  }
+
+}
+
+package androidx.test.runner.suites {
+
+  @org.junit.runner.RunWith(RunnerSuite.class) public final class AndroidClasspathSuite {
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.6.0_internal.txt b/runner/android_junit_runner/java/androidx/test/api/1.6.0_internal.txt
new file mode 100644
index 000000000..d93b08a62
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.6.0_internal.txt
@@ -0,0 +1,276 @@
+// Signature format: 3.0
+package androidx.test.runner.permission {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PermissionRequester implements androidx.test.internal.platform.content.PermissionGranter {
+    ctor public PermissionRequester();
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+    method @VisibleForTesting protected void setAndroidRuntimeVersion(int);
+  }
+
+  @RequiresApi(28) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class UiAutomationPermissionGranter implements androidx.test.internal.platform.content.PermissionGranter {
+    ctor public UiAutomationPermissionGranter();
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AnnotationInfo implements android.os.Parcelable {
+    ctor public AnnotationInfo(String, java.util.List<androidx.test.services.events.AnnotationValue!>);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.AnnotationInfo!>! CREATOR;
+    field public final String name;
+    field public final java.util.List<androidx.test.services.events.AnnotationValue!> values;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AnnotationValue implements android.os.Parcelable {
+    ctor public AnnotationValue(String, java.util.List<java.lang.String!>, String);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.AnnotationValue!>! CREATOR;
+    field public final String fieldName;
+    field public final java.util.List<java.lang.String!> fieldValues;
+    field public final String valueType;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ErrorInfo implements android.os.Parcelable {
+    ctor public ErrorInfo(android.os.Parcel);
+    ctor public ErrorInfo(String?, String?, String);
+    method public static androidx.test.services.events.ErrorInfo! createFromFailure(org.junit.runner.notification.Failure!);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.ErrorInfo!>! CREATOR;
+    field public final String? errorMessage;
+    field public final String? errorType;
+    field public final String stackTrace;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FailureInfo implements android.os.Parcelable {
+    ctor public FailureInfo(android.os.Parcel);
+    ctor public FailureInfo(String?, String?, String, androidx.test.services.events.TestCaseInfo);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.FailureInfo!>! CREATOR;
+    field public final String? failureMessage;
+    field public final String? failureType;
+    field public final String stackTrace;
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ParcelableConverter {
+    method public static androidx.test.services.events.AnnotationInfo getAnnotation(java.lang.annotation.Annotation);
+    method public static java.util.List<androidx.test.services.events.AnnotationInfo!> getAnnotationsFromArray(java.lang.annotation.Annotation![]);
+    method public static java.util.List<androidx.test.services.events.AnnotationInfo!> getAnnotationsFromCollection(java.util.Collection<java.lang.annotation.Annotation!>);
+    method public static androidx.test.services.events.FailureInfo getFailure(org.junit.runner.notification.Failure) throws androidx.test.services.events.TestEventException;
+    method public static java.util.List<androidx.test.services.events.FailureInfo!> getFailuresFromList(java.util.List<org.junit.runner.notification.Failure!>) throws androidx.test.services.events.TestEventException;
+    method public static androidx.test.services.events.TestCaseInfo getTestCaseFromDescription(org.junit.runner.Description) throws androidx.test.services.events.TestEventException;
+    method public static boolean isValidJUnitDescription(org.junit.runner.Description);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestCaseInfo implements android.os.Parcelable {
+    ctor public TestCaseInfo(android.os.Parcel);
+    ctor public TestCaseInfo(String, String, java.util.List<androidx.test.services.events.AnnotationInfo!>, java.util.List<androidx.test.services.events.AnnotationInfo!>);
+    method public int describeContents();
+    method public String getClassAndMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestCaseInfo!>! CREATOR;
+    field public final java.util.List<androidx.test.services.events.AnnotationInfo!> classAnnotations;
+    field public final String className;
+    field public final java.util.List<androidx.test.services.events.AnnotationInfo!> methodAnnotations;
+    field public final String methodName;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestEventException extends java.lang.Exception {
+    ctor public TestEventException(String);
+    ctor public TestEventException(String, Throwable);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestRunInfo implements android.os.Parcelable {
+    ctor public TestRunInfo(android.os.Parcel);
+    ctor public TestRunInfo(String, java.util.List<androidx.test.services.events.TestCaseInfo!>);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestRunInfo!>! CREATOR;
+    field public final java.util.List<androidx.test.services.events.TestCaseInfo!> testCases;
+    field public final String testRunName;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestStatus implements android.os.Parcelable {
+    ctor public TestStatus(android.os.Parcel);
+    ctor public TestStatus(androidx.test.services.events.TestStatus.Status);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestStatus!>! CREATOR;
+    field public androidx.test.services.events.TestStatus.Status status;
+  }
+
+  public enum TestStatus.Status {
+    enum_constant public static final androidx.test.services.events.TestStatus.Status ABORTED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status CANCELLED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status FAILED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status IGNORED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status PASSED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status SKIPPED;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TimeStamp implements android.os.Parcelable {
+    ctor public TimeStamp(android.os.Parcel);
+    ctor public TimeStamp(Long, Integer);
+    method public int describeContents();
+    method public static androidx.test.services.events.TimeStamp! now();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TimeStamp!>! CREATOR;
+    field public final Integer nanos;
+    field public final Long seconds;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.discovery {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryErrorEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryErrorEvent(androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestDiscoveryEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.discovery.TestDiscoveryEvent!>! CREATOR;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryFinishedEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryFinishedEvent();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryStartedEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryStartedEvent();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFoundEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestFoundEvent(androidx.test.services.events.TestCaseInfo);
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestCaseErrorEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseErrorEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestCaseFinishedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseFinishedEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.TestStatus, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TestStatus testStatus;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestCaseStartedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseStartedEvent(android.os.Parcel!);
+    ctor public TestCaseStartedEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.TimeStamp);
+    method public androidx.test.services.events.platform.TestPlatformEvent.EventType! instanceType();
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestPlatformEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.platform.TestPlatformEvent!>! CREATOR;
+  }
+
+  public enum TestPlatformEvent.EventType {
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_ERROR;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_FINISHED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_STARTED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_ERROR;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_STARTED;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestPlatformEventFactory implements android.os.Parcelable.Creator<androidx.test.services.events.platform.TestPlatformEvent> {
+    ctor public TestPlatformEventFactory();
+    method public androidx.test.services.events.platform.TestPlatformEvent! createFromParcel(android.os.Parcel!);
+    method public androidx.test.services.events.platform.TestPlatformEvent![]! newArray(int);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunErrorEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunErrorEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TestRunInfo testRun;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunFinishedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunFinishedEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.TestStatus, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestStatus! runStatus;
+    field public final androidx.test.services.events.TestRunInfo! testRun;
+    field public final androidx.test.services.events.TimeStamp! timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunStartedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunStartedEvent(android.os.Parcel!);
+    ctor public TestRunStartedEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestRunInfo! testRun;
+    field public final androidx.test.services.events.TimeStamp! timeStamp;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.run {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestAssumptionFailureEvent extends androidx.test.services.events.run.TestFailureEvent {
+    ctor public TestAssumptionFailureEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.FailureInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFailureEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestFailureEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.FailureInfo);
+    field public final androidx.test.services.events.FailureInfo failure;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFinishedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestFinishedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestIgnoredEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestIgnoredEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestRunEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.run.TestRunEvent!>! CREATOR;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestRunEventWithTestCase extends androidx.test.services.events.run.TestRunEvent {
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunFinishedEvent extends androidx.test.services.events.run.TestRunEvent {
+    ctor public TestRunFinishedEvent(int, int, long, java.util.List<androidx.test.services.events.FailureInfo!>);
+    field public final int count;
+    field public final java.util.List<androidx.test.services.events.FailureInfo!> failures;
+    field public final int ignoreCount;
+    field public final long runTime;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunStartedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestRunStartedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestStartedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestStartedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.6.0_public.txt b/runner/android_junit_runner/java/androidx/test/api/1.6.0_public.txt
new file mode 100644
index 000000000..e9d90ab91
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.6.0_public.txt
@@ -0,0 +1,311 @@
+// Signature format: 3.0
+package androidx.test.filters {
+
+  public abstract class AbstractFilter extends org.junit.runner.manipulation.Filter {
+    ctor public AbstractFilter();
+    method protected abstract boolean evaluateTest(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getClassAnnotations(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getMethodAnnotations(org.junit.runner.Description!);
+    method public boolean shouldRun(org.junit.runner.Description!);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface CustomFilter {
+    method public abstract Class<? extends androidx.test.filters.AbstractFilter!> filterClass();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface FlakyTest {
+    method public abstract int bugId() default -1;
+    method public abstract String detail() default "";
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface LargeTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface MediumTest {
+  }
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface RequiresDevice {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface SdkSuppress {
+    method public abstract String codeName() default "unset";
+    method public abstract int[] excludedSdks() default {};
+    method public abstract int maxSdkVersion() default java.lang.Integer.MAX_VALUE;
+    method public abstract int minSdkVersion() default 1;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface SmallTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Suppress {
+  }
+
+}
+
+package androidx.test.orchestrator.callback {
+
+  @javax.annotation.processing.Generated("tmp_aidl_gen_path") public interface OrchestratorCallback extends android.os.IInterface {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public abstract static class OrchestratorCallback.Stub extends com.google.android.aidl.BaseStub implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Stub();
+    method public static androidx.test.orchestrator.callback.OrchestratorCallback! asInterface(android.os.IBinder!);
+  }
+
+  public static class OrchestratorCallback.Stub.Proxy extends com.google.android.aidl.BaseProxy implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.orchestrator.junit {
+
+  public final class BundleJUnitUtils {
+    method public static android.os.Bundle! getBundleFromDescription(org.junit.runner.Description!);
+    method public static android.os.Bundle! getBundleFromFailure(org.junit.runner.notification.Failure!);
+    method public static android.os.Bundle! getBundleFromResult(org.junit.runner.Result!);
+    method public static android.os.Bundle! getBundleFromThrowable(org.junit.runner.Description!, Throwable!);
+    method public static androidx.test.orchestrator.junit.ParcelableDescription! getDescription(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableFailure! getFailure(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableResult! getResult(android.os.Bundle!);
+  }
+
+  public final class ParcelableDescription implements android.os.Parcelable {
+    ctor public ParcelableDescription(String!);
+    ctor public ParcelableDescription(org.junit.runner.Description!);
+    method public int describeContents();
+    method public String! getClassName();
+    method public String! getDisplayName();
+    method public String! getMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableDescription!>! CREATOR;
+  }
+
+  public final class ParcelableFailure implements android.os.Parcelable {
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, String!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, Throwable!);
+    ctor public ParcelableFailure(org.junit.runner.notification.Failure!);
+    method public int describeContents();
+    method public androidx.test.orchestrator.junit.ParcelableDescription! getDescription();
+    method public String! getTrace();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableFailure!>! CREATOR;
+  }
+
+  public final class ParcelableResult implements android.os.Parcelable {
+    ctor public ParcelableResult(java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>!);
+    ctor public ParcelableResult(org.junit.runner.Result!);
+    method public int describeContents();
+    method public int getFailureCount();
+    method public java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>! getFailures();
+    method public boolean wasSuccessful();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableResult!>! CREATOR;
+  }
+
+}
+
+package androidx.test.orchestrator.listeners {
+
+  public final class OrchestrationListenerManager {
+    ctor public OrchestrationListenerManager(android.app.Instrumentation!);
+    method public void addListener(androidx.test.orchestrator.listeners.OrchestrationRunListener!);
+    method public void handleNotification(android.os.Bundle!);
+    method public void orchestrationRunStarted(int);
+    method public void testProcessFinished(String!);
+    method public void testProcessStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    field public static final String KEY_TEST_EVENT = "TestEvent";
+  }
+
+  public enum OrchestrationListenerManager.TestEvent {
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_STARTED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_STARTED;
+  }
+
+  public abstract class OrchestrationRunListener {
+    ctor public OrchestrationRunListener();
+    method public android.app.Instrumentation! getInstrumentation();
+    method public void orchestrationRunStarted(int);
+    method public void setInstrumentation(android.app.Instrumentation!);
+    method public void testAssumptionFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFinished(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testIgnored(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testProcessFinished(String!);
+    method public void testRunFinished(androidx.test.orchestrator.junit.ParcelableResult!);
+    method public void testRunStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+  }
+
+}
+
+package androidx.test.orchestrator.listeners.result {
+
+  public interface ITestRunListener {
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+  public class TestIdentifier {
+    ctor public TestIdentifier(String!, String!);
+    method public String! getClassName();
+    method public String! getTestName();
+  }
+
+  public class TestResult {
+    ctor public TestResult();
+    method public long getEndTime();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getMetrics();
+    method public String! getStackTrace();
+    method public long getStartTime();
+    method public androidx.test.orchestrator.listeners.result.TestResult.TestStatus! getStatus();
+    method public void setEndTime(long);
+    method public void setMetrics(java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void setStackTrace(String!);
+    method public androidx.test.orchestrator.listeners.result.TestResult! setStatus(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+  }
+
+  public enum TestResult.TestStatus {
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus INCOMPLETE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus PASSED;
+  }
+
+  public class TestRunResult implements androidx.test.orchestrator.listeners.result.ITestRunListener {
+    ctor public TestRunResult();
+    method public java.util.Set<androidx.test.orchestrator.listeners.result.TestIdentifier!>! getCompletedTests();
+    method public long getElapsedTime();
+    method public String! getName();
+    method public int getNumAllFailedTests();
+    method public int getNumCompleteTests();
+    method public int getNumTests();
+    method public int getNumTestsInState(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+    method public String! getRunFailureMessage();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getRunMetrics();
+    method public java.util.Map<androidx.test.orchestrator.listeners.result.TestIdentifier!,androidx.test.orchestrator.listeners.result.TestResult!>! getTestResults();
+    method public String! getTextSummary();
+    method public boolean hasFailedTests();
+    method public boolean isRunComplete();
+    method public boolean isRunFailure();
+    method public void setAggregateMetrics(boolean);
+    method public void setRunComplete(boolean);
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+}
+
+package androidx.test.runner {
+
+  @Deprecated public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor @Deprecated public AndroidJUnit4(Class<?>!) throws org.junit.runners.model.InitializationError;
+    method @Deprecated public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method @Deprecated public org.junit.runner.Description! getDescription();
+    method @Deprecated public void run(org.junit.runner.notification.RunNotifier!);
+    method @Deprecated public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+  public class AndroidJUnitRunner extends androidx.test.runner.MonitoringInstrumentation {
+    ctor public AndroidJUnitRunner();
+  }
+
+  @Deprecated public class UsageTrackerFacilitator {
+    ctor @Deprecated public UsageTrackerFacilitator(boolean);
+    method @Deprecated public void sendUsages();
+    method @Deprecated public boolean shouldTrackUsage();
+    method @Deprecated public void trackUsage(String!, String!);
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public abstract class SingleActivityFactory<T extends android.app.Activity> implements androidx.test.runner.intercepting.InterceptingActivityFactory {
+    ctor public SingleActivityFactory(Class<T!>!);
+    method protected abstract T! create(android.content.Intent!);
+    method public final android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method public final Class<T!>! getActivityClassToIntercept();
+    method public final boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.screenshot {
+
+  @Deprecated public class BasicScreenCaptureProcessor implements androidx.test.runner.screenshot.ScreenCaptureProcessor {
+    ctor @Deprecated public BasicScreenCaptureProcessor();
+    method @Deprecated protected String! getDefaultFilename();
+    method @Deprecated protected String! getFilename(String!);
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+    field @Deprecated protected String! mDefaultFilenamePrefix;
+    field @Deprecated protected java.io.File! mDefaultScreenshotPath;
+    field @Deprecated protected String! mFileNameDelimiter;
+    field @Deprecated protected String! mTag;
+  }
+
+  @Deprecated public final class ScreenCapture {
+    method @Deprecated public android.graphics.Bitmap! getBitmap();
+    method @Deprecated public android.graphics.Bitmap.CompressFormat! getFormat();
+    method @Deprecated public String! getName();
+    method @Deprecated public void process() throws java.io.IOException;
+    method @Deprecated public void process(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>) throws java.io.IOException;
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setFormat(android.graphics.Bitmap.CompressFormat!);
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setName(String!);
+  }
+
+  @Deprecated public interface ScreenCaptureProcessor {
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+  }
+
+  @Deprecated public final class Screenshot {
+    ctor @Deprecated public Screenshot();
+    method @Deprecated public static void addScreenCaptureProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture() throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.app.Activity) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.view.View) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static void setScreenshotProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+  }
+
+  @Deprecated public static final class Screenshot.ScreenShotException extends java.lang.RuntimeException {
+  }
+
+  @Deprecated public class UiAutomationWrapper {
+    method @Deprecated public android.graphics.Bitmap! takeScreenshot();
+  }
+
+}
+
+package androidx.test.runner.suites {
+
+  @org.junit.runner.RunWith(RunnerSuite.class) public final class AndroidClasspathSuite {
+  }
+
+  public final class PackagePrefixClasspathSuite extends org.junit.runners.Suite {
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.7.0_internal.txt b/runner/android_junit_runner/java/androidx/test/api/1.7.0_internal.txt
new file mode 100644
index 000000000..51a9b2275
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.7.0_internal.txt
@@ -0,0 +1,276 @@
+// Signature format: 3.0
+package androidx.test.runner.permission {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PermissionRequester implements androidx.test.internal.platform.content.PermissionGranter {
+    ctor public PermissionRequester();
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+    method @VisibleForTesting protected void setAndroidRuntimeVersion(int);
+  }
+
+  @RequiresApi(28) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class UiAutomationPermissionGranter implements androidx.test.internal.platform.content.PermissionGranter {
+    ctor public UiAutomationPermissionGranter();
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AnnotationInfo implements android.os.Parcelable {
+    ctor public AnnotationInfo(String, java.util.List<androidx.test.services.events.AnnotationValue!>);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.AnnotationInfo!>! CREATOR;
+    field public final String name;
+    field public final java.util.List<androidx.test.services.events.AnnotationValue!> values;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AnnotationValue implements android.os.Parcelable {
+    ctor public AnnotationValue(String, java.util.List<java.lang.String!>, String);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.AnnotationValue!>! CREATOR;
+    field public final String fieldName;
+    field public final java.util.List<java.lang.String!> fieldValues;
+    field public final String valueType;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ErrorInfo implements android.os.Parcelable {
+    ctor public ErrorInfo(android.os.Parcel);
+    ctor public ErrorInfo(String?, String?, String);
+    method public static androidx.test.services.events.ErrorInfo! createFromFailure(org.junit.runner.notification.Failure!);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.ErrorInfo!>! CREATOR;
+    field public final String? errorMessage;
+    field public final String? errorType;
+    field public final String stackTrace;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FailureInfo implements android.os.Parcelable {
+    ctor public FailureInfo(android.os.Parcel);
+    ctor public FailureInfo(String?, String?, String, androidx.test.services.events.TestCaseInfo);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.FailureInfo!>! CREATOR;
+    field public final String? failureMessage;
+    field public final String? failureType;
+    field public final String stackTrace;
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ParcelableConverter {
+    method public static androidx.test.services.events.AnnotationInfo getAnnotation(java.lang.annotation.Annotation);
+    method public static java.util.List<androidx.test.services.events.AnnotationInfo!> getAnnotationsFromArray(java.lang.annotation.Annotation![]);
+    method public static java.util.List<androidx.test.services.events.AnnotationInfo!> getAnnotationsFromCollection(java.util.Collection<java.lang.annotation.Annotation!>);
+    method public static androidx.test.services.events.FailureInfo getFailure(org.junit.runner.notification.Failure) throws androidx.test.services.events.TestEventException;
+    method public static java.util.List<androidx.test.services.events.FailureInfo!> getFailuresFromList(java.util.List<org.junit.runner.notification.Failure!>) throws androidx.test.services.events.TestEventException;
+    method public static androidx.test.services.events.TestCaseInfo getTestCaseFromDescription(org.junit.runner.Description) throws androidx.test.services.events.TestEventException;
+    method public static boolean isValidJUnitDescription(org.junit.runner.Description);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestCaseInfo implements android.os.Parcelable {
+    ctor public TestCaseInfo(android.os.Parcel);
+    ctor public TestCaseInfo(String, String, java.util.List<androidx.test.services.events.AnnotationInfo!>, java.util.List<androidx.test.services.events.AnnotationInfo!>);
+    method public int describeContents();
+    method public String getClassAndMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestCaseInfo!>! CREATOR;
+    field public final java.util.List<androidx.test.services.events.AnnotationInfo!> classAnnotations;
+    field public final String className;
+    field public final java.util.List<androidx.test.services.events.AnnotationInfo!> methodAnnotations;
+    field public final String methodName;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestEventException extends java.lang.Exception {
+    ctor public TestEventException(String);
+    ctor public TestEventException(String, Throwable);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestRunInfo implements android.os.Parcelable {
+    ctor public TestRunInfo(android.os.Parcel);
+    ctor public TestRunInfo(String, java.util.List<androidx.test.services.events.TestCaseInfo!>);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestRunInfo!>! CREATOR;
+    field public final java.util.List<androidx.test.services.events.TestCaseInfo!> testCases;
+    field public final String testRunName;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestStatus implements android.os.Parcelable {
+    ctor public TestStatus(android.os.Parcel);
+    ctor public TestStatus(androidx.test.services.events.TestStatus.Status);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestStatus!>! CREATOR;
+    field public androidx.test.services.events.TestStatus.Status status;
+  }
+
+  public enum TestStatus.Status {
+    enum_constant public static final androidx.test.services.events.TestStatus.Status ABORTED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status CANCELLED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status FAILED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status IGNORED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status PASSED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status SKIPPED;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TimeStamp implements android.os.Parcelable {
+    ctor public TimeStamp(android.os.Parcel);
+    ctor public TimeStamp(Long, Integer);
+    method public int describeContents();
+    method public static androidx.test.services.events.TimeStamp! now();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TimeStamp!>! CREATOR;
+    field public final Integer nanos;
+    field public final Long seconds;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.discovery {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryErrorEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryErrorEvent(androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestDiscoveryEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.discovery.TestDiscoveryEvent!>! CREATOR;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryFinishedEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryFinishedEvent();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryStartedEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryStartedEvent();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFoundEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestFoundEvent(androidx.test.services.events.TestCaseInfo);
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestCaseErrorEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseErrorEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestCaseFinishedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseFinishedEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.TestStatus, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TestStatus testStatus;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestCaseStartedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseStartedEvent(android.os.Parcel!);
+    ctor public TestCaseStartedEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.TimeStamp);
+    method public androidx.test.services.events.platform.TestPlatformEvent.EventType! instanceType();
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestPlatformEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.platform.TestPlatformEvent!>! CREATOR;
+  }
+
+  public enum TestPlatformEvent.EventType {
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_ERROR;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_FINISHED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_STARTED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_ERROR;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_STARTED;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestPlatformEventFactory implements android.os.Parcelable.Creator<androidx.test.services.events.platform.TestPlatformEvent!> {
+    ctor public TestPlatformEventFactory();
+    method public androidx.test.services.events.platform.TestPlatformEvent! createFromParcel(android.os.Parcel!);
+    method public androidx.test.services.events.platform.TestPlatformEvent![]! newArray(int);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunErrorEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunErrorEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TestRunInfo testRun;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunFinishedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunFinishedEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.TestStatus, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestStatus! runStatus;
+    field public final androidx.test.services.events.TestRunInfo! testRun;
+    field public final androidx.test.services.events.TimeStamp! timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunStartedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunStartedEvent(android.os.Parcel!);
+    ctor public TestRunStartedEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestRunInfo! testRun;
+    field public final androidx.test.services.events.TimeStamp! timeStamp;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.run {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestAssumptionFailureEvent extends androidx.test.services.events.run.TestFailureEvent {
+    ctor public TestAssumptionFailureEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.FailureInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFailureEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestFailureEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.FailureInfo);
+    field public final androidx.test.services.events.FailureInfo failure;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFinishedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestFinishedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestIgnoredEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestIgnoredEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestRunEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.run.TestRunEvent!>! CREATOR;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestRunEventWithTestCase extends androidx.test.services.events.run.TestRunEvent {
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunFinishedEvent extends androidx.test.services.events.run.TestRunEvent {
+    ctor public TestRunFinishedEvent(int, int, long, java.util.List<androidx.test.services.events.FailureInfo!>);
+    field public final int count;
+    field public final java.util.List<androidx.test.services.events.FailureInfo!> failures;
+    field public final int ignoreCount;
+    field public final long runTime;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunStartedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestRunStartedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestStartedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestStartedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/1.7.0_public.txt b/runner/android_junit_runner/java/androidx/test/api/1.7.0_public.txt
new file mode 100644
index 000000000..c6ab9f844
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/1.7.0_public.txt
@@ -0,0 +1,316 @@
+// Signature format: 3.0
+package androidx.test.filters {
+
+  public abstract class AbstractFilter extends org.junit.runner.manipulation.Filter {
+    ctor public AbstractFilter();
+    method protected abstract boolean evaluateTest(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getClassAnnotations(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getMethodAnnotations(org.junit.runner.Description!);
+    method public boolean shouldRun(org.junit.runner.Description!);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface CustomFilter {
+    method public abstract Class<? extends androidx.test.filters.AbstractFilter!> filterClass();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface FlakyTest {
+    method public abstract int bugId() default -1;
+    method public abstract String detail() default "";
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface LargeTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface MediumTest {
+  }
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface RequiresDevice {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface SdkSuppress {
+    method public abstract String codeName() default "unset";
+    method public abstract int[] excludedSdks() default {};
+    method public abstract int maxSdkVersion() default java.lang.Integer.MAX_VALUE;
+    method public abstract int minSdkVersion() default 1;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface SmallTest {
+  }
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Suppress {
+  }
+
+}
+
+package androidx.test.orchestrator.callback {
+
+  public interface OrchestratorCallback extends android.os.IInterface {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+    field public static final String DESCRIPTOR = "androidx.test.orchestrator.callback.OrchestratorCallback";
+  }
+
+  public static class OrchestratorCallback.Default implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Default();
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public android.os.IBinder! asBinder();
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public abstract static class OrchestratorCallback.Stub extends android.os.Binder implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.orchestrator.callback.OrchestratorCallback! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.orchestrator.junit {
+
+  public final class BundleJUnitUtils {
+    method public static android.os.Bundle! getBundleFromDescription(org.junit.runner.Description!);
+    method public static android.os.Bundle! getBundleFromFailure(org.junit.runner.notification.Failure!);
+    method public static android.os.Bundle! getBundleFromResult(org.junit.runner.Result!);
+    method public static android.os.Bundle! getBundleFromThrowable(org.junit.runner.Description!, Throwable!);
+    method public static androidx.test.orchestrator.junit.ParcelableDescription! getDescription(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableFailure! getFailure(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableResult! getResult(android.os.Bundle!);
+  }
+
+  public final class ParcelableDescription implements android.os.Parcelable {
+    ctor public ParcelableDescription(String!);
+    ctor public ParcelableDescription(org.junit.runner.Description!);
+    method public int describeContents();
+    method public String! getClassName();
+    method public String! getDisplayName();
+    method public String! getMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableDescription!>! CREATOR;
+  }
+
+  public final class ParcelableFailure implements android.os.Parcelable {
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, String!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, Throwable!);
+    ctor public ParcelableFailure(org.junit.runner.notification.Failure!);
+    method public int describeContents();
+    method public androidx.test.orchestrator.junit.ParcelableDescription! getDescription();
+    method public String! getTrace();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableFailure!>! CREATOR;
+  }
+
+  public final class ParcelableResult implements android.os.Parcelable {
+    ctor public ParcelableResult(java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>!);
+    ctor public ParcelableResult(org.junit.runner.Result!);
+    method public int describeContents();
+    method public int getFailureCount();
+    method public java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>! getFailures();
+    method public boolean wasSuccessful();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableResult!>! CREATOR;
+  }
+
+}
+
+package androidx.test.orchestrator.listeners {
+
+  public final class OrchestrationListenerManager {
+    ctor public OrchestrationListenerManager(android.app.Instrumentation!);
+    method public void addListener(androidx.test.orchestrator.listeners.OrchestrationRunListener!);
+    method public void handleNotification(android.os.Bundle!);
+    method public void orchestrationRunStarted(int);
+    method public void testProcessFinished(String!);
+    method public void testProcessStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    field public static final String KEY_TEST_EVENT = "TestEvent";
+  }
+
+  public enum OrchestrationListenerManager.TestEvent {
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_STARTED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_STARTED;
+  }
+
+  public abstract class OrchestrationRunListener {
+    ctor public OrchestrationRunListener();
+    method public android.app.Instrumentation! getInstrumentation();
+    method public void orchestrationRunStarted(int);
+    method public void setInstrumentation(android.app.Instrumentation!);
+    method public void testAssumptionFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFinished(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testIgnored(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testProcessFinished(String!);
+    method public void testRunFinished(androidx.test.orchestrator.junit.ParcelableResult!);
+    method public void testRunStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+  }
+
+}
+
+package androidx.test.orchestrator.listeners.result {
+
+  public interface ITestRunListener {
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+  public class TestIdentifier {
+    ctor public TestIdentifier(String!, String!);
+    method public String! getClassName();
+    method public String! getTestName();
+  }
+
+  public class TestResult {
+    ctor public TestResult();
+    method public long getEndTime();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getMetrics();
+    method public String! getStackTrace();
+    method public long getStartTime();
+    method public androidx.test.orchestrator.listeners.result.TestResult.TestStatus! getStatus();
+    method public void setEndTime(long);
+    method public void setMetrics(java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void setStackTrace(String!);
+    method public androidx.test.orchestrator.listeners.result.TestResult! setStatus(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+  }
+
+  public enum TestResult.TestStatus {
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus INCOMPLETE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus PASSED;
+  }
+
+  public class TestRunResult implements androidx.test.orchestrator.listeners.result.ITestRunListener {
+    ctor public TestRunResult();
+    method public java.util.Set<androidx.test.orchestrator.listeners.result.TestIdentifier!>! getCompletedTests();
+    method public long getElapsedTime();
+    method public String! getName();
+    method public int getNumAllFailedTests();
+    method public int getNumCompleteTests();
+    method public int getNumTests();
+    method public int getNumTestsInState(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+    method public String! getRunFailureMessage();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getRunMetrics();
+    method public java.util.Map<androidx.test.orchestrator.listeners.result.TestIdentifier!,androidx.test.orchestrator.listeners.result.TestResult!>! getTestResults();
+    method public String! getTextSummary();
+    method public boolean hasFailedTests();
+    method public boolean isRunComplete();
+    method public boolean isRunFailure();
+    method public void setAggregateMetrics(boolean);
+    method public void setRunComplete(boolean);
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+}
+
+package androidx.test.runner {
+
+  @Deprecated public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor @Deprecated public AndroidJUnit4(Class<? extends java.lang.Object!>!) throws org.junit.runners.model.InitializationError;
+    method @Deprecated public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method @Deprecated public org.junit.runner.Description! getDescription();
+    method @Deprecated public void run(org.junit.runner.notification.RunNotifier!);
+    method @Deprecated public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+  public class AndroidJUnitRunner extends androidx.test.runner.MonitoringInstrumentation {
+    ctor public AndroidJUnitRunner();
+  }
+
+  @Deprecated public class UsageTrackerFacilitator {
+    ctor @Deprecated public UsageTrackerFacilitator(boolean);
+    method @Deprecated public void sendUsages();
+    method @Deprecated public boolean shouldTrackUsage();
+    method @Deprecated public void trackUsage(String!, String!);
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public abstract class SingleActivityFactory<T extends android.app.Activity> implements androidx.test.runner.intercepting.InterceptingActivityFactory {
+    ctor public SingleActivityFactory(Class<T!>!);
+    method protected abstract T! create(android.content.Intent!);
+    method public final android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method public final Class<T!>! getActivityClassToIntercept();
+    method public final boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.screenshot {
+
+  @Deprecated public class BasicScreenCaptureProcessor implements androidx.test.runner.screenshot.ScreenCaptureProcessor {
+    ctor @Deprecated public BasicScreenCaptureProcessor();
+    method @Deprecated protected String! getDefaultFilename();
+    method @Deprecated protected String! getFilename(String!);
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+    field @Deprecated protected String! mDefaultFilenamePrefix;
+    field @Deprecated protected java.io.File! mDefaultScreenshotPath;
+    field @Deprecated protected String! mFileNameDelimiter;
+    field @Deprecated protected String! mTag;
+  }
+
+  @Deprecated public final class ScreenCapture {
+    method @Deprecated public android.graphics.Bitmap! getBitmap();
+    method @Deprecated public android.graphics.Bitmap.CompressFormat! getFormat();
+    method @Deprecated public String! getName();
+    method @Deprecated public void process() throws java.io.IOException;
+    method @Deprecated public void process(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>) throws java.io.IOException;
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setFormat(android.graphics.Bitmap.CompressFormat!);
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setName(String!);
+  }
+
+  @Deprecated public interface ScreenCaptureProcessor {
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+  }
+
+  @Deprecated public final class Screenshot {
+    ctor @Deprecated public Screenshot();
+    method @Deprecated public static void addScreenCaptureProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture() throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.app.Activity) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.view.View) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static void setScreenshotProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+  }
+
+  @Deprecated public static final class Screenshot.ScreenShotException extends java.lang.RuntimeException {
+  }
+
+  @Deprecated public class UiAutomationWrapper {
+    method @Deprecated public android.graphics.Bitmap! takeScreenshot();
+  }
+
+}
+
+package androidx.test.runner.suites {
+
+  @org.junit.runner.RunWith(RunnerSuite.class) public final class AndroidClasspathSuite {
+  }
+
+  public final class PackagePrefixClasspathSuite extends org.junit.runners.Suite {
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/current_internal.txt b/runner/android_junit_runner/java/androidx/test/api/current_internal.txt
new file mode 100644
index 000000000..c4a700c81
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/current_internal.txt
@@ -0,0 +1,327 @@
+// Signature format: 5.0
+package androidx.test.runner.permission {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PermissionRequester implements androidx.test.internal.platform.content.PermissionGranter {
+    ctor public PermissionRequester();
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+    method @VisibleForTesting protected void setAndroidRuntimeVersion(int);
+  }
+
+  @RequiresApi(28) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class UiAutomationPermissionGranter implements androidx.test.internal.platform.content.PermissionGranter {
+    ctor public UiAutomationPermissionGranter();
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AnnotationInfo implements android.os.Parcelable {
+    ctor public AnnotationInfo(String, java.util.List<androidx.test.services.events.AnnotationValue!>);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.AnnotationInfo!>! CREATOR;
+    field public final String name;
+    field public final java.util.List<androidx.test.services.events.AnnotationValue!> values;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AnnotationValue implements android.os.Parcelable {
+    ctor public AnnotationValue(String, java.util.List<java.lang.String!>, String);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.AnnotationValue!>! CREATOR;
+    field public final String fieldName;
+    field public final java.util.List<java.lang.String!> fieldValues;
+    field public final String valueType;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ErrorInfo implements android.os.Parcelable {
+    ctor public ErrorInfo(android.os.Parcel);
+    ctor public ErrorInfo(String?, String?, String);
+    method public static androidx.test.services.events.ErrorInfo! createFromFailure(org.junit.runner.notification.Failure!);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.ErrorInfo!>! CREATOR;
+    field public final String? errorMessage;
+    field public final String? errorType;
+    field public final String stackTrace;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FailureInfo implements android.os.Parcelable {
+    ctor public FailureInfo(android.os.Parcel);
+    ctor public FailureInfo(String?, String?, String, androidx.test.services.events.TestCaseInfo);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.FailureInfo!>! CREATOR;
+    field public final String? failureMessage;
+    field public final String? failureType;
+    field public final String stackTrace;
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ParcelableConverter {
+    method public static androidx.test.services.events.AnnotationInfo getAnnotation(java.lang.annotation.Annotation);
+    method public static java.util.List<androidx.test.services.events.AnnotationInfo!> getAnnotationsFromArray(java.lang.annotation.Annotation![]);
+    method public static java.util.List<androidx.test.services.events.AnnotationInfo!> getAnnotationsFromCollection(java.util.Collection<java.lang.annotation.Annotation!>);
+    method public static androidx.test.services.events.FailureInfo getFailure(org.junit.runner.notification.Failure) throws androidx.test.services.events.TestEventException;
+    method public static java.util.List<androidx.test.services.events.FailureInfo!> getFailuresFromList(java.util.List<org.junit.runner.notification.Failure!>) throws androidx.test.services.events.TestEventException;
+    method public static androidx.test.services.events.TestCaseInfo getTestCaseFromDescription(org.junit.runner.Description) throws androidx.test.services.events.TestEventException;
+    method public static boolean isValidJUnitDescription(org.junit.runner.Description);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestCaseInfo implements android.os.Parcelable {
+    ctor public TestCaseInfo(android.os.Parcel);
+    ctor public TestCaseInfo(String, String, java.util.List<androidx.test.services.events.AnnotationInfo!>, java.util.List<androidx.test.services.events.AnnotationInfo!>);
+    method public int describeContents();
+    method public String getClassAndMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestCaseInfo!>! CREATOR;
+    field public final java.util.List<androidx.test.services.events.AnnotationInfo!> classAnnotations;
+    field public final String className;
+    field public final java.util.List<androidx.test.services.events.AnnotationInfo!> methodAnnotations;
+    field public final String methodName;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestEventException extends java.lang.Exception {
+    ctor public TestEventException(String);
+    ctor public TestEventException(String, Throwable);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestRunInfo implements android.os.Parcelable {
+    ctor public TestRunInfo(android.os.Parcel);
+    ctor public TestRunInfo(String, java.util.List<androidx.test.services.events.TestCaseInfo!>);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestRunInfo!>! CREATOR;
+    field public final java.util.List<androidx.test.services.events.TestCaseInfo!> testCases;
+    field public final String testRunName;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestStatus implements android.os.Parcelable {
+    ctor public TestStatus(android.os.Parcel);
+    ctor public TestStatus(androidx.test.services.events.TestStatus.Status);
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TestStatus!>! CREATOR;
+    field public androidx.test.services.events.TestStatus.Status status;
+  }
+
+  public enum TestStatus.Status {
+    enum_constant public static final androidx.test.services.events.TestStatus.Status ABORTED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status CANCELLED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status FAILED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status IGNORED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status PASSED;
+    enum_constant public static final androidx.test.services.events.TestStatus.Status SKIPPED;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TimeStamp implements android.os.Parcelable {
+    ctor public TimeStamp(android.os.Parcel);
+    ctor public TimeStamp(Long, Integer);
+    method public int describeContents();
+    method public static androidx.test.services.events.TimeStamp! now();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.TimeStamp!>! CREATOR;
+    field public final Integer nanos;
+    field public final Long seconds;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.discovery {
+
+  public interface ITestDiscoveryEvent extends android.os.IInterface {
+    method public void send(androidx.test.services.events.discovery.TestDiscoveryEvent!) throws android.os.RemoteException;
+  }
+
+  public static class ITestDiscoveryEvent.Default implements androidx.test.services.events.discovery.ITestDiscoveryEvent {
+    ctor public ITestDiscoveryEvent.Default();
+    method public android.os.IBinder! asBinder();
+    method public void send(androidx.test.services.events.discovery.TestDiscoveryEvent!) throws android.os.RemoteException;
+  }
+
+  public abstract static class ITestDiscoveryEvent.Stub extends android.os.Binder implements androidx.test.services.events.discovery.ITestDiscoveryEvent {
+    ctor public ITestDiscoveryEvent.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.services.events.discovery.ITestDiscoveryEvent! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryErrorEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryErrorEvent(androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestDiscoveryEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.discovery.TestDiscoveryEvent!>! CREATOR;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryFinishedEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryFinishedEvent();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestDiscoveryStartedEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestDiscoveryStartedEvent();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFoundEvent extends androidx.test.services.events.discovery.TestDiscoveryEvent {
+    ctor public TestFoundEvent(androidx.test.services.events.TestCaseInfo);
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.platform {
+
+  public interface ITestPlatformEvent extends android.os.IInterface {
+    method public void send(androidx.test.services.events.platform.TestPlatformEvent!) throws android.os.RemoteException;
+  }
+
+  public static class ITestPlatformEvent.Default implements androidx.test.services.events.platform.ITestPlatformEvent {
+    ctor public ITestPlatformEvent.Default();
+    method public android.os.IBinder! asBinder();
+    method public void send(androidx.test.services.events.platform.TestPlatformEvent!) throws android.os.RemoteException;
+  }
+
+  public abstract static class ITestPlatformEvent.Stub extends android.os.Binder implements androidx.test.services.events.platform.ITestPlatformEvent {
+    ctor public ITestPlatformEvent.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.services.events.platform.ITestPlatformEvent! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestCaseErrorEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseErrorEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestCaseFinishedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseFinishedEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.TestStatus, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TestStatus testStatus;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestCaseStartedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestCaseStartedEvent(android.os.Parcel!);
+    ctor public TestCaseStartedEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.TimeStamp);
+    method public androidx.test.services.events.platform.TestPlatformEvent.EventType! instanceType();
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestPlatformEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.platform.TestPlatformEvent!>! CREATOR;
+  }
+
+  public enum TestPlatformEvent.EventType {
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_ERROR;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_FINISHED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_CASE_STARTED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_ERROR;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.services.events.platform.TestPlatformEvent.EventType TEST_RUN_STARTED;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class TestPlatformEventFactory implements android.os.Parcelable.Creator<androidx.test.services.events.platform.TestPlatformEvent!> {
+    ctor public TestPlatformEventFactory();
+    method public androidx.test.services.events.platform.TestPlatformEvent! createFromParcel(android.os.Parcel!);
+    method public androidx.test.services.events.platform.TestPlatformEvent![]! newArray(int);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunErrorEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunErrorEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.ErrorInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.ErrorInfo error;
+    field public final androidx.test.services.events.TestRunInfo testRun;
+    field public final androidx.test.services.events.TimeStamp timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunFinishedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunFinishedEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.TestStatus, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestStatus! runStatus;
+    field public final androidx.test.services.events.TestRunInfo! testRun;
+    field public final androidx.test.services.events.TimeStamp! timeStamp;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunStartedEvent extends androidx.test.services.events.platform.TestPlatformEvent {
+    ctor public TestRunStartedEvent(android.os.Parcel!);
+    ctor public TestRunStartedEvent(androidx.test.services.events.TestRunInfo, androidx.test.services.events.TimeStamp);
+    field public final androidx.test.services.events.TestRunInfo! testRun;
+    field public final androidx.test.services.events.TimeStamp! timeStamp;
+  }
+
+}
+
+package @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RestrictTo({androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP}) androidx.test.services.events.run {
+
+  public interface ITestRunEvent extends android.os.IInterface {
+    method public void send(androidx.test.services.events.run.TestRunEvent!) throws android.os.RemoteException;
+  }
+
+  public static class ITestRunEvent.Default implements androidx.test.services.events.run.ITestRunEvent {
+    ctor public ITestRunEvent.Default();
+    method public android.os.IBinder! asBinder();
+    method public void send(androidx.test.services.events.run.TestRunEvent!) throws android.os.RemoteException;
+  }
+
+  public abstract static class ITestRunEvent.Stub extends android.os.Binder implements androidx.test.services.events.run.ITestRunEvent {
+    ctor public ITestRunEvent.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.services.events.run.ITestRunEvent! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestAssumptionFailureEvent extends androidx.test.services.events.run.TestFailureEvent {
+    ctor public TestAssumptionFailureEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.FailureInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFailureEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestFailureEvent(androidx.test.services.events.TestCaseInfo, androidx.test.services.events.FailureInfo);
+    field public final androidx.test.services.events.FailureInfo failure;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestFinishedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestFinishedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestIgnoredEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestIgnoredEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestRunEvent implements android.os.Parcelable {
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.services.events.run.TestRunEvent!>! CREATOR;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public abstract class TestRunEventWithTestCase extends androidx.test.services.events.run.TestRunEvent {
+    field public final androidx.test.services.events.TestCaseInfo testCase;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunFinishedEvent extends androidx.test.services.events.run.TestRunEvent {
+    ctor public TestRunFinishedEvent(int, int, long, java.util.List<androidx.test.services.events.FailureInfo!>);
+    field public final int count;
+    field public final java.util.List<androidx.test.services.events.FailureInfo!> failures;
+    field public final int ignoreCount;
+    field public final long runTime;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestRunStartedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestRunStartedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestStartedEvent extends androidx.test.services.events.run.TestRunEventWithTestCase {
+    ctor public TestStartedEvent(androidx.test.services.events.TestCaseInfo);
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/api/current_public.txt b/runner/android_junit_runner/java/androidx/test/api/current_public.txt
new file mode 100644
index 000000000..da65c6d9c
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/api/current_public.txt
@@ -0,0 +1,315 @@
+// Signature format: 5.0
+package androidx.test.filters {
+
+  public abstract class AbstractFilter extends org.junit.runner.manipulation.Filter {
+    ctor public AbstractFilter();
+    method protected abstract boolean evaluateTest(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getClassAnnotations(org.junit.runner.Description!);
+    method protected java.util.List<java.lang.annotation.Annotation!>! getMethodAnnotations(org.junit.runner.Description!);
+    method public boolean shouldRun(org.junit.runner.Description!);
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE}) public @interface CustomFilter {
+    method public abstract Class<? extends androidx.test.filters.AbstractFilter!> filterClass();
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface FlakyTest {
+    method public abstract int bugId() default -1;
+    method public abstract String detail() default "";
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface LargeTest {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface MediumTest {
+  }
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface RequiresDevice {
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) public @interface SdkSuppress {
+    method public abstract String codeName() default "unset";
+    method public abstract int[] excludedSdks() default {};
+    method public abstract int maxSdkVersion() default java.lang.Integer.MAX_VALUE;
+    method public abstract int minSdkVersion() default 1;
+  }
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface SmallTest {
+  }
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Suppress {
+  }
+
+}
+
+package androidx.test.orchestrator.callback {
+
+  public interface OrchestratorCallback extends android.os.IInterface {
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public static class OrchestratorCallback.Default implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Default();
+    method public void addTest(String!) throws android.os.RemoteException;
+    method public android.os.IBinder! asBinder();
+    method public void sendTestNotification(android.os.Bundle!) throws android.os.RemoteException;
+  }
+
+  public abstract static class OrchestratorCallback.Stub extends android.os.Binder implements androidx.test.orchestrator.callback.OrchestratorCallback {
+    ctor public OrchestratorCallback.Stub();
+    method public android.os.IBinder! asBinder();
+    method public static androidx.test.orchestrator.callback.OrchestratorCallback! asInterface(android.os.IBinder!);
+    method public boolean onTransact(int, android.os.Parcel!, android.os.Parcel!, int) throws android.os.RemoteException;
+  }
+
+}
+
+package androidx.test.orchestrator.junit {
+
+  public final class BundleJUnitUtils {
+    method public static android.os.Bundle! getBundleFromDescription(org.junit.runner.Description!);
+    method public static android.os.Bundle! getBundleFromFailure(org.junit.runner.notification.Failure!);
+    method public static android.os.Bundle! getBundleFromResult(org.junit.runner.Result!);
+    method public static android.os.Bundle! getBundleFromThrowable(org.junit.runner.Description!, Throwable!);
+    method public static androidx.test.orchestrator.junit.ParcelableDescription! getDescription(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableFailure! getFailure(android.os.Bundle!);
+    method public static androidx.test.orchestrator.junit.ParcelableResult! getResult(android.os.Bundle!);
+  }
+
+  public final class ParcelableDescription implements android.os.Parcelable {
+    ctor public ParcelableDescription(String!);
+    ctor public ParcelableDescription(org.junit.runner.Description!);
+    method public int describeContents();
+    method public String! getClassName();
+    method public String! getDisplayName();
+    method public String! getMethodName();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableDescription!>! CREATOR;
+  }
+
+  public final class ParcelableFailure implements android.os.Parcelable {
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, String!);
+    ctor public ParcelableFailure(androidx.test.orchestrator.junit.ParcelableDescription!, Throwable!);
+    ctor public ParcelableFailure(org.junit.runner.notification.Failure!);
+    method public int describeContents();
+    method public androidx.test.orchestrator.junit.ParcelableDescription! getDescription();
+    method public String! getTrace();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableFailure!>! CREATOR;
+  }
+
+  public final class ParcelableResult implements android.os.Parcelable {
+    ctor public ParcelableResult(java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>!);
+    ctor public ParcelableResult(org.junit.runner.Result!);
+    method public int describeContents();
+    method public int getFailureCount();
+    method public java.util.List<androidx.test.orchestrator.junit.ParcelableFailure!>! getFailures();
+    method public boolean wasSuccessful();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.orchestrator.junit.ParcelableResult!>! CREATOR;
+  }
+
+}
+
+package androidx.test.orchestrator.listeners {
+
+  public final class OrchestrationListenerManager {
+    ctor public OrchestrationListenerManager(android.app.Instrumentation!);
+    method public void addListener(androidx.test.orchestrator.listeners.OrchestrationRunListener!);
+    method public void handleNotification(android.os.Bundle!);
+    method public void orchestrationRunStarted(int);
+    method public void testProcessFinished(String!);
+    method public void testProcessStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    field public static final String KEY_TEST_EVENT = "TestEvent";
+  }
+
+  public enum OrchestrationListenerManager.TestEvent {
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_FINISHED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_RUN_STARTED;
+    enum_constant public static final androidx.test.orchestrator.listeners.OrchestrationListenerManager.TestEvent TEST_STARTED;
+  }
+
+  public abstract class OrchestrationRunListener {
+    ctor public OrchestrationRunListener();
+    method public android.app.Instrumentation! getInstrumentation();
+    method public void orchestrationRunStarted(int);
+    method public void setInstrumentation(android.app.Instrumentation!);
+    method public void testAssumptionFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFailure(androidx.test.orchestrator.junit.ParcelableFailure!);
+    method public void testFinished(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testIgnored(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testProcessFinished(String!);
+    method public void testRunFinished(androidx.test.orchestrator.junit.ParcelableResult!);
+    method public void testRunStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+    method public void testStarted(androidx.test.orchestrator.junit.ParcelableDescription!);
+  }
+
+}
+
+package androidx.test.orchestrator.listeners.result {
+
+  public interface ITestRunListener {
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+  public class TestIdentifier {
+    ctor public TestIdentifier(String!, String!);
+    method public String! getClassName();
+    method public String! getTestName();
+  }
+
+  public class TestResult {
+    ctor public TestResult();
+    method public long getEndTime();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getMetrics();
+    method public String! getStackTrace();
+    method public long getStartTime();
+    method public androidx.test.orchestrator.listeners.result.TestResult.TestStatus! getStatus();
+    method public void setEndTime(long);
+    method public void setMetrics(java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void setStackTrace(String!);
+    method public androidx.test.orchestrator.listeners.result.TestResult! setStatus(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+  }
+
+  public enum TestResult.TestStatus {
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus ASSUMPTION_FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus FAILURE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus IGNORED;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus INCOMPLETE;
+    enum_constant public static final androidx.test.orchestrator.listeners.result.TestResult.TestStatus PASSED;
+  }
+
+  public class TestRunResult implements androidx.test.orchestrator.listeners.result.ITestRunListener {
+    ctor public TestRunResult();
+    method public java.util.Set<androidx.test.orchestrator.listeners.result.TestIdentifier!>! getCompletedTests();
+    method public long getElapsedTime();
+    method public String! getName();
+    method public int getNumAllFailedTests();
+    method public int getNumCompleteTests();
+    method public int getNumTests();
+    method public int getNumTestsInState(androidx.test.orchestrator.listeners.result.TestResult.TestStatus!);
+    method public String! getRunFailureMessage();
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getRunMetrics();
+    method public java.util.Map<androidx.test.orchestrator.listeners.result.TestIdentifier!,androidx.test.orchestrator.listeners.result.TestResult!>! getTestResults();
+    method public String! getTextSummary();
+    method public boolean hasFailedTests();
+    method public boolean isRunComplete();
+    method public boolean isRunFailure();
+    method public void setAggregateMetrics(boolean);
+    method public void setRunComplete(boolean);
+    method public void testAssumptionFailure(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testEnded(androidx.test.orchestrator.listeners.result.TestIdentifier!, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testFailed(androidx.test.orchestrator.listeners.result.TestIdentifier!, String!);
+    method public void testIgnored(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+    method public void testRunEnded(long, java.util.Map<java.lang.String!,java.lang.String!>!);
+    method public void testRunFailed(String!);
+    method public void testRunStarted(String!, int);
+    method public void testRunStopped(long);
+    method public void testStarted(androidx.test.orchestrator.listeners.result.TestIdentifier!);
+  }
+
+}
+
+package androidx.test.runner {
+
+  @Deprecated public final class AndroidJUnit4 extends org.junit.runner.Runner implements org.junit.runner.manipulation.Filterable org.junit.runner.manipulation.Sortable {
+    ctor @Deprecated public AndroidJUnit4(Class<? extends java.lang.Object!>!) throws org.junit.runners.model.InitializationError;
+    method @Deprecated public void filter(org.junit.runner.manipulation.Filter!) throws org.junit.runner.manipulation.NoTestsRemainException;
+    method @Deprecated public org.junit.runner.Description! getDescription();
+    method @Deprecated public void run(org.junit.runner.notification.RunNotifier!);
+    method @Deprecated public void sort(org.junit.runner.manipulation.Sorter!);
+  }
+
+  public class AndroidJUnitRunner extends androidx.test.runner.MonitoringInstrumentation {
+    ctor public AndroidJUnitRunner();
+  }
+
+  @Deprecated public class UsageTrackerFacilitator {
+    ctor @Deprecated public UsageTrackerFacilitator(boolean);
+    method @Deprecated public void sendUsages();
+    method @Deprecated public boolean shouldTrackUsage();
+    method @Deprecated public void trackUsage(String!, String!);
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public abstract class SingleActivityFactory<T extends android.app.Activity> implements androidx.test.runner.intercepting.InterceptingActivityFactory {
+    ctor public SingleActivityFactory(Class<T>!);
+    method protected abstract T create(android.content.Intent!);
+    method public final android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method public final Class<T>! getActivityClassToIntercept();
+    method public final boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.screenshot {
+
+  @Deprecated public class BasicScreenCaptureProcessor implements androidx.test.runner.screenshot.ScreenCaptureProcessor {
+    ctor @Deprecated public BasicScreenCaptureProcessor();
+    method @Deprecated protected String! getDefaultFilename();
+    method @Deprecated protected String! getFilename(String!);
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+    field @Deprecated protected String! mDefaultFilenamePrefix;
+    field @Deprecated protected java.io.File! mDefaultScreenshotPath;
+    field @Deprecated protected String! mFileNameDelimiter;
+    field @Deprecated protected String! mTag;
+  }
+
+  @Deprecated public final class ScreenCapture {
+    method @Deprecated public android.graphics.Bitmap! getBitmap();
+    method @Deprecated public android.graphics.Bitmap.CompressFormat! getFormat();
+    method @Deprecated public String! getName();
+    method @Deprecated public void process() throws java.io.IOException;
+    method @Deprecated public void process(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>) throws java.io.IOException;
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setFormat(android.graphics.Bitmap.CompressFormat!);
+    method @Deprecated public androidx.test.runner.screenshot.ScreenCapture! setName(String!);
+  }
+
+  @Deprecated public interface ScreenCaptureProcessor {
+    method @Deprecated public String! process(androidx.test.runner.screenshot.ScreenCapture!) throws java.io.IOException;
+  }
+
+  @Deprecated public final class Screenshot {
+    ctor @Deprecated public Screenshot();
+    method @Deprecated public static void addScreenCaptureProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture() throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.app.Activity) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static androidx.test.runner.screenshot.ScreenCapture! capture(android.view.View) throws androidx.test.runner.screenshot.Screenshot.ScreenShotException;
+    method @Deprecated public static void setScreenshotProcessors(java.util.Set<androidx.test.runner.screenshot.ScreenCaptureProcessor!>!);
+  }
+
+  @Deprecated public static final class Screenshot.ScreenShotException extends java.lang.RuntimeException {
+  }
+
+  @Deprecated public class UiAutomationWrapper {
+    method @Deprecated public android.graphics.Bitmap! takeScreenshot();
+  }
+
+}
+
+package androidx.test.runner.suites {
+
+  @org.junit.runner.RunWith(RunnerSuite.class) public final class AndroidClasspathSuite {
+  }
+
+  public final class PackagePrefixClasspathSuite extends org.junit.runners.Suite {
+  }
+
+}
+
diff --git a/runner/android_junit_runner/java/androidx/test/filters/AbstractFilter.java b/runner/android_junit_runner/java/androidx/test/filters/AbstractFilter.java
new file mode 100644
index 000000000..97d979d35
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/filters/AbstractFilter.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.filters;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
+
+/** Helper parent class for {@link Filter} that allows suites to run if any child matches. */
+public abstract class AbstractFilter extends Filter {
+  /** {@inheritDoc} */
+  @Override
+  public boolean shouldRun(Description description) {
+    if (description.isTest()) {
+      return evaluateTest(description);
+    }
+    // this is a suite, explicitly check if any children should run
+    for (Description each : description.getChildren()) {
+      if (shouldRun(each)) {
+        return true;
+      }
+    }
+    // no children to run, filter this out
+    return false;
+  }
+
+  /**
+   * Determine if given test description matches filter.
+   *
+   * @param description the {@link Description} describing the test
+   * @return <code>true</code> if matched
+   */
+  protected abstract boolean evaluateTest(Description description);
+
+  /**
+   * Get a list of method annotations that are annotated with @CustomFilter with this class as the
+   * filter class.
+   *
+   * @param description the {@link Description} describing the test
+   * @return a list of annotations on methods that are handled by this filter
+   */
+  protected List<Annotation> getMethodAnnotations(Description description) {
+    ArrayList<Annotation> testAnnotations = new ArrayList<>();
+    for (Annotation annotation : description.getAnnotations()) {
+      CustomFilter customFilterAnnotation =
+          annotation.annotationType().getAnnotation(CustomFilter.class);
+      if (customFilterAnnotation != null && customFilterAnnotation.filterClass().isInstance(this)) {
+        testAnnotations.add(annotation);
+      }
+    }
+    return testAnnotations;
+  }
+
+  /**
+   * Get a list of class annotations that are annotated with @CustomFilter with this class as the
+   * filter class.
+   *
+   * @param description the {@link Description} describing the test
+   * @return a list of annotations on the test class that are handled by this filter
+   */
+  protected List<Annotation> getClassAnnotations(Description description) {
+    ArrayList<Annotation> testAnnotations = new ArrayList<>();
+    for (Annotation c : description.getTestClass().getAnnotations()) {
+      CustomFilter customFilterAnnotation = c.annotationType().getAnnotation(CustomFilter.class);
+      if (customFilterAnnotation != null && customFilterAnnotation.filterClass().isInstance(this)) {
+        testAnnotations.add(c);
+      }
+    }
+    return testAnnotations;
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/filters/CustomFilter.java b/runner/android_junit_runner/java/androidx/test/filters/CustomFilter.java
new file mode 100644
index 000000000..5e1d82c3c
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/filters/CustomFilter.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.filters;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Custom test filters for Android tests.
+ *
+ * <p>To add a custom filter to your android test, create an annotation and use @CustomFilter to
+ * specify a filter implementation class, which must extend {@link AbstractFilter} and handle the
+ * test annotation that @CustomFilter is being added to. For example:
+ *
+ * <pre>{@code
+ * @CustomFilter(MyCustomFilterClass::class)
+ * public @interface MyCustomFilterAnnotation {}
+ * }</pre>
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.ANNOTATION_TYPE})
+public @interface CustomFilter {
+  Class<? extends AbstractFilter> filterClass();
+}
diff --git a/runner/android_junit_runner/java/androidx/test/filters/LargeTest.java b/runner/android_junit_runner/java/androidx/test/filters/LargeTest.java
index 578d7dc73..49cf54dfc 100644
--- a/runner/android_junit_runner/java/androidx/test/filters/LargeTest.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/LargeTest.java
@@ -22,22 +22,22 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation to assign a large test size qualifier to a test. This annotation can be used at a
+ * Annotation to assign a large test size qualifier to a test. This annotation can be used at the
  * method or class level.
  *
  * <p>Test size qualifiers are a great way to structure test code and are used to assign a test to a
- * test suite of similar run time.
+ * suite of tests that have similar run times.
  *
  * <p>Execution time: &gt;1000ms
  *
  * <p>Large tests should be focused on testing integration of all application components. These
  * tests fully participate in the system and may make use of all resources such as databases, file
- * systems and network. As a rule of thumb most functional UI tests are large tests.
+ * systems, and networks. As a rule of thumb, most functional UI tests are large tests.
  *
- * <p>Note: This class replaces the deprecated Android platform size qualifier <a
+ * <p><b>Note:</b> This class replaces the deprecated Android platform size qualifier <a
  * href="{@docRoot}reference/android/test/suitebuilder/annotation/LargeTest.html"><code>
  * android.test.suitebuilder.annotation.LargeTest</code></a> and is the recommended way to annotate
- * tests written with the AndroidX Test Library.
+ * tests written with the AndroidX Test libraries.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
diff --git a/runner/android_junit_runner/java/androidx/test/filters/MediumTest.java b/runner/android_junit_runner/java/androidx/test/filters/MediumTest.java
index dfdaa53ee..1c0af7964 100644
--- a/runner/android_junit_runner/java/androidx/test/filters/MediumTest.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/MediumTest.java
@@ -22,23 +22,24 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation to assign a medium test size qualifier to a test. This annotation can be used at a
+ * Annotation to assign a medium test size qualifier to a test. This annotation can be used at the
  * method or class level.
  *
  * <p>Test size qualifiers are a great way to structure test code and are used to assign a test to a
- * test suite of similar run time.
+ * suite of tests that have similar run times.
  *
  * <p>Execution time: &lt;1000ms
  *
  * <p>Medium tests should be focused on a very limited subset of components or a single component.
- * Resource access to the file system through well defined interfaces like databases,
- * ContentProviders, or Context is permitted. Network access should be restricted, (long-running)
- * blocking operations should be avoided and use mock objects instead.
+ * Resource access to the file system through well-defined interfaces like databases, {@link
+ * android.content.ContentProvider}, or {@link android.content.Context} is permitted. Network access
+ * should be restricted. Long-running or blocking operations should be avoided. Use fake objects
+ * instead.
  *
- * <p>Note: This class replaces the deprecated Android platform size qualifier <a
+ * <p><b>Note:</b> This class replaces the deprecated Android platform size qualifier <a
  * href="{@docRoot}reference/android/test/suitebuilder/annotation/MediumTest.html"><code>
  * android.test.suitebuilder.annotation.MediumTest</code></a> and is the recommended way to annotate
- * tests written with the AndroidX Test Library.
+ * tests written with the AndroidX Test libraries.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
diff --git a/runner/android_junit_runner/java/androidx/test/filters/RequiresDevice.java b/runner/android_junit_runner/java/androidx/test/filters/RequiresDevice.java
index 3d3ee3318..86a2fb8ba 100644
--- a/runner/android_junit_runner/java/androidx/test/filters/RequiresDevice.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/RequiresDevice.java
@@ -23,8 +23,13 @@
 /**
  * Indicates that a specific test should not be run on emulator.
  *
- * <p>It will be executed only if the test is running on the physical android device.
+ * <p>The test will be skipped if its executed on one of the recognized Android emulator types
+ * (currently ones with Build.HARDWARE equal to 'goldfish', 'ranchu' and 'gce_x86')
+ *
+ * @deprecated This annotation should provide limited benefit. Use a more specific filtering
+ *     mechanism to tie tests to a specific environment if needed.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
+@Deprecated
 public @interface RequiresDevice {}
diff --git a/runner/android_junit_runner/java/androidx/test/filters/SdkSuppress.java b/runner/android_junit_runner/java/androidx/test/filters/SdkSuppress.java
index dd65ddb38..2fb7054d6 100644
--- a/runner/android_junit_runner/java/androidx/test/filters/SdkSuppress.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/SdkSuppress.java
@@ -21,10 +21,18 @@
 import java.lang.annotation.Target;
 
 /**
- * Indicates that a specific test or class requires a minimum or maximum API Level to execute.
+ * Indicates that a specific test or class should not be run on certain API levels.
  *
- * <p>Test(s) will be skipped when executed on android platforms less/more than specified level
- * (inclusive).
+ * <p>Test(s) will be skipped when executed on Android platforms with SDK API level:
+ *
+ * <ul>
+ *   <li>less than specified minSdkVersion OR
+ *   <li>greater than specified maxSdkVersion OR
+ *   <li>in the excludedSdks list.
+ * </ul>
+ *
+ * <p>If {@code @SdkSuppress} is applied at both the class and test method, the test method
+ * annotation takes precedence, and the class level {@code @SdkSuppress} is ignored.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD})
@@ -33,6 +41,10 @@
   int minSdkVersion() default 1;
   /** The maximum API level to execute (inclusive) */
   int maxSdkVersion() default Integer.MAX_VALUE;
+
+  /** The (additional) list of SDK versions to exclude */
+  int[] excludedSdks() default {};
+
   /**
    * The {@link android.os.Build.VERSION.CODENAME} to execute on. This is intended to be used to run
    * on a pre-release SDK, where the {@link android.os.Build.VERSION.SDK_INT} has not yet been
diff --git a/runner/android_junit_runner/java/androidx/test/filters/SdkSuppressFilter.java b/runner/android_junit_runner/java/androidx/test/filters/SdkSuppressFilter.java
new file mode 100644
index 000000000..0a1359c1d
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/filters/SdkSuppressFilter.java
@@ -0,0 +1,60 @@
+package androidx.test.filters;
+
+import android.os.Build.VERSION;
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.util.Objects;
+import org.junit.runner.Description;
+
+/**
+ * A JUnit {@link Filter} that implements SdkSuppress annotation based filtering.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public final class SdkSuppressFilter extends AbstractFilter {
+
+  @Override
+  protected boolean evaluateTest(Description description) {
+    final SdkSuppress sdkSuppress = getAnnotationForTest(description);
+    if (sdkSuppress != null) {
+      if ((VERSION.SDK_INT >= sdkSuppress.minSdkVersion()
+              && VERSION.SDK_INT <= sdkSuppress.maxSdkVersion()
+              && !isInExcludedSdks(sdkSuppress.excludedSdks()))
+          || Objects.equals(sdkSuppress.codeName(), VERSION.CODENAME)) {
+        return true; // run the test
+      }
+      return false; // don't run the test
+    }
+    return true; // no SdkSuppress, run the test
+  }
+
+  @Nullable
+  private SdkSuppress getAnnotationForTest(Description description) {
+    final SdkSuppress s = description.getAnnotation(SdkSuppress.class);
+    if (s != null) {
+      return s;
+    }
+    final Class<?> testClass = description.getTestClass();
+    if (testClass != null) {
+      return testClass.getAnnotation(SdkSuppress.class);
+    }
+    return null;
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public String describe() {
+    return "skip tests annotated with SdkSuppress if necessary";
+  }
+
+  private boolean isInExcludedSdks(int[] excludedSdks) {
+    for (int sdk : excludedSdks) {
+      if (sdk == VERSION.SDK_INT) {
+        return true;
+      }
+    }
+    return false;
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/filters/ShardingFilter.java b/runner/android_junit_runner/java/androidx/test/filters/ShardingFilter.java
new file mode 100644
index 000000000..a40534945
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/filters/ShardingFilter.java
@@ -0,0 +1,40 @@
+package androidx.test.filters;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import org.junit.runner.Description;
+import org.junit.runner.manipulation.Filter;
+
+/**
+ * A JUnit sharding filter uses the hashcode of the test description to assign it to a shard.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public class ShardingFilter extends Filter {
+  private final int numShards;
+  private final int shardIndex;
+
+  public ShardingFilter(int numShards, int shardIndex) {
+    this.numShards = numShards;
+    this.shardIndex = shardIndex;
+  }
+
+  @Override
+  public boolean shouldRun(Description description) {
+    if (description.isTest()) {
+      return (Math.floorMod(description.hashCode(), numShards)) == shardIndex;
+    }
+
+    // The description is a suite, so assume that it can be run so that filtering is
+    // applied to its children. If after filtering it has no children then it will be
+    // automatically filtered out.
+    return true;
+  }
+
+  /** {@inheritDoc} */
+  @Override
+  public String describe() {
+    return String.format("Shard %d of %d shards", shardIndex, numShards);
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/filters/SmallTest.java b/runner/android_junit_runner/java/androidx/test/filters/SmallTest.java
index dd32df44e..b217060b5 100644
--- a/runner/android_junit_runner/java/androidx/test/filters/SmallTest.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/SmallTest.java
@@ -22,24 +22,24 @@
 import java.lang.annotation.Target;
 
 /**
- * Annotation to assign a small test size qualifier to a test. This annotation can be used at a
+ * Annotation to assign a small test size qualifier to a test. This annotation can be used at the
  * method or class level.
  *
  * <p>Test size qualifiers are a great way to structure test code and are used to assign a test to a
- * test suite of similar run time.
+ * suite of tests that have similar run times.
  *
  * <p>Execution time: &lt;200ms
  *
- * <p>Small tests should be run very frequently. Focused on units of code to verify specific logical
- * conditions. These tests should runs in an isolated environment and use mock objects for external
- * dependencies. Resource access (such as file system, network, or databases) are not permitted.
- * Tests that interact with hardware, make binder calls, or that facilitate android instrumentation
- * should not use this annotation.
+ * <p>Small tests should be run very frequently, focused on units of code to verify specific logical
+ * conditions. Tests should run in an isolated environment and use fake objects for external
+ * dependencies. Resource access (for example, to the file system, network, or databases) is not
+ * permitted. Tests that interact with hardware, make binder calls, or facilitate android
+ * instrumentation should not use this annotation.
  *
- * <p>Note: This class replaces the deprecated Android platform size qualifier <a
- * href="http://developer.android.com/reference/android/test/suitebuilder/annotation/SmallTest.html">
- * android.test.suitebuilder.annotation.SmallTest</a> and is the recommended way to annotate tests
- * written with the AndroidX Test Library.
+ * <p><b>Note:</b> This class replaces the deprecated Android platform size qualifier <a
+ * href="{@docRoot}reference/android/test/suitebuilder/annotation/SmallTest.html"><code>
+ * android.test.suitebuilder.annotation.SmallTest</code></a> and is the recommended way to annotate
+ * tests written with the AndroidX Test libraries.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
diff --git a/runner/android_junit_runner/java/androidx/test/filters/Suppress.java b/runner/android_junit_runner/java/androidx/test/filters/Suppress.java
index 88e636c2d..13d8c9ac8 100644
--- a/runner/android_junit_runner/java/androidx/test/filters/Suppress.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/Suppress.java
@@ -30,7 +30,10 @@
  * href="http://developer.android.com/reference/android/test/suitebuilder/annotation/Suppress.html">
  * android.test.suitebuilder.annotation.Suppress</a> and is the recommended way to suppress tests
  * written with the AndroidX Test Library.
+ *
+ * @deprecated Use {@link org.junit.Ignore} instead.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
+@Deprecated
 public @interface Suppress {}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/filters/TestsRegExFilter.java b/runner/android_junit_runner/java/androidx/test/filters/TestsRegExFilter.java
similarity index 79%
rename from runner/android_junit_runner/java/androidx/test/internal/runner/filters/TestsRegExFilter.java
rename to runner/android_junit_runner/java/androidx/test/filters/TestsRegExFilter.java
index 5b30cf893..f51fd32c6 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/filters/TestsRegExFilter.java
+++ b/runner/android_junit_runner/java/androidx/test/filters/TestsRegExFilter.java
@@ -13,13 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.test.internal.runner.filters;
+package androidx.test.filters;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import java.util.regex.Pattern;
 import org.junit.runner.Description;
 
-/** A JUnit filter for filtering tests whose name match one of the given regular expression */
-public final class TestsRegExFilter extends ParentFilter {
+/**
+ * A JUnit filter for filtering tests whose name match one of the given regular expression.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
+public final class TestsRegExFilter extends AbstractFilter {
 
   private Pattern pattern = null;
 
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/OrchestratedInstrumentationListener.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/OrchestratedInstrumentationListener.java
index 472bfae24..9bcd331b9 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/OrchestratedInstrumentationListener.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/OrchestratedInstrumentationListener.java
@@ -22,10 +22,9 @@
 import static androidx.test.services.events.ParcelableConverter.getTestCaseFromDescription;
 import static java.util.Collections.emptyList;
 
-import android.os.ConditionVariable;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
 import androidx.test.services.events.FailureInfo;
 import androidx.test.services.events.TestCaseInfo;
 import androidx.test.services.events.TestEventException;
@@ -52,7 +51,6 @@ public final class OrchestratedInstrumentationListener extends RunListener {
   // TODO(b/161754141): replace references to the word "orchestrator" with "test event service"
   private static final String TAG = "OrchestrationListener";
   private final TestRunEventService notificationService;
-  private final ConditionVariable testFinishedCondition = new ConditionVariable();
   private final AtomicBoolean isTestFailed = new AtomicBoolean(false);
   private Description description = Description.EMPTY; // Cached test description
 
@@ -230,14 +228,7 @@ public void testIgnored(Description description) {
   }
 
   /** Reports the process crash event with a given exception. */
-  public void reportProcessCrash(Throwable t, long timeoutMillis) {
-    // Waits until the orchestrator gets a chance to handle the test failure (if any) before
-    // bringing down the entire Instrumentation process.
-    //
-    // It's also possible that the process crashes in the middle of a test, so no TestFinish event
-    // will be received. In this case, it will wait until timeoutMillis is reached.
-    waitUntilTestFinished(timeoutMillis);
-
+  public boolean reportProcessCrash(Throwable t, long timeoutMillis) {
     // Need to report the process crashed event to the orchestrator.
     // This is to handle the case when the test body finishes but process crashes during
     // Instrumentation cleanup (e.g. stopping the app). Otherwise, the test will be marked as
@@ -245,7 +236,9 @@ public void reportProcessCrash(Throwable t, long timeoutMillis) {
     if (!isTestFailed.get()) {
       Log.i(TAG, "No test failure has been reported. Report the process crash.");
       reportProcessCrash(t);
+      return true;
     }
+    return false;
   }
 
   /** Reports the process crash event with a given exception. */
@@ -253,17 +246,4 @@ private void reportProcessCrash(Throwable t) {
     testFailure(new Failure(description, t));
     testFinished(description);
   }
-
-  /**
-   * Blocks until the test running within this Instrumentation has finished, whether the test
-   * succeeds or fails.
-   *
-   * <p>We consider a test finished when the {@link #testFinished(Description)} method has been
-   * called.
-   */
-  private void waitUntilTestFinished(long timeoutMillis) {
-    if (!testFinishedCondition.block(timeoutMillis)) {
-      Log.w(TAG, "Timeout waiting for the test to finish");
-    }
-  }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscovery.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscovery.java
deleted file mode 100644
index ed1f05667..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscovery.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.internal.events.client;
-
-import static androidx.test.internal.util.Checks.checkNotNull;
-import static androidx.test.services.events.ParcelableConverter.getTestCaseFromDescription;
-
-import androidx.annotation.NonNull;
-import android.util.Log;
-import androidx.test.services.events.TestEventException;
-import androidx.test.services.events.discovery.TestDiscoveryFinishedEvent;
-import androidx.test.services.events.discovery.TestDiscoveryStartedEvent;
-import androidx.test.services.events.discovery.TestFoundEvent;
-import org.junit.runner.Description;
-
-/**
- * Uses the {@link TestDiscoveryEventService} to pass test case information back to the
- * Orchestrator.
- */
-public final class TestDiscovery {
-  private static final String TAG = "TestDiscovery";
-  private final TestDiscoveryEventService testDiscoveryEventService;
-
-  public TestDiscovery(@NonNull TestDiscoveryEventService testDiscoveryEventService) {
-    this.testDiscoveryEventService =
-        checkNotNull(testDiscoveryEventService, "testDiscoveryEventService can't be null");
-  }
-
-  /**
-   * Recursively sends test information to the remote service.
-   *
-   * @param description the root JUnit test case description object to traverse
-   */
-  public void addTests(@NonNull Description description) throws TestEventClientException {
-    checkNotNull(description, "description cannot be null");
-    testDiscoveryEventService.send(new TestDiscoveryStartedEvent());
-    addTest(description);
-    testDiscoveryEventService.send(new TestDiscoveryFinishedEvent());
-  }
-
-  private void addTest(@NonNull Description description) {
-    if (description.isEmpty()) {
-      Log.d(TAG, "addTest called with an empty test description");
-      return;
-    }
-    if (description.isTest()) {
-      if (!JUnitValidator.validateDescription(description)) {
-        Log.w(
-            TAG,
-            "JUnit reported "
-                + description.getClassName()
-                + "#"
-                + description.getMethodName()
-                + "; discarding as bogus.");
-        return;
-      }
-      try {
-        testDiscoveryEventService.send(new TestFoundEvent(getTestCaseFromDescription(description)));
-      } catch (TestEventException e) {
-        Log.e(TAG, "Failed to get test description", e);
-      }
-    } else {
-      for (Description child : description.getChildren()) {
-        addTest(child);
-      }
-    }
-  }
-}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryEventServiceConnection.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryEventServiceConnection.java
index fb7d1a116..8f7063051 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryEventServiceConnection.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryEventServiceConnection.java
@@ -42,7 +42,8 @@ public void send(@NonNull TestDiscoveryEvent testDiscoveryEvent) throws TestEven
     }
     try {
       service.send(testDiscoveryEvent);
-    } catch (RemoteException e) {
+    } catch (RemoteException | RuntimeException e) {
+      // "IllegalStateException: Channel was closed" is a possibility here.
       throw new TestEventClientException("Failed to send test case", e);
     }
   }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryListener.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryListener.java
new file mode 100644
index 000000000..1e89d8319
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestDiscoveryListener.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.internal.events.client;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.services.events.ParcelableConverter.getTestCaseFromDescription;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.test.services.events.ErrorInfo;
+import androidx.test.services.events.TestEventException;
+import androidx.test.services.events.TimeStamp;
+import androidx.test.services.events.discovery.TestDiscoveryErrorEvent;
+import androidx.test.services.events.discovery.TestDiscoveryFinishedEvent;
+import androidx.test.services.events.discovery.TestDiscoveryStartedEvent;
+import androidx.test.services.events.discovery.TestFoundEvent;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+/**
+ * Uses the {@link TestDiscoveryEventService} to pass test case information back to the
+ * Orchestrator.
+ */
+public final class TestDiscoveryListener extends RunListener {
+  private static final String TAG = "TestDiscoveryListener";
+  private final TestDiscoveryEventService testDiscoveryEventService;
+  private final AtomicBoolean discoveryStarted = new AtomicBoolean(false);
+
+  public TestDiscoveryListener(@NonNull TestDiscoveryEventService testDiscoveryEventService) {
+    this.testDiscoveryEventService =
+        checkNotNull(testDiscoveryEventService, "testDiscoveryEventService can't be null");
+  }
+
+  @Override
+  public void testRunStarted(Description description) {
+    try {
+      reportTestRunStarted();
+    } catch (TestEventClientException e) {
+      Log.e(TAG, "Failed to send discovery started", e);
+    }
+  }
+
+  private void reportTestRunStarted() throws TestEventClientException {
+    // testRunStarted may be called more than once, if a process crash event arrives from another
+    // thread
+    if (!discoveryStarted.getAndSet(true)) {
+      testDiscoveryEventService.send(new TestDiscoveryStartedEvent());
+    }
+  }
+
+  @Override
+  public void testRunFinished(Result result) {
+    try {
+      testDiscoveryEventService.send(new TestDiscoveryFinishedEvent());
+    } catch (TestEventClientException e) {
+      Log.e(TAG, "Failed to send discovery started", e);
+    }
+  }
+
+  @Override
+  public void testFinished(Description description) {
+    if (!JUnitValidator.validateDescription(description)) {
+      // will be already reported via testFailure
+      Log.d(
+          TAG,
+          "JUnit reported "
+              + description.getClassName()
+              + "#"
+              + description.getMethodName()
+              + "; discarding as bogus.");
+      return;
+    }
+    try {
+      testDiscoveryEventService.send(new TestFoundEvent(getTestCaseFromDescription(description)));
+    } catch (TestEventException e) {
+      Log.e(TAG, "Failed to get test description", e);
+    }
+  }
+
+  @Override
+  public void testFailure(Failure failure) {
+    // this is likely a JUnit error loading the class aka a initializationError
+    try {
+      reportDiscoveryError(failure);
+    } catch (TestEventClientException e) {
+      Log.e(TAG, "Failed to send discovery failure", e);
+    }
+  }
+
+  private void reportDiscoveryError(Failure failure) throws TestEventClientException {
+    testDiscoveryEventService.send(
+        new TestDiscoveryErrorEvent(ErrorInfo.createFromFailure(failure), TimeStamp.now()));
+  }
+
+  public boolean reportProcessCrash(Throwable t) {
+    try {
+      // report a start event just in case discovery did not start yet
+      reportTestRunStarted();
+      reportDiscoveryError(new Failure(Description.EMPTY, t));
+      // report run finished, since process crashed, we are likely dying
+      testDiscoveryEventService.send(new TestDiscoveryFinishedEvent());
+      return true;
+    } catch (TestEventClientException e) {
+      Log.e(TAG, "Failed to report process crash error", e);
+      return false;
+    }
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClient.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClient.java
index 45079eca7..95d1ad431 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClient.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClient.java
@@ -20,9 +20,10 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
+import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunListener;
 
@@ -60,13 +61,14 @@ public final class TestEventClient {
    * At most one of these should not be null - the non-null value determines how this client
    * operates.
    */
-  @Nullable private final TestDiscovery testDiscovery;
+  @Nullable private final TestDiscoveryListener testDiscoveryListener;
   @Nullable private final OrchestratedInstrumentationListener notificationRunListener;
   @Nullable private final TestPlatformListener testPlatformListener;
+  private final AtomicBoolean isConnectedToOrchestrator = new AtomicBoolean(false);
 
   /** Creates a no-op TestEventClient that doesn't send test discovery or run events. */
   private TestEventClient() {
-    this.testDiscovery = null;
+    this.testDiscoveryListener = null;
     this.notificationRunListener = null;
     this.testPlatformListener = null;
   }
@@ -75,9 +77,9 @@ private TestEventClient() {
    * Creates a TestEventClient in test discovery mode. Call {@link #addTests(Description)} from the
    * test runner to send the test case info to the remote service.
    */
-  private TestEventClient(@NonNull TestDiscovery testDiscovery) {
-    checkNotNull(testDiscovery, "testDiscovery cannot be null");
-    this.testDiscovery = testDiscovery;
+  private TestEventClient(@NonNull TestDiscoveryListener testDiscoveryListener) {
+    checkNotNull(testDiscoveryListener, "testDiscovery cannot be null");
+    this.testDiscoveryListener = testDiscoveryListener;
     this.notificationRunListener = null;
     this.testPlatformListener = null;
   }
@@ -88,7 +90,7 @@ private TestEventClient(@NonNull TestDiscovery testDiscovery) {
    */
   private TestEventClient(@NonNull OrchestratedInstrumentationListener runListener) {
     checkNotNull(runListener, "runListener cannot be null");
-    this.testDiscovery = null;
+    this.testDiscoveryListener = null;
     this.notificationRunListener = runListener;
     this.testPlatformListener = null;
   }
@@ -99,7 +101,7 @@ private TestEventClient(@NonNull OrchestratedInstrumentationListener runListener
    */
   private TestEventClient(@NonNull TestPlatformListener runListener) {
     checkNotNull(runListener, "runListener cannot be null");
-    this.testDiscovery = null;
+    this.testDiscoveryListener = null;
     this.notificationRunListener = null;
     this.testPlatformListener = runListener;
   }
@@ -133,12 +135,11 @@ public static TestEventClient connect(
         defaultConn != null ? defaultConn : getConnection(listener, args);
     TestEventClient result = NO_OP_CLIENT;
     if (args.isTestDiscoveryRequested) {
-      Log.v(TAG, "Test discovery events requested");
       TestDiscoveryEventService testDiscoveryEventService = (TestDiscoveryEventService) connection;
-      TestDiscovery testDiscovery = new TestDiscovery(testDiscoveryEventService);
-      result = new TestEventClient(testDiscovery);
+      TestDiscoveryListener testDiscoveryListener =
+          new TestDiscoveryListener(testDiscoveryEventService);
+      result = new TestEventClient(testDiscoveryListener);
     } else if (args.isTestRunEventsRequested) {
-      Log.v(TAG, "Test run events requested");
       if (args.testPlatformMigration) {
         TestPlatformListener platformListener =
             new TestPlatformListener((TestPlatformEventService) connection);
@@ -154,6 +155,14 @@ public static TestEventClient connect(
     return result;
   }
 
+  /**
+   * Returns true if an orchestration service (either discovery or test run events service) was
+   * requested.
+   */
+  public boolean isOrchestrationServiceEnabled() {
+    return isTestDiscoveryEnabled() || isTestRunEventsEnabled();
+  }
+
   /**
    * Returns true if test discovery was requested by providing both the {@link
    * TestEventClientArgs.Builder#orchestratorService} and {@link
@@ -161,8 +170,8 @@ public static TestEventClient connect(
    *
    * @return true if in test discovery mode, false if in the default test run mode
    */
-  public boolean isTestDiscoveryEnabled() {
-    return testDiscovery != null;
+  private boolean isTestDiscoveryEnabled() {
+    return testDiscoveryListener != null;
   }
 
   /**
@@ -172,41 +181,27 @@ public boolean isTestDiscoveryEnabled() {
    *
    * @return true if in orchestrated test run mode
    */
-  public boolean isTestRunEventsEnabled() {
+  private boolean isTestRunEventsEnabled() {
     return notificationRunListener != null || testPlatformListener != null;
   }
 
   /**
-   * Returns the {@link OrchestratedInstrumentationListener} instance if available.
+   * Returns the main {@link RunListener} for reporting test results
    *
-   * @return an {@link OrchestratedInstrumentationListener} instance
+   * @return an {@link RunListener} instance or null if testEventClient is not enabled
    */
   @Nullable
   public RunListener getRunListener() {
-    if (!isTestRunEventsEnabled()) {
-      Log.e(TAG, "Orchestrator service not connected - can't send test run notifications");
-    }
-    if (notificationRunListener != null) {
-      return notificationRunListener;
+    if (isTestDiscoveryEnabled()) {
+      return testDiscoveryListener;
+    } else if (isTestRunEventsEnabled()) {
+      if (notificationRunListener != null) {
+        return notificationRunListener;
+      } else {
+        return testPlatformListener;
+      }
     } else {
-      return testPlatformListener;
-    }
-  }
-
-  /**
-   * Sends a single test case to the orchestrator during test discovery mode.
-   *
-   * @param description the JUnit {@link Description} representing a test which is to be run
-   */
-  public void addTests(@NonNull Description description) {
-    if (!isTestDiscoveryEnabled()) {
-      Log.e(TAG, "Orchestrator service not connected - can't send tests");
-      return;
-    }
-    try {
-      testDiscovery.addTests(description);
-    } catch (TestEventClientException e) {
-      Log.e(TAG, "Failed to add test [" + description + "]", e);
+      return null;
     }
   }
 
@@ -237,13 +232,25 @@ private static TestEventServiceConnection getConnection(
         "TestEventClientArgs misconfiguration - can't determine which service connection to use.");
   }
 
-  /** Reports the process crash event with a given exception. */
-  public void reportProcessCrash(Throwable t) {
-    reportProcessCrash(t, /* timeout */ SECONDS.toMillis(20));
+  /**
+   * Reports the process crash event with a given exception.
+   *
+   * @return true if process crash was reported to a test event service, false otherwise
+   */
+  public boolean reportProcessCrash(Throwable t) {
+    return reportProcessCrash(t, /* timeout */ SECONDS.toMillis(20));
   }
 
-  /** Reports the process crash event with a given exception. */
-  public void reportProcessCrash(Throwable t, long timeoutMillis) {
+  /**
+   * Reports the process crash event with a given exception.
+   *
+   * @return true if process crash was reported to a test event service, false otherwise
+   */
+  public boolean reportProcessCrash(Throwable t, long timeoutMillis) {
+    if (!isConnectedToOrchestrator.get()) {
+      Log.w(TAG, "Process crashed before connection to orchestrator");
+      return false;
+    }
     if (isTestRunEventsEnabled()) {
       // Waits until the orchestrator gets a chance to handle the test failure (if any) and
       // report the process crashed event to the orchestrator before bringing down the entire
@@ -252,16 +259,20 @@ public void reportProcessCrash(Throwable t, long timeoutMillis) {
       // It's also possible that the process crashes in the middle of a test, so no TestFinish event
       // will be received. In this case, it will wait until timeoutMillis is reached.
       if (notificationRunListener != null) {
-        Log.d(TAG, "Test run event service is available.");
-        notificationRunListener.reportProcessCrash(t, timeoutMillis);
+        Log.d(TAG, "Reporting process crashed to orchestration test run event service.");
+        return notificationRunListener.reportProcessCrash(t, timeoutMillis);
       }
       // Ignores timeoutMillis, this listener reports the error and allows the process to exit
       // quickly. We don't wait for the test to handle the exception.
       if (testPlatformListener != null) {
-        Log.d(TAG, "Platform test event service is available.");
-        testPlatformListener.reportProcessCrash(t);
+        Log.d(TAG, "Reporting process crash to platform test event service.");
+        return testPlatformListener.reportProcessCrash(t);
       }
+    } else if (isTestDiscoveryEnabled()) {
+      Log.d(TAG, "Reporting process crash to platform test discovery service.");
+      return testDiscoveryListener.reportProcessCrash(t);
     }
+    return false;
   }
 
   /**
@@ -275,4 +286,8 @@ public void reportProcessCrash(Throwable t, long timeoutMillis) {
   public static void setOrchestratorConnection(TestEventServiceConnection conn) {
     defaultConn = checkNotNull(conn);
   }
+
+  public void setConnectedToOrchestrator(boolean b) {
+    isConnectedToOrchestrator.set(b);
+  }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClientArgs.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClientArgs.java
index e89d23f73..f96e56ab6 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClientArgs.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventClientArgs.java
@@ -17,9 +17,9 @@
 package androidx.test.internal.events.client;
 
 import android.content.Context;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
 
 /**
  * Provides arguments to {@link TestEventClient#connect(Context, TestEventClientConnectListener,
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventServiceConnectionBase.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventServiceConnectionBase.java
index 820c0a7e5..117ba942a 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventServiceConnectionBase.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestEventServiceConnectionBase.java
@@ -25,9 +25,9 @@
 import android.content.ServiceConnection;
 import android.os.IBinder;
 import android.os.IInterface;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 
 /**
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestPlatformListener.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestPlatformListener.java
index e53a2db78..2e26669c5 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/events/client/TestPlatformListener.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/TestPlatformListener.java
@@ -17,11 +17,9 @@
 package androidx.test.internal.events.client;
 
 import static androidx.test.internal.util.Checks.checkNotNull;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
 
-import androidx.annotation.NonNull;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.test.services.events.ErrorInfo;
 import androidx.test.services.events.ParcelableConverter;
 import androidx.test.services.events.TestCaseInfo;
@@ -30,7 +28,6 @@
 import androidx.test.services.events.TestStatus;
 import androidx.test.services.events.TestStatus.Status;
 import androidx.test.services.events.TimeStamp;
-import androidx.test.services.events.internal.StackTrimmer;
 import androidx.test.services.events.platform.TestCaseErrorEvent;
 import androidx.test.services.events.platform.TestCaseFinishedEvent;
 import androidx.test.services.events.platform.TestCaseStartedEvent;
@@ -98,7 +95,6 @@ public TestPlatformListener(@NonNull TestPlatformEventService notificationServic
   /** {@inheritDoc} */
   @Override
   public void testRunStarted(Description description) throws Exception {
-    TimeStamp timeStamp = getTimeStamp();
     initListener();
     ongoingResultListener.get().testRunStarted(description);
     setRunDescription(description);
@@ -111,7 +107,7 @@ public void testRunStarted(Description description) throws Exception {
     }
     try {
       memoizedTestRun = convertToTestRun(testRunDescription);
-      notificationService.send(new TestRunStartedEvent(memoizedTestRun, timeStamp));
+      notificationService.send(new TestRunStartedEvent(memoizedTestRun, TimeStamp.now()));
     } catch (TestEventException e) {
       Log.e(TAG, "Unable to send TestRunStartedEvent to Test Platform", e);
     }
@@ -120,7 +116,6 @@ public void testRunStarted(Description description) throws Exception {
   /** {@inheritDoc} */
   @Override
   public void testRunFinished(Result result) throws Exception {
-    TimeStamp timeStamp = getTimeStamp();
     ongoingResultListener.get().testRunFinished(result);
     Status status = result.wasSuccessful() ? Status.PASSED : Status.FAILED;
     // If the process crashed at any point, this is failed.
@@ -140,13 +135,13 @@ public void testRunFinished(Result result) throws Exception {
             // The test was supposed to be run but was never finished
             testCaseToStatus.put(test, Status.CANCELLED);
           }
-          testFinishedInternal(test, timeStamp);
+          testFinishedInternal(test, TimeStamp.now());
         }
       }
     }
     try {
       notificationService.send(
-          new TestRunFinishedEvent(memoizedTestRun, new TestStatus(status), timeStamp));
+          new TestRunFinishedEvent(memoizedTestRun, new TestStatus(status), TimeStamp.now()));
     } catch (TestEventException e) {
       Log.e(TAG, "Unable to send TestRunFinishedEvent to Test Platform", e);
     }
@@ -155,7 +150,6 @@ public void testRunFinished(Result result) throws Exception {
   /** {@inheritDoc} */
   @Override
   public void testStarted(Description description) throws Exception {
-    TimeStamp timeStamp = getTimeStamp();
     if (isInitError(description)) {
       return; // This isn't a real test method, don't send an update to the service
     }
@@ -163,7 +157,8 @@ public void testStarted(Description description) throws Exception {
     startedTestCases.add(description);
     currentTestCase.set(description); // Caches the test description in case of a crash
     try {
-      notificationService.send(new TestCaseStartedEvent(convertToTestCase(description), timeStamp));
+      notificationService.send(
+          new TestCaseStartedEvent(convertToTestCase(description), TimeStamp.now()));
     } catch (TestEventException e) {
       Log.e(TAG, "Unable to send TestStartedEvent to Test Platform", e);
     }
@@ -172,8 +167,7 @@ public void testStarted(Description description) throws Exception {
   /** {@inheritDoc} */
   @Override
   public void testFinished(Description description) throws Exception {
-    TimeStamp timeStamp = getTimeStamp();
-    testFinishedInternal(description, timeStamp);
+    testFinishedInternal(description, TimeStamp.now());
   }
 
   // If the test is marked as finished during the test run finish, we use the same timestamp
@@ -200,14 +194,13 @@ private void testFinishedInternal(Description description, TimeStamp timeStamp)
   /** {@inheritDoc} */
   @Override
   public void testFailure(Failure failure) throws Exception {
-    TimeStamp timeStamp = getTimeStamp();
     Description description = failure.getDescription();
     ongoingResultListener.get().testFailure(failure);
     if (description.isTest() && !isInitError(description)) {
       testCaseToStatus.put(description, Status.FAILED);
     }
     try {
-      TestPlatformEvent event = createErrorEvent(failure, timeStamp);
+      TestPlatformEvent event = createErrorEvent(failure, TimeStamp.now());
       notificationService.send(event);
     } catch (TestEventException e) {
       throw new IllegalStateException("Unable to send error event", e);
@@ -217,13 +210,12 @@ public void testFailure(Failure failure) throws Exception {
   /** {@inheritDoc} */
   @Override
   public void testAssumptionFailure(Failure failure) {
-    TimeStamp timeStamp = getTimeStamp();
     ongoingResultListener.get().testAssumptionFailure(failure);
     if (failure.getDescription().isTest()) {
       testCaseToStatus.put(failure.getDescription(), Status.SKIPPED);
     }
     try {
-      TestPlatformEvent event = createErrorEvent(failure, timeStamp);
+      TestPlatformEvent event = createErrorEvent(failure, TimeStamp.now());
       notificationService.send(event);
     } catch (TestEventException e) {
       Log.e(TAG, "Unable to send TestAssumptionFailureEvent to Test Platform", e);
@@ -233,7 +225,6 @@ public void testAssumptionFailure(Failure failure) {
   /** {@inheritDoc} */
   @Override
   public void testIgnored(Description description) throws Exception {
-    TimeStamp timeStamp = getTimeStamp();
     ongoingResultListener.get().testIgnored(description);
     Log.i(
         TAG,
@@ -244,7 +235,7 @@ public void testIgnored(Description description) throws Exception {
             + "#"
             + description.getMethodName());
     testCaseToStatus.put(description, Status.IGNORED);
-    testFinishedInternal(description, timeStamp);
+    testFinishedInternal(description, TimeStamp.now());
   }
 
   /**
@@ -258,7 +249,7 @@ public void testIgnored(Description description) throws Exception {
    *   <li>The test run has finished.
    * </ol>
    */
-  public void reportProcessCrash(Throwable t) {
+  public boolean reportProcessCrash(Throwable t) {
     processCrashed.set(true);
     boolean isTestCase = true;
     Description failingDescription = currentTestCase.get();
@@ -267,6 +258,7 @@ public void reportProcessCrash(Throwable t) {
       failingDescription = testRunDescription;
     }
     try {
+      Log.e("TestPlatformListener", "reporting crash as testfailure", t);
       testFailure(new Failure(failingDescription, t));
       if (isTestCase) {
         testFinished(failingDescription);
@@ -274,7 +266,9 @@ public void reportProcessCrash(Throwable t) {
       testRunFinished(ongoingResult.get());
     } catch (Exception e) {
       Log.e(TAG, "An exception was encountered while reporting the process crash", e);
+      return false;
     }
+    return true;
   }
 
   private void initListener() {
@@ -322,11 +316,7 @@ private TestPlatformEvent createErrorEvent(Failure failure, TimeStamp timeStamp)
     if (!descriptionToUse.isTest() || isInitError(descriptionToUse)) {
       descriptionToUse = testRunDescription;
     }
-    ErrorInfo errorInfo =
-        new ErrorInfo(
-            StackTrimmer.getTrimmedMessage(failure),
-            failure.getException().getClass().getName(),
-            StackTrimmer.getTrimmedStackTrace(failure));
+    ErrorInfo errorInfo = ErrorInfo.createFromFailure(failure);
     // If the description is a run description, report a run error. Otherwise report a test error.
     if (!descriptionToUse.equals(testRunDescription)) {
       try {
@@ -342,9 +332,4 @@ private TestPlatformEvent createErrorEvent(Failure failure, TimeStamp timeStamp)
     return new TestRunErrorEvent(memoizedTestRun, errorInfo, timeStamp);
   }
 
-  private TimeStamp getTimeStamp() {
-    long epochNanos = System.nanoTime();
-    long epochSeconds = NANOSECONDS.toSeconds(epochNanos);
-    return new TimeStamp(epochSeconds, (int) (epochNanos - SECONDS.toNanos(epochSeconds)));
-  }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/client/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/events/client/package-info.java
new file mode 100644
index 000000000..1eabb9ec2
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/client/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.events.client;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/events/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/events/package-info.java
new file mode 100644
index 000000000..9dbb3ae61
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/events/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.events;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/package.html b/runner/android_junit_runner/java/androidx/test/internal/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidLogOnlyBuilder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidLogOnlyBuilder.java
index cf7421834..6c8153d26 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidLogOnlyBuilder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidLogOnlyBuilder.java
@@ -19,11 +19,9 @@
 import static androidx.test.internal.util.AndroidRunnerBuilderUtil.hasJUnit3TestMethod;
 import static androidx.test.internal.util.AndroidRunnerBuilderUtil.hasSuiteMethod;
 import static androidx.test.internal.util.AndroidRunnerBuilderUtil.isJUnit3Test;
-import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.internal.runner.junit3.JUnit38ClassRunner;
 import androidx.test.internal.runner.junit3.NonExecutingTestSuite;
-import androidx.test.internal.util.AndroidRunnerParams;
 import java.util.List;
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -41,30 +39,24 @@ class AndroidLogOnlyBuilder extends RunnerBuilder {
 
   private final AndroidRunnerBuilder builder;
 
-  private final AndroidRunnerParams runnerParams;
-
-  private final boolean scanningPath;
+  private final boolean ignoreSuiteMethods;
 
   // The number of Runners created
   private int runnerCount = 0;
 
   /**
-   * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
+   * @param ignoreSuiteMethods whether or not JUnit3 suite() methods should be executed.
    * @param scanningPath true if being used to build {@link Runner} from classes found while
    *     scanning the path; requires extra checks to avoid unnecessary errors.
    */
   AndroidLogOnlyBuilder(
-      AndroidRunnerParams runnerParams,
-      boolean scanningPath,
-      List<Class<? extends RunnerBuilder>> customRunnerBuilderClasses) {
-    this.runnerParams = checkNotNull(runnerParams, "runnerParams cannot be null!");
-    this.scanningPath = scanningPath;
+      boolean ignoreSuiteMethods, List<Class<? extends RunnerBuilder>> customRunnerBuilderClasses) {
+    this.ignoreSuiteMethods = ignoreSuiteMethods;
 
     // Create a builder for creating the executable Runner instances to wrap. Pass in this
     // builder as the suiteBuilder so that this will be called to create Runners for nested
     // classes, e.g. in Suite or Enclosed.
-    builder =
-        new AndroidRunnerBuilder(this, runnerParams, scanningPath, customRunnerBuilderClasses);
+    builder = new AndroidRunnerBuilder(this, ignoreSuiteMethods, 0, customRunnerBuilderClasses);
   }
 
   @Override
@@ -74,15 +66,13 @@ public Runner runnerForClass(Class<?> testClass) throws Throwable {
 
     // Build non executing runners for JUnit3 test classes
     if (isJUnit3Test(testClass)) {
-      // If scanning the path then make sure that it has at least one test method before
-      // trying to run it.
-      if (scanningPath && !hasJUnit3TestMethod(testClass)) {
-        return null;
+      if (!hasJUnit3TestMethod(testClass)) {
+        return new EmptyTestRunner(testClass);
       }
 
       return new JUnit38ClassRunner(new NonExecutingTestSuite(testClass));
     } else if (hasSuiteMethod(testClass)) {
-      if (runnerParams.isIgnoreSuiteMethods()) {
+      if (ignoreSuiteMethods) {
         return null;
       }
 
@@ -101,11 +91,15 @@ public Runner runnerForClass(Class<?> testClass) throws Throwable {
       if (null == runner) {
         // If the runner could not be created then do not wrap it.
         return null;
-      } else if (runner instanceof ErrorReportingRunner) {
+      } else if (runner instanceof ErrorReportingRunner
+          || runner instanceof androidx.test.internal.runner.ErrorReportingRunner) {
         // Preserve behavior where a failure during construction results in an error,
         // even while in logOnly mode, by simply returning the runner rather than
         // wrapping it.
         return runner;
+      } else if (runner instanceof org.junit.internal.builders.IgnoredClassRunner) {
+        // preserve behavior if class has @Ignore
+        return runner;
       } else if (runnerCount > oldRunnerCount) {
         // If constructing the testClass caused us to reenter here to build Runner
         // instances, e.g. for Suite or Enclosed, then this must not wrap runner in a
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidRunnerBuilder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidRunnerBuilder.java
index a581a6640..44c7e672b 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidRunnerBuilder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/AndroidRunnerBuilder.java
@@ -19,7 +19,6 @@
 import androidx.test.internal.runner.junit3.AndroidSuiteBuilder;
 import androidx.test.internal.runner.junit4.AndroidAnnotatedBuilder;
 import androidx.test.internal.runner.junit4.AndroidJUnit4Builder;
-import androidx.test.internal.util.AndroidRunnerParams;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,22 +44,23 @@ class AndroidRunnerBuilder extends AllDefaultPossibilitiesBuilder {
 
   private final List<RunnerBuilder> customRunnerBuilders;
 
-  /** @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters */
-  public AndroidRunnerBuilder(AndroidRunnerParams runnerParams) {
-    this(null, runnerParams, false, Collections.<Class<? extends RunnerBuilder>>emptyList());
+  /**
+   * @param ignoreSuiteMethods whether or not JUnit3 suite() methods should be executed.
+   */
+  public AndroidRunnerBuilder(boolean ignoreSuiteMethods) {
+    this(null, ignoreSuiteMethods, 0, Collections.<Class<? extends RunnerBuilder>>emptyList());
   }
 
   /**
-   * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
-   * @param scanningPath true if being used to build {@link Runner} from classes found while
-   *     scanning the path; requires extra checks to avoid unnecessary errors.
+   * @param ignoreSuiteMethods whether or not JUnit3 suite() methods should be executed.
+   * @param perTestTimeout milliseconds timeout value applied to each test where 0 means no timeout
    * @param customRunnerBuilderClasses custom {@link RunnerBuilder} classes
    */
   AndroidRunnerBuilder(
-      AndroidRunnerParams runnerParams,
-      boolean scanningPath,
+      boolean ignoreSuiteMethods,
+      long perTestTimeout,
       List<Class<? extends RunnerBuilder>> customRunnerBuilderClasses) {
-    this(null, runnerParams, scanningPath, customRunnerBuilderClasses);
+    this(null, ignoreSuiteMethods, perTestTimeout, customRunnerBuilderClasses);
   }
 
   /**
@@ -70,24 +70,23 @@ public AndroidRunnerBuilder(AndroidRunnerParams runnerParams) {
    * and must have a public no-argument constructor.
    *
    * @param suiteBuilder the top level {@link RunnerBuilder} to use to build nested classes.
-   * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
-   * @param scanningPath true if being used to build {@link Runner} from classes found while
-   *     scanning the path; requires extra checks to avoid unnecessary errors.
+   * @param ignoreSuiteMethods whether or not JUnit3 suite() methods should be executed.
+   * @param perTestTimeout milliseconds timeout value applied to each test where 0 means no timeout
    * @param customRunnerBuilderClasses custom {@link RunnerBuilder} classes
    * @throws IllegalStateException if any of the custom {@link RunnerBuilder} classes cannot be
    *     instantiated.
    */
   AndroidRunnerBuilder(
       RunnerBuilder suiteBuilder,
-      AndroidRunnerParams runnerParams,
-      boolean scanningPath,
+      boolean ignoreSuiteMethods,
+      long perTestTimeout,
       List<Class<? extends RunnerBuilder>> customRunnerBuilderClasses) {
     super(true);
-    androidJUnit3Builder = new AndroidJUnit3Builder(runnerParams, scanningPath);
-    androidJUnit4Builder = new AndroidJUnit4Builder(runnerParams, scanningPath);
-    androidSuiteBuilder = new AndroidSuiteBuilder(runnerParams);
+    androidJUnit3Builder = new AndroidJUnit3Builder(perTestTimeout);
+    androidJUnit4Builder = new AndroidJUnit4Builder(perTestTimeout);
+    androidSuiteBuilder = new AndroidSuiteBuilder(ignoreSuiteMethods, perTestTimeout);
     androidAnnotatedBuilder =
-        new AndroidAnnotatedBuilder(suiteBuilder == null ? this : suiteBuilder, runnerParams);
+        new AndroidAnnotatedBuilder(suiteBuilder == null ? this : suiteBuilder, perTestTimeout);
     ignoredBuilder = new IgnoredBuilder();
 
     customRunnerBuilders = instantiateRunnerBuilders(customRunnerBuilderClasses);
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/ClassPathScanner.java b/runner/android_junit_runner/java/androidx/test/internal/runner/ClassPathScanner.java
index f2d9689bc..557cb95bf 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/ClassPathScanner.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/ClassPathScanner.java
@@ -17,23 +17,16 @@
 package androidx.test.internal.runner;
 
 import android.app.Instrumentation;
-import android.content.pm.ApplicationInfo;
-import android.os.Build.VERSION;
-import android.util.Log;
 import dalvik.system.DexFile;
-import java.io.File;
 import java.io.IOException;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.regex.Pattern;
 
 /**
  * Finds class entries in provided paths to scan.
@@ -44,6 +37,19 @@ public class ClassPathScanner {
 
   private static final String TAG = "ClassPathScanner";
 
+  // Default excluded test packages
+  private static final String[] DEFAULT_EXCLUDED_PACKAGES = {
+    "junit",
+    "org.junit",
+    "org.hamcrest",
+    "org.mockito", // exclude Mockito for performance and to prevent JVM related errors
+    "androidx.test.internal.runner.junit3", // always skip AndroidTestSuite
+    "androidx.test.runner.suites", // always skip AndroidClassPathSuite to avoid infinite classpath
+    // scanning loop
+    "org.jacoco", // exclude Jacoco to prevent class loading issues
+    "net.bytebuddy" // exclude byte buddy to prevent Mockito 2.0 class loading issues
+  };
+
   /**
    * A filter for classpath entry paths
    *
@@ -107,7 +113,7 @@ public static class InclusivePackageNamesFilter implements ClassNameFilter {
 
     private final Collection<String> pkgNames;
 
-    InclusivePackageNamesFilter(Collection<String> pkgNames) {
+    public InclusivePackageNamesFilter(Collection<String> pkgNames) {
       this.pkgNames = new ArrayList<>(pkgNames.size());
       for (String packageName : pkgNames) {
         if (!packageName.endsWith(".")) {
@@ -137,7 +143,7 @@ public static class ExcludePackageNameFilter implements ClassNameFilter {
 
     private final String pkgName;
 
-    ExcludePackageNameFilter(String pkgName) {
+    public ExcludePackageNameFilter(String pkgName) {
       if (!pkgName.endsWith(".")) {
         this.pkgName = String.format("%s.", pkgName);
       } else {
@@ -192,46 +198,11 @@ public ClassPathScanner(Collection<String> paths) {
    * <p>This will only scan for tests in the current Apk aka testContext. Note that this represents
    * a change from InstrumentationTestRunner where getTargetContext().getPackageCodePath() aka app
    * under test was also scanned.
-   *
-   * <p>This method will also handle cases where test apk is using multidex.
    */
   public static Collection<String> getDefaultClasspaths(Instrumentation instrumentation) {
     Collection<String> classPaths = new ArrayList<>();
     // add the test apk to claspath
     classPaths.add(instrumentation.getContext().getPackageCodePath());
-
-    if (VERSION.SDK_INT <= 20) {
-      // for platforms that do not support multidex natively, getPackageCodePath is not sufficient -
-      // each individual class.dex needs to be added.
-      Pattern extractedSecondaryName = Pattern.compile(".*\\.classes\\d+\\.zip");
-      ApplicationInfo applicationInfo;
-      try {
-        // need to get target context's application info, because the test apk classes.dex are
-        // extracted there
-        applicationInfo = instrumentation.getTargetContext().getApplicationInfo();
-      } catch (RuntimeException re) {
-        Log.w(
-            TAG,
-            "Failed to retrieve ApplicationInfo, no additional .dex files add for "
-                + "app under test",
-            re);
-        return Collections.emptyList();
-      }
-      File root = new File(applicationInfo.dataDir);
-      ArrayDeque<File> directoriesToScan = new ArrayDeque<>();
-      directoriesToScan.add(root);
-      while (!directoriesToScan.isEmpty()) {
-        File directory = directoriesToScan.pop();
-        for (File element : directory.listFiles()) {
-          if (element.isDirectory()) {
-            directoriesToScan.add(element);
-          } else if (element.isFile()
-              && extractedSecondaryName.matcher(element.getName()).matches()) {
-            classPaths.add(element.getPath());
-          }
-        }
-      }
-    }
     return classPaths;
   }
 
@@ -267,10 +238,28 @@ private void addEntriesFromPath(Set<String> entryNames, String path, ClassNameFi
     }
   }
 
+  public static List<String> getDefaultExcludedPackages() {
+    return Arrays.asList(DEFAULT_EXCLUDED_PACKAGES);
+  }
+
+  /**
+   * Retrieves set of classpath entries, excluding a set of default packages and inner classes.
+   *
+   * @throws IOException if failed to read classes from classpath
+   */
+  public Set<String> getClassPathEntries() throws IOException {
+    ChainedClassNameFilter filter = new ChainedClassNameFilter();
+    for (String pkg : DEFAULT_EXCLUDED_PACKAGES) {
+      filter.add(new ExcludePackageNameFilter(pkg));
+    }
+    filter.add(new ExternalClassNameFilter());
+    return getClassPathEntries(filter);
+  }
+
   /**
    * Retrieves set of classpath entries that match given {@link ClassNameFilter}.
    *
-   * @throws IOException
+   * @throws IOException if failed to read classes from classpath
    */
   public Set<String> getClassPathEntries(ClassNameFilter filter) throws IOException {
     // use LinkedHashSet for predictable order
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/ClassesArgTokenizer.java b/runner/android_junit_runner/java/androidx/test/internal/runner/ClassesArgTokenizer.java
new file mode 100644
index 000000000..87f268979
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/ClassesArgTokenizer.java
@@ -0,0 +1,123 @@
+package androidx.test.internal.runner;
+
+import android.text.TextUtils;
+import androidx.test.internal.runner.RunnerArgs.TestArg;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Parses the value of the '-e class' argument.
+ *
+ * <p>The expected input format is
+ * classA#methodB,class2,class3#parameterizedMethod[paramdescription]
+ */
+class ClassesArgTokenizer {
+
+  private static final String TAG = "ClassesArgTokenizer";
+
+  private ClassesArgTokenizer() {}
+
+  // Use the state design pattern to parse the input string.
+  // The tricky part to handle is the fact that method filters can contain names of Parameterized
+  // tests, that can contain arbitrary characters including commas and hashes.
+  private abstract static class TokenizerState {
+
+    protected final List<TestArg> testArgs;
+    protected final String input;
+    protected final int startTokenPos;
+    protected int pos;
+
+    protected TokenizerState(List<TestArg> testArgs, String input, int pos) {
+      this.testArgs = testArgs;
+      this.input = input;
+      this.pos = pos;
+      this.startTokenPos = pos;
+    }
+
+    abstract TokenizerState parse();
+  }
+
+  private static class ClassTokenizerState extends TokenizerState {
+
+    private ClassTokenizerState(List<TestArg> testArgs, String input, int pos) {
+      super(testArgs, input, pos);
+    }
+
+    @Override
+    TokenizerState parse() {
+      while (pos < input.length()) {
+        if (input.charAt(pos) == '#') {
+          String className = input.substring(startTokenPos, pos);
+          return new MethodTokenizerState(testArgs, input, pos + 1, className).parse();
+        }
+        if (input.charAt(pos) == ',') {
+          String className = input.substring(startTokenPos, pos);
+          testArgs.add(new TestArg(className));
+          return new ClassTokenizerState(testArgs, input, pos + 1);
+        }
+        pos++;
+      }
+      if (pos > startTokenPos) {
+        String className = input.substring(startTokenPos, pos);
+        testArgs.add(new TestArg(className));
+      }
+      // end of input
+      return null;
+    }
+  }
+
+  private static class MethodTokenizerState extends TokenizerState {
+
+    private final String className;
+
+    protected MethodTokenizerState(
+        List<TestArg> testArgs, String input, int pos, String className) {
+      super(testArgs, input, pos);
+      this.className = className;
+    }
+
+    @Override
+    TokenizerState parse() {
+      while (pos < input.length()) {
+        if (input.charAt(pos) == ',') {
+          String methodName = input.substring(startTokenPos, pos);
+          testArgs.add(new TestArg(className, methodName));
+          return new ClassTokenizerState(testArgs, input, pos + 1).parse();
+        }
+        if (input.charAt(pos) == '[') {
+          // Start of parameterized description, ignore all tokens until closed.
+          pos = input.indexOf(']', pos);
+          if (pos <= 0) {
+            throw new IllegalStateException("Could not find closing param ] in input " + input);
+          }
+        }
+        // some special parameterized runners also can have parentheses
+        if (input.charAt(pos) == '(') {
+          // Start of parameterized description, ignore all tokens until closed.
+          pos = input.indexOf(')', pos);
+          if (pos <= 0) {
+            throw new IllegalStateException("Could not find closing param ) in input " + input);
+          }
+        }
+        pos++;
+      }
+      if (pos > startTokenPos) {
+        String methodName = input.substring(startTokenPos, pos);
+        testArgs.add(new TestArg(className, methodName));
+      }
+      // end of input
+      return null;
+    }
+  }
+
+  static List<TestArg> parse(String input) {
+    List<TestArg> testargs = new ArrayList<>();
+    if (!TextUtils.isEmpty(input)) {
+      TokenizerState state = new ClassTokenizerState(testargs, input, 0);
+      while (state != null) {
+        state = state.parse();
+      }
+    }
+    return testargs;
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/DirectTestLoader.java b/runner/android_junit_runner/java/androidx/test/internal/runner/DirectTestLoader.java
new file mode 100644
index 000000000..16a68a0a2
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/DirectTestLoader.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.internal.runner;
+
+import android.util.Log;
+import org.junit.runner.Runner;
+import org.junit.runners.model.RunnerBuilder;
+
+/**
+ * A class for loading JUnit3 and JUnit4 test classes given a set of class names.
+ *
+ * <p>This variant of TestLoader will strictly report any errors loading the class.
+ */
+class DirectTestLoader extends TestLoader {
+
+  private static final String LOG_TAG = "DirectTestLoader";
+
+  private final ClassLoader classLoader;
+  private final RunnerBuilder runnerBuilder;
+
+  DirectTestLoader(ClassLoader classLoader, RunnerBuilder runnerBuilder) {
+    this.classLoader = classLoader;
+    this.runnerBuilder = runnerBuilder;
+  }
+
+  @Override
+  protected Runner doCreateRunner(String className) {
+    // this method should always return a non-null runner.
+    try {
+      Class<?> loadedClass = Class.forName(className, false, classLoader);
+      return runnerBuilder.safeRunnerForClass(loadedClass);
+      // Can get NoClassDefFoundError on Android L when a class extends a non-existent class.
+    } catch (ClassNotFoundException | LinkageError e) {
+      String msg = String.format("Failed loading specified test class '%s'", className);
+      Log.e(LOG_TAG, msg, e);
+      return new ErrorReportingRunner(className, new RuntimeException(msg, e));
+    }
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/EmptyTestRunner.java b/runner/android_junit_runner/java/androidx/test/internal/runner/EmptyTestRunner.java
new file mode 100644
index 000000000..d66edd732
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/EmptyTestRunner.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.runner;
+
+/**
+ * A special runner to indicate that the class is not a valid test because it has no methods.
+ *
+ * <p>Ideally we would just default to the upstream JUnit behavior to handle this case, but for
+ * historical reasons this condition has been ignored when class path scanning for tests, and
+ * changing it now may introduce painful migration for users. See b/203614578
+ */
+public class EmptyTestRunner extends ErrorReportingRunner {
+
+  public EmptyTestRunner(Class<?> clazz) {
+    super(
+        clazz.getName(),
+        new RuntimeException(
+            String.format("Invalid test class '%s': No test methods found", clazz.getName())));
+  }
+
+  public EmptyTestRunner(Class<?> clazz, Throwable t) {
+    super(clazz.getName(), t);
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/ErrorReportingRunner.java b/runner/android_junit_runner/java/androidx/test/internal/runner/ErrorReportingRunner.java
new file mode 100644
index 000000000..37ee0ac1f
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/ErrorReportingRunner.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.runner;
+
+import org.junit.runner.Description;
+import org.junit.runner.Runner;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunNotifier;
+
+/**
+ * A {@link Runner} to report a critical initialization failure with a test class that prevents any
+ * methods from being executed.
+ *
+ * <p>Patterned after org.junit.internal.runners.ErrorReportingRunner, which sadly is not public.
+ */
+public class ErrorReportingRunner extends Runner {
+  private final String className;
+  private final Throwable cause;
+
+  public ErrorReportingRunner(String className, Throwable e) {
+    this.className = className;
+    this.cause = e;
+  }
+
+  @Override
+  public Description getDescription() {
+    Description description = Description.createSuiteDescription(className);
+    description.addChild(describeCause());
+    return description;
+  }
+
+  private Description describeCause() {
+    // insert a child with 'initializationError' as display name for consistency with JUnit
+    return Description.createTestDescription(className, "initializationError");
+  }
+
+  @Override
+  public void run(RunNotifier notifier) {
+    Description description = describeCause();
+    notifier.fireTestStarted(description);
+    notifier.fireTestFailure(new Failure(description, cause));
+    notifier.fireTestFinished(description);
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/RunnerArgs.java b/runner/android_junit_runner/java/androidx/test/internal/runner/RunnerArgs.java
index 39a7c97b4..5c362a389 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/RunnerArgs.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/RunnerArgs.java
@@ -26,11 +26,12 @@
 import android.text.TextUtils;
 import android.util.Log;
 import androidx.annotation.VisibleForTesting;
+import androidx.test.platform.io.PlatformTestStorage;
+import androidx.test.platform.io.PlatformTestStorageRegistry;
 import androidx.test.runner.lifecycle.ApplicationLifecycleCallback;
 import androidx.test.runner.screenshot.ScreenCaptureProcessor;
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -73,6 +74,7 @@ public class RunnerArgs {
   static final String ARGUMENT_TIMEOUT = "timeout_msec";
   static final String ARGUMENT_TEST_FILE = "testFile";
   static final String ARGUMENT_NOT_TEST_FILE = "notTestFile";
+
   static final String ARGUMENT_DISABLE_ANALYTICS = "disableAnalytics";
   static final String ARGUMENT_APP_LISTENER = "appListener";
   static final String ARGUMENT_CLASS_LOADER = "classLoader";
@@ -90,7 +92,7 @@ public class RunnerArgs {
   static final String ARGUMENT_TEST_PLATFORM_MIGRATION = "temporary_testPlatformMigration";
   // Specifies whether the `androidx.test.services` service is installed on the device.
   // Supposed to be used by the test infrastructure only.
-  static final String ARGUMENT_USE_TEST_STORAGE_SERVICE = "useTestStorageService";
+  public static final String ARGUMENT_USE_TEST_STORAGE_SERVICE = "useTestStorageService";
   static final String ARGUMENT_SHELL_EXEC_BINDER_KEY = "shellExecBinderKey";
   static final String ARGUMENT_RUN_LISTENER_NEW_ORDER = "newRunListenerMode";
   static final String ARGUMENT_TESTS_REGEX = "tests_regex";
@@ -138,6 +140,10 @@ public class RunnerArgs {
   public final String testsRegEx;
   public final boolean testPlatformMigration;
 
+  public static long parseTestTimeout(Bundle args) {
+    return Builder.parseUnsignedLong(args.getString(ARGUMENT_TIMEOUT), ARGUMENT_TIMEOUT);
+  }
+
   /** Encapsulates a test class and optional method. */
   public static class TestArg {
     public final String testClassName;
@@ -240,6 +246,15 @@ public static class Builder {
     private boolean newRunListenerMode = false;
     private String testsRegEx = null;
     private boolean testPlatformMigration = false;
+    private final PlatformTestStorage testStorage;
+
+    public Builder() {
+      this(PlatformTestStorageRegistry.getInstance());
+    }
+
+    Builder(PlatformTestStorage testStorage) {
+      this.testStorage = testStorage;
+    }
 
     /**
      * Populate the arg data from the given Bundle.
@@ -248,6 +263,8 @@ public static class Builder {
      */
     public Builder fromBundle(Instrumentation instr, Bundle bundle) {
       this.debug = parseBoolean(bundle.getString(ARGUMENT_DEBUG));
+      this.useTestStorageService =
+          parseBoolean(bundle.getString(ARGUMENT_USE_TEST_STORAGE_SERVICE));
       this.delayInMillis =
           parseUnsignedInt(bundle.get(ARGUMENT_DELAY_IN_MILLIS), ARGUMENT_DELAY_IN_MILLIS);
       // parse test class args
@@ -257,10 +274,12 @@ public Builder fromBundle(Instrumentation instr, Bundle bundle) {
       this.testPackages.addAll(parseTestPackages(bundle.getString(ARGUMENT_TEST_PACKAGE)));
       this.notTestPackages.addAll(parseTestPackages(bundle.getString(ARGUMENT_NOT_TEST_PACKAGE)));
       // parse test file args, which may include class and package args
-      TestFileArgs testFileArgs = parseFromFile(instr, bundle.getString(ARGUMENT_TEST_FILE));
+      TestFileArgs testFileArgs =
+          parseTestFile(instr, useTestStorageService, bundle.getString(ARGUMENT_TEST_FILE));
       this.tests.addAll(testFileArgs.tests);
       this.testPackages.addAll(testFileArgs.packages);
-      TestFileArgs notTestFileArgs = parseFromFile(instr, bundle.getString(ARGUMENT_NOT_TEST_FILE));
+      TestFileArgs notTestFileArgs =
+          parseTestFile(instr, useTestStorageService, bundle.getString(ARGUMENT_NOT_TEST_FILE));
       this.notTests.addAll(notTestFileArgs.tests);
       this.notTestPackages.addAll(notTestFileArgs.packages);
       this.listeners.addAll(
@@ -273,7 +292,7 @@ public Builder fromBundle(Instrumentation instr, Bundle bundle) {
       this.testSize = bundle.getString(ARGUMENT_TEST_SIZE);
       this.annotations.addAll(parseStrings(bundle.getString(ARGUMENT_ANNOTATION)));
       this.notAnnotations.addAll(parseStrings(bundle.getString(ARGUMENT_NOT_ANNOTATION)));
-      this.testTimeout = parseUnsignedLong(bundle.getString(ARGUMENT_TIMEOUT), ARGUMENT_TIMEOUT);
+      this.testTimeout = parseTestTimeout(bundle);
       this.numShards = parseUnsignedInt(bundle.get(ARGUMENT_NUM_SHARDS), ARGUMENT_NUM_SHARDS);
       this.shardIndex = parseUnsignedInt(bundle.get(ARGUMENT_SHARD_INDEX), ARGUMENT_SHARD_INDEX);
       this.logOnly = parseBoolean(bundle.getString(ARGUMENT_LOG_ONLY));
@@ -295,8 +314,6 @@ public Builder fromBundle(Instrumentation instr, Bundle bundle) {
           parseBoolean(bundle.getString(ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR));
       this.testDiscoveryService = bundle.getString(ARGUMENT_ORCHESTRATOR_DISCOVERY_SERVICE);
       this.testRunEventsService = bundle.getString(ARGUMENT_ORCHESTRATOR_RUN_EVENTS_SERVICE);
-      this.useTestStorageService =
-          parseBoolean(bundle.getString(ARGUMENT_USE_TEST_STORAGE_SERVICE));
       this.targetProcess = bundle.getString(ARGUMENT_TARGET_PROCESS);
       this.screenCaptureProcessors.addAll(
           parseLoadAndInstantiateClasses(
@@ -310,6 +327,36 @@ public Builder fromBundle(Instrumentation instr, Bundle bundle) {
       return this;
     }
 
+    private TestFileArgs parseTestFile(
+        Instrumentation instr, boolean useStorageService, String filePath) {
+      if (filePath == null) {
+        return new TestFileArgs();
+      }
+
+      if (useStorageService) {
+        String localFilePath = filePath.startsWith("/") ? filePath.substring(1) : filePath;
+        try (BufferedReader reader =
+            new BufferedReader(new InputStreamReader(testStorage.openInputFile(localFilePath)))) {
+          return parseFromFileStream(reader);
+        } catch (IOException e) {
+          Log.w(
+              LOG_TAG,
+              String.format(
+                  "Could not read test file from TestStorage %s. "
+                      + "Attempting to read from local file system",
+                  filePath),
+              e);
+          // fall through
+        }
+      }
+
+      try (BufferedReader reader = openFile(instr, filePath)) {
+        return parseFromFileStream(reader);
+      } catch (IOException e) {
+        throw new IllegalArgumentException("Could not read test file " + filePath, e);
+      }
+    }
+
     /** Populate the arg data from the instrumentation:metadata attribute in Manifest. */
     public Builder fromManifest(Instrumentation instr) {
       PackageManager pm = instr.getContext().getPackageManager();
@@ -409,13 +456,7 @@ private static List<String> parseTestPackages(String packagesArg) {
      * @return list of {@link TestArg} data, empty list if input is null
      */
     private List<TestArg> parseTestClasses(String classesArg) {
-      List<TestArg> tests = new ArrayList<TestArg>();
-      if (classesArg != null) {
-        for (String className : classesArg.split(CLASS_SEPARATOR)) {
-          tests.add(parseTestClass(className));
-        }
-      }
-      return tests;
+      return ClassesArgTokenizer.parse(classesArg);
     }
 
     /**
@@ -451,21 +492,8 @@ private static TestArg parseTestClass(String testClassName) {
       }
     }
 
-    /**
-     * Parse and load the packages, classes and methods of a test file.
-     *
-     * @param instr instrumentation handle.
-     * @param filePath path to test file containing package names, full package names of test
-     *     classes and optionally methods to add.
-     */
-    private TestFileArgs parseFromFile(Instrumentation instr, String filePath) {
-      final TestFileArgs args = new TestFileArgs();
-      if (filePath == null) {
-        return args;
-      }
-      BufferedReader reader = null;
-      try {
-        reader = openFile(instr, filePath);
+    private TestFileArgs parseFromFileStream(BufferedReader reader) throws IOException {
+      TestFileArgs args = new TestFileArgs();
         String line;
         while ((line = reader.readLine()) != null) {
           if (isClassOrMethod(line)) {
@@ -475,19 +503,6 @@ private TestFileArgs parseFromFile(Instrumentation instr, String filePath) {
             args.packages.addAll(parseTestPackages(line));
           }
         }
-      } catch (FileNotFoundException e) {
-        throw new IllegalArgumentException("testfile not found: " + filePath, e);
-      } catch (IOException e) {
-        throw new IllegalArgumentException("Could not read test file " + filePath, e);
-      } finally {
-        if (reader != null) {
-          try {
-            reader.close();
-          } catch (IOException e) {
-            /* ignore */
-          }
-        }
-      }
       return args;
     }
 
@@ -670,4 +685,5 @@ public RunnerArgs build() {
       return new RunnerArgs(this);
     }
   }
+
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/ScanningTestLoader.java b/runner/android_junit_runner/java/androidx/test/internal/runner/ScanningTestLoader.java
new file mode 100644
index 000000000..b4fe9a9ad
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/ScanningTestLoader.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.internal.runner;
+
+import android.util.Log;
+import java.lang.reflect.Modifier;
+import org.junit.runner.Runner;
+import org.junit.runners.model.RunnerBuilder;
+
+/**
+ * A class for loading JUnit3 and JUnit4 test classes given a set of potential class names.
+ *
+ * <p>This is a lenient loader intended for class path scanning cases, where if a class cannot be
+ * loaded or is not a test it will be ignored.
+ */
+class ScanningTestLoader extends TestLoader {
+
+  private static final String LOG_TAG = "ScanningTestLoader";
+
+  private final ClassLoader classLoader;
+  private final RunnerBuilder runnerBuilder;
+
+  ScanningTestLoader(ClassLoader classLoader, RunnerBuilder runnerBuilder) {
+    this.classLoader = classLoader;
+    this.runnerBuilder = runnerBuilder;
+  }
+
+  @Override
+  protected Runner doCreateRunner(String className) {
+    try {
+      Class<?> loadedClass = Class.forName(className, false, classLoader);
+      if (Modifier.isAbstract(loadedClass.getModifiers())) {
+        logDebug("Skipping abstract class %s: not a test", loadedClass.getName());
+        return null;
+      }
+      Runner runner = runnerBuilder.runnerForClass(loadedClass);
+      if (runner instanceof EmptyTestRunner) {
+        logDebug("Skipping class %s: class with no test methods", loadedClass.getName());
+        return null;
+      }
+      return runner;
+    } catch (Throwable e) {
+      Log.w(LOG_TAG, String.format("Could not load class: %s", className), e);
+      return null;
+    }
+  }
+
+  /**
+   * Utility method for logging debug messages. Only actually logs a message if LOG_TAG is marked as
+   * loggable to limit log spam during normal use.
+   */
+  private static void logDebug(String msg, Object... objects) {
+    if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
+      Log.d(LOG_TAG, String.format(msg, objects));
+    }
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/TestExecutor.java b/runner/android_junit_runner/java/androidx/test/internal/runner/TestExecutor.java
index f5bd77966..b3c1016f5 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/TestExecutor.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/TestExecutor.java
@@ -15,20 +15,23 @@
  */
 package androidx.test.internal.runner;
 
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
 import android.app.Instrumentation;
 import android.os.Bundle;
-import android.util.Log;
 import androidx.test.internal.runner.listener.InstrumentationRunListener;
 import androidx.test.internal.util.Checks;
+import androidx.test.services.events.internal.StackTrimmer;
+import androidx.tracing.Trace;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
-import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
 /**
@@ -36,7 +39,6 @@
  * executes the test using upstream JUnit
  */
 public final class TestExecutor {
-  private static final String LOG_TAG = "TestExecutor";
 
   private final List<RunListener> listeners;
   private final Instrumentation instr;
@@ -46,34 +48,45 @@ private TestExecutor(Builder builder) {
     instr = builder.instr;
   }
 
-  /** Execute the tests */
+  /**
+   * Execute the tests and report the test results.
+   *
+   * <p>If an error occurred during the test execution, the exception will be thrown, and it's the
+   * caller's responsibility to handle the exception properly.
+   */
   public Bundle execute(Request request) {
-    Bundle resultBundle = new Bundle();
-    Result junitResults = new Result();
+    Trace.beginSection("execute tests");
     try {
-      JUnitCore testRunner = new JUnitCore();
-      setUpListeners(testRunner);
-      junitResults = testRunner.run(request);
-    } catch (Throwable t) {
-      final String msg = "Fatal exception when running tests";
-      Log.e(LOG_TAG, msg, t);
-      junitResults.getFailures().add(new Failure(Description.createSuiteDescription(msg), t));
+      return execute(new JUnitCore(), request);
     } finally {
-      ByteArrayOutputStream summaryStream = new ByteArrayOutputStream();
-      // create the stream used to output summary data to the user
-      PrintStream summaryWriter = new PrintStream(summaryStream);
+      Trace.endSection();
+    }
+  }
+
+  Bundle execute(JUnitCore junitRunner, Request request) {
+    Bundle resultBundle = new Bundle();
+    setUpListeners(junitRunner);
+    Result junitResults = junitRunner.run(request);
+
+    ByteArrayOutputStream summaryStream = new ByteArrayOutputStream();
+    // create the stream used to output summary data to the user
+    try (PrintStream summaryWriter = new PrintStream(summaryStream)) {
       reportRunEnded(listeners, summaryWriter, resultBundle, junitResults);
-      summaryWriter.close();
+    }
+    try {
+      // ByteArrayOutputStream.toString(Charset) requires API level 33
+      String summaryOutput = StackTrimmer.getTrimmedSummary(summaryStream.toString(UTF_8.name()));
       resultBundle.putString(
-          Instrumentation.REPORT_KEY_STREAMRESULT, String.format("\n%s", summaryStream.toString()));
+          Instrumentation.REPORT_KEY_STREAMRESULT, String.format("\n%s", summaryOutput));
+      return resultBundle;
+    } catch (UnsupportedEncodingException e) {
+      throw new RuntimeException("UTF-8 encoding not supported?", e);
     }
-    return resultBundle;
   }
 
   /** Initialize listeners and add them to the JUnitCore runner */
   private void setUpListeners(JUnitCore testRunner) {
     for (RunListener listener : listeners) {
-      Log.d(LOG_TAG, "Adding listener " + listener.getClass().getName());
       testRunner.addListener(listener);
       if (listener instanceof InstrumentationRunListener) {
         ((InstrumentationRunListener) listener).setInstrumentation(instr);
@@ -109,7 +122,7 @@ public Builder(Instrumentation instr) {
      * @return the {@link androidx.test.internal.runner.TestExecutor.Builder}
      */
     public Builder addRunListener(RunListener listener) {
-      listeners.add(listener);
+      listeners.add(checkNotNull(listener));
       return this;
     }
 
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/TestLoader.java b/runner/android_junit_runner/java/androidx/test/internal/runner/TestLoader.java
index 879a272e7..64964a960 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/TestLoader.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/TestLoader.java
@@ -16,156 +16,57 @@
 
 package androidx.test.internal.runner;
 
-import android.util.Log;
-import androidx.annotation.VisibleForTesting;
-import androidx.test.internal.runner.junit3.AndroidJUnit3Builder;
-import java.lang.reflect.Modifier;
+import androidx.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import org.junit.runner.Description;
 import org.junit.runner.Runner;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.RunnerBuilder;
 
-/** A class for loading JUnit3 and JUnit4 test classes given a set of potential class names. */
-class TestLoader {
-
-  private static final String LOG_TAG = "TestLoader";
-
-  private final ClassLoader classLoader;
-  private final RunnerBuilder runnerBuilder;
-
-  private final Map<String, Runner> runnersMap = new LinkedHashMap<>();
-
-  static TestLoader testLoader(
-      ClassLoader classLoader, RunnerBuilder runnerBuilder, boolean scanningPath) {
-    // If scanning then wrap the supplied RunnerBuilder with one that will ignore abstract
-    // classes.
-    if (scanningPath) {
-      runnerBuilder = new ScanningRunnerBuilder(runnerBuilder);
-    }
-
-    if (null == classLoader) {
-      classLoader = TestLoader.class.getClassLoader();
-    }
+/**
+ * An abstract class for loading JUnit3 and JUnit4 test classes given a set of potential class
+ * names.
+ */
+public abstract class TestLoader {
 
-    return new TestLoader(classLoader, runnerBuilder);
-  }
+  /** Factory for {@link TestLoader} */
+  public static class Factory {
 
-  private TestLoader(ClassLoader classLoader, RunnerBuilder runnerBuilder) {
-    this.classLoader = classLoader;
-    this.runnerBuilder = runnerBuilder;
-  }
+    private Factory() {}
 
-  private void doCreateRunner(String className, boolean isScanningPath) {
-    if (runnersMap.containsKey(className)) {
-      // Class with the same name was already loaded, return
-      return;
-    }
+    public static TestLoader create(
+        @Nullable ClassLoader classLoader, RunnerBuilder runnerBuilder, boolean scanningPath) {
 
-    Runner runner;
-    try {
-      Class<?> loadedClass = Class.forName(className, false, classLoader);
-      runner = runnerBuilder.safeRunnerForClass(loadedClass);
-      if (null == runner) {
-        logDebug(String.format("Skipping class %s: not a test", loadedClass.getName()));
-      } else if (runner == AndroidJUnit3Builder.NOT_A_VALID_TEST) {
-        logDebug(String.format("Skipping class %s: not a valid test", loadedClass.getName()));
-        runner = null;
+      if (classLoader == null) {
+        classLoader = TestLoader.class.getClassLoader();
       }
-      // Can get NoClassDefFoundError on Android L when a class extends a non-existent class.
-    } catch (ClassNotFoundException | LinkageError e) {
-      String errMsg = String.format("Could not find class: %s", className);
-      Log.e(LOG_TAG, errMsg);
-      Description description = Description.createSuiteDescription(className);
-      Failure failure = new Failure(description, e);
-      runner = null;
-      if (!isScanningPath) {
-        // If we're not scanning all paths it means that a user provided an explicit class
-        // via the -e com.foo.ClassName runner argument. Therefore, treat it as a valid
-        // test case and report failure accordingly.
-        runner = new UnloadableClassRunner(description, failure);
-      }
-    }
-
-    if (runner != null) {
-      runnersMap.put(className, runner);
-    }
-  }
 
-  /**
-   * Get the {@link Collection) of {@link Runner runners}.
-   */
-  List<Runner> getRunnersFor(Collection<String> classNames, boolean isScanningPath) {
-    for (String className : classNames) {
-      doCreateRunner(className, isScanningPath);
+      if (scanningPath) {
+        return new ScanningTestLoader(classLoader, runnerBuilder);
+      } else {
+        return new DirectTestLoader(classLoader, runnerBuilder);
+      }
     }
-    return new ArrayList<>(runnersMap.values());
   }
 
-  /**
-   * Utility method for logging debug messages. Only actually logs a message if LOG_TAG is marked as
-   * loggable to limit log spam during normal use.
-   */
-  private static void logDebug(String msg) {
-    if (Log.isLoggable(LOG_TAG, Log.DEBUG)) {
-      Log.d(LOG_TAG, msg);
-    }
-  }
+  protected abstract Runner doCreateRunner(String className);
 
   /**
-   * Wrapper around a {@link RunnerBuilder} that will reject all abstract classes.
-   *
-   * <p>This is only used when loading classes found while scanning the class path.
+   * Get the {@link Collection) of {@link Runner runners}.
    */
-  private static class ScanningRunnerBuilder extends RunnerBuilder {
+  public List<Runner> getRunnersFor(Collection<String> classNames) {
+    final Map<String, Runner> runnersMap = new LinkedHashMap<>();
 
-    private final RunnerBuilder runnerBuilder;
-
-    ScanningRunnerBuilder(RunnerBuilder runnerBuilder) {
-      this.runnerBuilder = runnerBuilder;
-    }
-
-    @Override
-    public Runner runnerForClass(Class<?> testClass) throws Throwable {
-      // Ignore abstract classes. This could theoretically ignore test classes that should be
-      // run, as some RunnerBuilders e.g. Suite do not strictly require the class to be
-      // instantiable. However, they have always been ignored during scanning and changing
-      // that would cause lots of problems.
-      if (Modifier.isAbstract(testClass.getModifiers())) {
-        logDebug(String.format("Skipping abstract class %s: not a test", testClass.getName()));
-        return null;
+    for (String className : classNames) {
+      if (!runnersMap.containsKey(className)) {
+        Runner runner = doCreateRunner(className);
+        if (runner != null) {
+          runnersMap.put(className, runner);
+        }
       }
-
-      return runnerBuilder.runnerForClass(testClass);
-    }
-  }
-
-  @VisibleForTesting
-  static class UnloadableClassRunner extends Runner {
-
-    private final Description description;
-    private final Failure failure;
-
-    UnloadableClassRunner(Description description, Failure failure) {
-      this.description = description;
-      this.failure = failure;
-    }
-
-    @Override
-    public Description getDescription() {
-      return description;
-    }
-
-    @Override
-    public void run(RunNotifier notifier) {
-      notifier.fireTestStarted(description);
-      notifier.fireTestFailure(failure);
-      notifier.fireTestFinished(description);
     }
+    return new ArrayList<>(runnersMap.values());
   }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/TestRequestBuilder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/TestRequestBuilder.java
index 2f7420c5a..0ed9bac6f 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/TestRequestBuilder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/TestRequestBuilder.java
@@ -17,28 +17,32 @@
 package androidx.test.internal.runner;
 
 import android.app.Instrumentation;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import androidx.annotation.VisibleForTesting;
+import androidx.test.filters.AbstractFilter;
+import androidx.test.filters.CustomFilter;
 import androidx.test.filters.RequiresDevice;
-import androidx.test.filters.SdkSuppress;
+import androidx.test.filters.SdkSuppressFilter;
+import androidx.test.filters.ShardingFilter;
+import androidx.test.filters.TestsRegExFilter;
 import androidx.test.internal.runner.ClassPathScanner.ChainedClassNameFilter;
 import androidx.test.internal.runner.ClassPathScanner.ExcludeClassNamesFilter;
 import androidx.test.internal.runner.ClassPathScanner.ExcludePackageNameFilter;
 import androidx.test.internal.runner.ClassPathScanner.ExternalClassNameFilter;
 import androidx.test.internal.runner.ClassPathScanner.InclusivePackageNamesFilter;
-import androidx.test.internal.runner.filters.ParentFilter;
-import androidx.test.internal.runner.filters.TestsRegExFilter;
-import androidx.test.internal.util.AndroidRunnerParams;
-import androidx.test.internal.util.Checks;
+import androidx.tracing.Trace;
 import java.io.IOException;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -60,17 +64,6 @@
 public class TestRequestBuilder {
   private static final String TAG = "TestRequestBuilder";
 
-  // Excluded test packages
-  private static final String[] DEFAULT_EXCLUDED_PACKAGES = {
-    "junit",
-    "org.junit",
-    "org.hamcrest",
-    "org.mockito", // exclude Mockito for performance and to prevent JVM related errors
-    "androidx.test.internal.runner.junit3", // always skip AndroidTestSuite
-    "org.jacoco", // exclude Jacoco to prevent class loading issues
-    "net.bytebuddy" // exclude byte buddy to prevent Mockito 2.0 class loading issues
-  };
-
   static final String MISSING_ARGUMENTS_MSG =
       "Must provide either classes to run, or paths to scan";
   static final String AMBIGUOUS_ARGUMENTS_MSG =
@@ -79,7 +72,7 @@ public class TestRequestBuilder {
   private final List<String> pathsToScan = new ArrayList<>();
   private Set<String> includedPackages = new HashSet<>();
   private Set<String> excludedPackages = new HashSet<>();
-  private Set<String> includedClasses = new HashSet<>();
+  private Set<String> includedClasses = new LinkedHashSet<>();
   private Set<String> excludedClasses = new HashSet<>();
   private ClassAndMethodFilter classMethodFilter = new ClassAndMethodFilter();
   private final TestsRegExFilter testsRegExFilter = new TestsRegExFilter();
@@ -88,13 +81,11 @@ public class TestRequestBuilder {
           .intersect(new SdkSuppressFilter())
           .intersect(new RequiresDeviceFilter())
           .intersect(classMethodFilter)
-          .intersect(testsRegExFilter);
+          .intersect(testsRegExFilter)
+          .intersect(new CustomFilters());
   private List<Class<? extends RunnerBuilder>> customRunnerBuilderClasses = new ArrayList<>();
   private boolean skipExecution = false;
-  private final DeviceBuild deviceBuild;
   private long perTestTimeout = 0;
-  private final Instrumentation instr;
-  private final Bundle argsBundle;
   private ClassLoader classLoader;
 
   /**
@@ -105,41 +96,8 @@ public class TestRequestBuilder {
    */
   private boolean ignoreSuiteMethods = false;
 
-  /**
-   * Accessor interface for retrieving device build properties.
-   *
-   * <p>Used so unit tests can mock calls
-   */
-  interface DeviceBuild {
-    /** Returns the SDK API level for current device. */
-    int getSdkVersionInt();
-
-    /** Returns the hardware type of the current device. */
-    String getHardware();
-
-    /** Returns the version code name of the current device. */
-    String getCodeName();
-  }
-
-  private static class DeviceBuildImpl implements DeviceBuild {
-    @Override
-    public int getSdkVersionInt() {
-      return android.os.Build.VERSION.SDK_INT;
-    }
-
-    @Override
-    public String getHardware() {
-      return android.os.Build.HARDWARE;
-    }
-
-    @Override
-    public String getCodeName() {
-      return android.os.Build.VERSION.CODENAME;
-    }
-  }
-
   /** Filter that only runs tests whose method or class has been annotated with given filter. */
-  private static class AnnotationInclusionFilter extends ParentFilter {
+  private static class AnnotationInclusionFilter extends AbstractFilter {
 
     private final Class<? extends Annotation> annotationClass;
 
@@ -160,10 +118,6 @@ protected boolean evaluateTest(Description description) {
           || (testClass != null && testClass.isAnnotationPresent(annotationClass));
     }
 
-    protected Class<? extends Annotation> getAnnotationClass() {
-      return annotationClass;
-    }
-
     /** {@inheritDoc} */
     @Override
     public String describe() {
@@ -177,7 +131,7 @@ public String describe() {
    * <p>Will match if test method has given size annotation, or class does, but only if method does
    * not have any other size annotations. ie method size annotation overrides class size annotation.
    */
-  private static class SizeFilter extends ParentFilter {
+  private static class SizeFilter extends AbstractFilter {
 
     private final TestSize testSize;
 
@@ -210,7 +164,7 @@ protected boolean evaluateTest(Description description) {
   }
 
   /** Filter out tests whose method or class has been annotated with given filter. */
-  private static class AnnotationExclusionFilter extends ParentFilter {
+  private static class AnnotationExclusionFilter extends AbstractFilter {
 
     private final Class<? extends Annotation> annotationClass;
 
@@ -245,7 +199,8 @@ static Suite createSuite(List<Runner> runners) {
             "Internal Error: "
                 + Suite.class.getName()
                 + "(Class<?>, List<Runner>) should never throw an "
-                + "InitializationError when passed a null Class");
+                + "InitializationError when passed a null Class",
+            e);
       }
     }
 
@@ -254,38 +209,38 @@ static Suite createSuite(List<Runner> runners) {
     }
   }
 
-  private class SdkSuppressFilter extends ParentFilter {
-
+  private static class CustomFilters extends AbstractFilter {
     @Override
     protected boolean evaluateTest(Description description) {
-      final SdkSuppress sdkSuppress = getAnnotationForTest(description);
-      if (sdkSuppress != null) {
-        if ((getDeviceSdkInt() >= sdkSuppress.minSdkVersion()
-                && getDeviceSdkInt() <= sdkSuppress.maxSdkVersion())
-            || getDeviceCodeName().equals(sdkSuppress.codeName())) {
-          return true; // run the test
+      Collection<Annotation> allAnnotations = description.getAnnotations();
+
+      for (Annotation a : allAnnotations) {
+        CustomFilter filter = a.annotationType().getAnnotation(CustomFilter.class);
+        if (filter != null) {
+          // @CustomFilter is present on this annotation, initialize filter class and check if this
+          // test should run
+          Class<? extends AbstractFilter> filterClass = filter.filterClass();
+          try {
+            if (!filterClass.getConstructor().newInstance().shouldRun(description)) {
+              return false; // skip the test
+            }
+          } catch (NoSuchMethodException e) {
+            throw new IllegalArgumentException(
+                "Must have no argument constructor for class " + filterClass.getName(), e);
+          } catch (ClassCastException e) {
+            throw new IllegalArgumentException(
+                filterClass.getName() + " does not extend androidx.test.filters.AbstractFilter", e);
+          } catch (InstantiationException | InvocationTargetException | IllegalAccessException e) {
+            throw new IllegalArgumentException("Failed to create: " + filterClass.getName(), e);
+          }
         }
-        return false; // don't run the test
       }
-      return true; // no SdkSuppress, run the test
+      return true; // run the test
     }
 
-    private SdkSuppress getAnnotationForTest(Description description) {
-      final SdkSuppress s = description.getAnnotation(SdkSuppress.class);
-      if (s != null) {
-        return s;
-      }
-      final Class<?> testClass = description.getTestClass();
-      if (testClass != null) {
-        return testClass.getAnnotation(SdkSuppress.class);
-      }
-      return null;
-    }
-
-    /** {@inheritDoc} */
     @Override
     public String describe() {
-      return String.format("skip tests annotated with SdkSuppress if necessary");
+      return "skip tests annotated with custom filters if necessary";
     }
   }
 
@@ -311,7 +266,7 @@ class RequiresDeviceFilter extends AnnotationExclusionFilter {
     protected boolean evaluateTest(Description description) {
       if (!super.evaluateTest(description)) {
         // annotation is present - check if device is an emulator
-        return !emulatorHardwareNames.contains(getDeviceHardware());
+        return !emulatorHardwareNames.contains(Build.HARDWARE);
       }
       return true;
     }
@@ -323,34 +278,6 @@ public String describe() {
     }
   }
 
-  private static class ShardingFilter extends Filter {
-    private final int numShards;
-    private final int shardIndex;
-
-    ShardingFilter(int numShards, int shardIndex) {
-      this.numShards = numShards;
-      this.shardIndex = shardIndex;
-    }
-
-    @Override
-    public boolean shouldRun(Description description) {
-      if (description.isTest()) {
-        return (Math.abs(description.hashCode()) % numShards) == shardIndex;
-      }
-
-      // The description is a suite, so assume that it can be run so that filtering is
-      // applied to its children. If after filtering it has no children then it will be
-      // automatically filtered out.
-      return true;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String describe() {
-      return String.format("Shard %s of %s shards", shardIndex, numShards);
-    }
-  }
-
   /**
    * A {@link Request} that doesn't report an error if all tests are filtered out. Done for
    * consistency with InstrumentationTestRunner.
@@ -391,7 +318,7 @@ public void run(RunNotifier notifier) {
   }
 
   /** A {@link Filter} to support the ability to filter out multiple class#method combinations. */
-  private static class ClassAndMethodFilter extends ParentFilter {
+  private static class ClassAndMethodFilter extends AbstractFilter {
 
     private Map<String, MethodFilter> methodFilters = new HashMap<>();
 
@@ -435,7 +362,7 @@ public void removeMethod(String className, String methodName) {
   }
 
   /** A {@link Filter} used to filter out desired test methods from a given class */
-  private static class MethodFilter extends ParentFilter {
+  private static class MethodFilter extends AbstractFilter {
 
     private final String className;
     private Set<String> includedMethods = new HashSet<>();
@@ -503,29 +430,26 @@ public void addExclusionMethod(String methodName) {
    *
    * @param instr the {@link Instrumentation} to pass to applicable tests
    * @param bundle the {@link Bundle} to pass to applicable tests
+   * @deprecated use {@link TestRequestBuilder()}
    */
+  @Deprecated
   public TestRequestBuilder(Instrumentation instr, Bundle bundle) {
-    this(new DeviceBuildImpl(), instr, bundle);
+    this();
   }
 
-  /** Alternate TestRequestBuilder constructor that accepts a custom DeviceBuild */
-  @VisibleForTesting
-  TestRequestBuilder(DeviceBuild deviceBuildAccessor, Instrumentation instr, Bundle bundle) {
-    deviceBuild = Checks.checkNotNull(deviceBuildAccessor);
-    this.instr = Checks.checkNotNull(instr);
-    argsBundle = Checks.checkNotNull(bundle);
-
+  /** Creates a TestRequestBuilder */
+  public TestRequestBuilder() {
     maybeAddLegacySuppressFilter();
   }
 
-  // add legacy Suppress filer iff it is on classpath
+  // add legacy Suppress filter iff it is on classpath
   private void maybeAddLegacySuppressFilter() {
     try {
       Class<? extends Annotation> legacySuppressClass =
           (Class<? extends Annotation>)
               Class.forName("android.test.suitebuilder.annotation.Suppress");
       filter = filter.intersect(new AnnotationExclusionFilter(legacySuppressClass));
-    } catch (ClassNotFoundException e) {
+    } catch (ClassNotFoundException | LinkageError e) {
       // ignore
     }
   }
@@ -758,7 +682,7 @@ public TestRequestBuilder addFromRunnerArgs(RunnerArgs runnerArgs) {
         && runnerArgs.shardIndex < runnerArgs.numShards) {
       addShardingFilter(runnerArgs.numShards, runnerArgs.shardIndex);
     }
-    if (runnerArgs.logOnly) {
+    if (runnerArgs.logOnly || runnerArgs.listTestsForOrchestrator) {
       setSkipExecution(true);
     }
     if (runnerArgs.classLoader != null) {
@@ -779,33 +703,45 @@ public TestRequestBuilder addFromRunnerArgs(RunnerArgs runnerArgs) {
    * @throws java.lang.IllegalArgumentException if provided set of data is not valid
    */
   public Request build() {
-    includedPackages.removeAll(excludedPackages);
-    includedClasses.removeAll(excludedClasses);
-    validate(includedClasses);
+    Trace.beginSection("build test request");
+    try {
+      includedPackages.removeAll(excludedPackages);
+      validate(includedClasses);
 
-    boolean scanningPath = includedClasses.isEmpty();
+      boolean scanningPath = includedClasses.isEmpty();
 
-    // If scanning then suite methods are not supported.
-    boolean ignoreSuiteMethods = this.ignoreSuiteMethods || scanningPath;
+      // If scanning then suite methods are not supported.
+      boolean ignoreSuiteMethods = this.ignoreSuiteMethods || scanningPath;
 
-    AndroidRunnerParams runnerParams =
-        new AndroidRunnerParams(instr, argsBundle, perTestTimeout, ignoreSuiteMethods);
-    RunnerBuilder runnerBuilder = getRunnerBuilder(runnerParams, scanningPath);
+      RunnerBuilder runnerBuilder = getRunnerBuilder(ignoreSuiteMethods, perTestTimeout);
 
-    TestLoader loader = TestLoader.testLoader(classLoader, runnerBuilder, scanningPath);
-    Collection<String> classNames;
-    if (scanningPath) {
-      // no class restrictions have been specified. Load all classes.
-      classNames = getClassNamesFromClassPath();
-    } else {
-      classNames = includedClasses;
-    }
+      TestLoader loader = TestLoader.Factory.create(classLoader, runnerBuilder, scanningPath);
+      Collection<String> classNames;
+      if (scanningPath) {
+        // no class restrictions have been specified. Load all classes.
+        Log.d(TAG, "Using class path scanning to discover tests");
+        classNames = getClassNamesFromClassPath();
+      } else {
+        // If the set of excludedClasses is equal to the set of includedClasses, no tests should
+        // run (that's what includeMethods and excludeMethods do currently).
+        // E.g.,
+        // 1. adb shell am instrument -w -e class com.android.foo.FooTest#testFoo -e notClass
+        // com.android.foo.FooTest#testFoo com.android.foo/androidx.test.runner.AndroidJUnitRunner
+        // 2. adb shell am instrument -w -e class com.android.foo.FooTest -e notClass
+        // com.android.foo.FooTest com.android.foo/androidx.test.runner.AndroidJUnitRunner
+        // should perform the same result (no tests run).
+        includedClasses.removeAll(excludedClasses);
+        classNames = includedClasses;
+      }
 
-    List<Runner> runners = loader.getRunnersFor(classNames, scanningPath);
+      List<Runner> runners = loader.getRunnersFor(classNames);
 
-    Suite suite = ExtendedSuite.createSuite(runners);
-    Request request = Request.runner(suite);
-    return new LenientFilterRequest(request, filter);
+      Suite suite = ExtendedSuite.createSuite(runners);
+      Request request = Request.runner(suite);
+      return new LenientFilterRequest(request, filter);
+    } finally {
+      Trace.endSection();
+    }
   }
 
   /** Validate that the set of options provided to this builder are valid and not conflicting */
@@ -820,19 +756,18 @@ private void validate(Set<String> classNames) {
   /**
    * Get the {@link RunnerBuilder} to use to create the {@link Runner} instances.
    *
-   * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
-   * @param scanningPath true if being used to build {@link Runner} from classes found while
-   *     scanning the path; requires extra checks to avoid unnecessary errors.
    * @return a {@link RunnerBuilder}.
    */
-  private RunnerBuilder getRunnerBuilder(AndroidRunnerParams runnerParams, boolean scanningPath) {
+  private RunnerBuilder getRunnerBuilder(boolean shouldIgnoreSuiteMethods, long perTestTimeout) {
     RunnerBuilder builder;
     if (skipExecution) {
       // If all that is needed is the list of tests then replace the Runner which will
       // run the test with one that will simply fire events for each of the tests.
-      builder = new AndroidLogOnlyBuilder(runnerParams, scanningPath, customRunnerBuilderClasses);
+      builder = new AndroidLogOnlyBuilder(shouldIgnoreSuiteMethods, customRunnerBuilderClasses);
     } else {
-      builder = new AndroidRunnerBuilder(runnerParams, scanningPath, customRunnerBuilderClasses);
+      builder =
+          new AndroidRunnerBuilder(
+              shouldIgnoreSuiteMethods, perTestTimeout, customRunnerBuilderClasses);
     }
     return builder;
   }
@@ -847,7 +782,7 @@ private Collection<String> getClassNamesFromClassPath() {
     ChainedClassNameFilter filter = new ChainedClassNameFilter();
     // exclude inner classes
     filter.add(new ExternalClassNameFilter());
-    for (String pkg : DEFAULT_EXCLUDED_PACKAGES) {
+    for (String pkg : ClassPathScanner.getDefaultExcludedPackages()) {
       // Add the test packages to the exclude list unless they were explictly included.
       if (!includedPackages.contains(pkg)) {
         excludedPackages.add(pkg);
@@ -882,23 +817,11 @@ private Class<? extends Annotation> loadAnnotationClass(String className) {
     try {
       Class<?> clazz = Class.forName(className);
       return (Class<? extends Annotation>) clazz;
-    } catch (ClassNotFoundException e) {
+    } catch (ClassNotFoundException | LinkageError e) {
       Log.e(TAG, String.format("Could not find annotation class: %s", className));
     } catch (ClassCastException e) {
       Log.e(TAG, String.format("Class %s is not an annotation", className));
     }
     return null;
   }
-
-  private int getDeviceSdkInt() {
-    return deviceBuild.getSdkVersionInt();
-  }
-
-  private String getDeviceHardware() {
-    return deviceBuild.getHardware();
-  }
-
-  private String getDeviceCodeName() {
-    return deviceBuild.getCodeName();
-  }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/InstrumentationCoverageReporter.java b/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/InstrumentationCoverageReporter.java
index ae972073b..0d3c0d0ad 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/InstrumentationCoverageReporter.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/InstrumentationCoverageReporter.java
@@ -16,8 +16,8 @@
 package androidx.test.internal.runner.coverage;
 
 import android.app.Instrumentation;
-import androidx.annotation.Nullable;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.platform.io.PlatformTestStorage;
 import androidx.test.services.storage.TestStorage;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/package-info.java
new file mode 100644
index 000000000..5f7db6a18
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/coverage/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.coverage;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/filters/ParentFilter.java b/runner/android_junit_runner/java/androidx/test/internal/runner/filters/ParentFilter.java
deleted file mode 100644
index 869f69611..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/filters/ParentFilter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner.filters;
-
-import org.junit.runner.Description;
-import org.junit.runner.manipulation.Filter;
-
-/** Helper parent class for {@link Filter} that allows suites to run if any child matches. */
-public abstract class ParentFilter extends Filter {
-  /** {@inheritDoc} */
-  @Override
-  public boolean shouldRun(Description description) {
-    if (description.isTest()) {
-      return evaluateTest(description);
-    }
-    // this is a suite, explicitly check if any children should run
-    for (Description each : description.getChildren()) {
-      if (shouldRun(each)) {
-        return true;
-      }
-    }
-    // no children to run, filter this out
-    return false;
-  }
-
-  /**
-   * Determine if given test description matches filter.
-   *
-   * @param description the {@link Description} describing the test
-   * @return <code>true</code> if matched
-   */
-  protected abstract boolean evaluateTest(Description description);
-}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/filters/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/filters/package-info.java
new file mode 100644
index 000000000..189b76286
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/filters/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.filters;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/hidden/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/hidden/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/hidden/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/intent/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/intent/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/intent/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidJUnit3Builder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidJUnit3Builder.java
index b9b188535..7ace2dcce 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidJUnit3Builder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidJUnit3Builder.java
@@ -20,12 +20,11 @@
 import static androidx.test.internal.util.AndroidRunnerBuilderUtil.isJUnit3Test;
 
 import android.util.Log;
+import androidx.test.internal.runner.EmptyTestRunner;
 import androidx.test.internal.util.AndroidRunnerParams;
 import junit.framework.TestCase;
 import org.junit.internal.builders.JUnit3Builder;
-import org.junit.runner.Description;
 import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
 import org.junit.runners.model.RunnerBuilder;
 
 /**
@@ -35,56 +34,34 @@
 public class AndroidJUnit3Builder extends JUnit3Builder {
 
   private static final String TAG = "AndroidJUnit3Builder";
-
-  /**
-   * A special runner, used while scanning to indicate that the class is a JUnit 3 test but is not a
-   * valid test because it has no methods.
-   */
-  public static final Runner NOT_A_VALID_TEST =
-      new Runner() {
-        @Override
-        public Description getDescription() {
-          return Description.EMPTY;
-        }
-
-        @Override
-        public void run(RunNotifier notifier) {}
-      };
-
-  private final AndroidRunnerParams androidRunnerParams;
-  private final boolean scanningPath;
+  private final long perTestTimeout;
 
   /**
    * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
-   * @param scanningPath true if being used to build {@link Runner} from classes found while
-   *     scanning the path; requires extra checks to avoid unnecessary errors.
+   * @deprecated use {@link AndroidJUnit3Builder(long)} instead
    */
-  public AndroidJUnit3Builder(AndroidRunnerParams runnerParams, boolean scanningPath) {
-    androidRunnerParams = runnerParams;
-    this.scanningPath = scanningPath;
+  @Deprecated
+  public AndroidJUnit3Builder(AndroidRunnerParams runnerParams) {
+    this(runnerParams.getPerTestTimeout());
   }
 
   /**
-   * @deprecated Provided temporarily for backwards compatibility. Use {@link
-   *     AndroidJUnit3Builder#AndroidJUnit3Builder(AndroidRunnerParams, boolean) instead}.
+   * @param perTestTimeout milliseconds timeout value applied to each test where 0 means no timeout
    */
-  @Deprecated
-  public AndroidJUnit3Builder(AndroidRunnerParams runnerParams) {
-    this(runnerParams, false);
+  public AndroidJUnit3Builder(long perTestTimeout) {
+    this.perTestTimeout = perTestTimeout;
   }
 
   @Override
   public Runner runnerForClass(Class<?> testClass) throws Throwable {
     try {
       if (isJUnit3Test(testClass)) {
-        // If scanning the path then make sure that it has at least one test method before
-        // trying to run it.
-        if (scanningPath && !hasJUnit3TestMethod(testClass)) {
-          // Return a runner to prevent any other RunnerBuilder classes from
-          // trying to check this class.
-          return NOT_A_VALID_TEST;
+        if (!hasJUnit3TestMethod(testClass)) {
+          // ideally we would just let JUnit38ClassRunner handle this case, but for historical
+          // reasons there was special handling when classpath scanning for this case
+          return new EmptyTestRunner(testClass);
         }
-        return new JUnit38ClassRunner(new AndroidTestSuite(testClass, androidRunnerParams));
+        return new JUnit38ClassRunner(new AndroidTestSuite(testClass, perTestTimeout));
       }
     } catch (Throwable e) {
       // log error message including stack trace before throwing to help with debugging.
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidSuiteBuilder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidSuiteBuilder.java
index 8a8364645..e0a1078fa 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidSuiteBuilder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidSuiteBuilder.java
@@ -32,17 +32,26 @@
 public class AndroidSuiteBuilder extends SuiteMethodBuilder {
 
   private static final String LOG_TAG = "AndroidSuiteBuilder";
+  private final boolean ignoreSuiteMethods;
+  private final long perTestTimeout;
 
-  private final AndroidRunnerParams androidRunnerParams;
-
-  /** @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters */
+  /**
+   * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
+   * @deprecated use {@link AndroidSuiteBuilder()}
+   */
+  @Deprecated
   public AndroidSuiteBuilder(AndroidRunnerParams runnerParams) {
-    androidRunnerParams = runnerParams;
+    this(runnerParams.isIgnoreSuiteMethods(), runnerParams.getPerTestTimeout());
+  }
+
+  public AndroidSuiteBuilder(boolean ignoreSuiteMethods, long perTestTimeout) {
+    this.ignoreSuiteMethods = ignoreSuiteMethods;
+    this.perTestTimeout = perTestTimeout;
   }
 
   @Override
   public Runner runnerForClass(Class<?> testClass) throws Throwable {
-    if (androidRunnerParams.isIgnoreSuiteMethods()) {
+    if (ignoreSuiteMethods) {
       return null;
     }
     try {
@@ -53,7 +62,7 @@ public Runner runnerForClass(Class<?> testClass) throws Throwable {
           throw new IllegalArgumentException(
               testClass.getName() + "#suite() did not return a TestSuite");
         }
-        return new JUnit38ClassRunner(new AndroidTestSuite((TestSuite) t, androidRunnerParams));
+        return new JUnit38ClassRunner(new AndroidTestSuite((TestSuite) t, perTestTimeout));
       }
     } catch (Throwable e) {
       // log error message including stack trace before throwing to help with debugging.
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidTestSuite.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidTestSuite.java
index 6b100cbeb..762d4bb5e 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidTestSuite.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/AndroidTestSuite.java
@@ -17,7 +17,7 @@
 
 import android.os.Looper;
 import android.util.Log;
-import androidx.test.internal.util.AndroidRunnerParams;
+import androidx.test.platform.app.InstrumentationRegistry;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -39,16 +39,15 @@
 @Ignore
 class AndroidTestSuite extends DelegatingFilterableTestSuite {
   private static final String TAG = "AndroidTestSuite";
+  private final long perTestTimeout;
 
-  private final AndroidRunnerParams androidRunnerParams;
-
-  public AndroidTestSuite(Class<?> testClass, AndroidRunnerParams runnerParams) {
-    this(new NonLeakyTestSuite(testClass), runnerParams);
+  public AndroidTestSuite(Class<?> testClass, long perTestTimeout) {
+    this(new NonLeakyTestSuite(testClass), perTestTimeout);
   }
 
-  public AndroidTestSuite(TestSuite s, AndroidRunnerParams runnerParams) {
+  public AndroidTestSuite(TestSuite s, long perTestTimeout) {
     super(s);
-    androidRunnerParams = runnerParams;
+    this.perTestTimeout = perTestTimeout;
   }
 
   @Override
@@ -56,11 +55,12 @@ public void run(TestResult result) {
     // wrap the result in a new AndroidTestResult to do the bundle and instrumentation injection
     AndroidTestResult androidTestResult =
         new AndroidTestResult(
-            androidRunnerParams.getBundle(), androidRunnerParams.getInstrumentation(), result);
+            InstrumentationRegistry.getArguments(),
+            InstrumentationRegistry.getInstrumentation(),
+            result);
 
-    long timeout = androidRunnerParams.getPerTestTimeout();
-    if (timeout > 0) {
-      runTestsWithTimeout(timeout, androidTestResult);
+    if (perTestTimeout > 0) {
+      runTestsWithTimeout(perTestTimeout, androidTestResult);
     } else {
       super.run(androidTestResult);
     }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/package-info.java
new file mode 100644
index 000000000..e3f3ba3d8
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.junit3;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit3/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilder.java
index 8cc382278..0ef5543ed 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilder.java
@@ -28,12 +28,19 @@
 /** A specialized {@link AnnotatedBuilder} that can Android runner specific features */
 public class AndroidAnnotatedBuilder extends AnnotatedBuilder {
   private static final String LOG_TAG = "AndroidAnnotatedBuilder";
+  private final long perTestTimeout;
 
-  private final AndroidRunnerParams androidRunnerParams;
-
+  /**
+   * @deprecated use {@link AndroidAnnotatedBuilder()}
+   */
+  @Deprecated
   public AndroidAnnotatedBuilder(RunnerBuilder suiteBuilder, AndroidRunnerParams runnerParams) {
+    this(suiteBuilder, runnerParams.getPerTestTimeout());
+  }
+
+  public AndroidAnnotatedBuilder(RunnerBuilder suiteBuilder, long perTestTimeout) {
     super(suiteBuilder);
-    androidRunnerParams = runnerParams;
+    this.perTestTimeout = perTestTimeout;
   }
 
   @Override
@@ -67,7 +74,7 @@ public Runner runnerForClass(Class<?> testClass) throws Exception {
   public Runner buildAndroidRunner(Class<? extends Runner> runnerClass, Class<?> testClass)
       throws Exception {
     return runnerClass
-        .getConstructor(Class.class, AndroidRunnerParams.class)
-        .newInstance(testClass, androidRunnerParams);
+        .getConstructor(Class.class, long.class)
+        .newInstance(testClass, perTestTimeout);
   }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4Builder.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4Builder.java
index 27be8d5a4..f0f386ab3 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4Builder.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4Builder.java
@@ -17,8 +17,10 @@
 package androidx.test.internal.runner.junit4;
 
 import android.util.Log;
+import androidx.test.internal.runner.EmptyTestRunner;
 import androidx.test.internal.util.AndroidRunnerParams;
 import java.lang.reflect.Method;
+import org.junit.Test;
 import org.junit.internal.builders.JUnit4Builder;
 import org.junit.runner.Runner;
 import org.junit.runners.model.RunnerBuilder;
@@ -30,39 +32,53 @@
 public class AndroidJUnit4Builder extends JUnit4Builder {
 
   private static final String TAG = "AndroidJUnit4Builder";
-
-  private final AndroidRunnerParams androidRunnerParams;
-  private final boolean scanningPath;
+  private final long perTestTimeout;
 
   /**
    * @param runnerParams {@link AndroidRunnerParams} that stores common runner parameters
-   * @param scanningPath true if being used to build {@link Runner} from classes found while
-   *     scanning the path; requires extra checks to avoid unnecessary errors.
-   */
-  public AndroidJUnit4Builder(AndroidRunnerParams runnerParams, boolean scanningPath) {
-    androidRunnerParams = runnerParams;
-    this.scanningPath = scanningPath;
-  }
-
-  /**
-   * @deprecated Provided temporarily for backwards compatibility. Use {@link
-   *     AndroidJUnit4Builder#AndroidJUnit4Builder(AndroidRunnerParams, boolean) instead}.
+   * @deprecated use {@link AndroidJUnit4Builder()} instead
    */
   @Deprecated
   public AndroidJUnit4Builder(AndroidRunnerParams runnerParams) {
-    this(runnerParams, false);
+    this(runnerParams.getPerTestTimeout());
+  }
+
+  public AndroidJUnit4Builder(long perTestTimeout) {
+    this.perTestTimeout = perTestTimeout;
   }
 
   @Override
   public Runner runnerForClass(Class<?> testClass) throws Throwable {
     try {
-      // If scanning the path then make sure that it has at least one test method before
-      // trying to run it.
-      if (scanningPath && !hasTestMethods(testClass)) {
-        return null;
+      if (!hasTestMethods(testClass)) {
+        // if we can't find any test methods, see if it's due to something with a custom classloader
+        if (testClass.getClassLoader() != Test.class.getClassLoader()) {
+          // ClassLoader#findClass(module, name) not available in Android
+          Class<?> clazz;
+          try {
+            clazz = Class.forName("org.junit.Test", false, testClass.getClassLoader());
+          } catch (Throwable e) {
+            clazz = Test.class;
+          }
+
+          if (!clazz.equals(Test.class)) {
+            return new EmptyTestRunner(
+                testClass,
+                new IllegalStateException(
+                    "org.junit.Test in custom classloader "
+                        + testClass.getClassLoader()
+                        + " differs from org.junit.Test in the JUnit"
+                        + " runner's classloader. This causes JUnit to not be able to find the"
+                        + " tests to run."));
+          }
+        }
+
+        // return a special error runner if there are no @Test methods. This error runner will be
+        // ignored when classpath scanning
+        return new EmptyTestRunner(testClass);
       }
 
-      return new AndroidJUnit4ClassRunner(testClass, androidRunnerParams);
+      return new AndroidJUnit4ClassRunner(testClass, perTestTimeout);
     } catch (Throwable e) {
       // log error message including stack trace before throwing to help with debugging.
       Log.e(TAG, "Error constructing runner", e);
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4ClassRunner.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4ClassRunner.java
index 8e6c11866..a4dfde2c7 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4ClassRunner.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/AndroidJUnit4ClassRunner.java
@@ -16,7 +16,6 @@
 package androidx.test.internal.runner.junit4;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getArguments;
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import androidx.test.internal.runner.RunnerArgs;
 import androidx.test.internal.runner.junit4.statement.RunAfters;
@@ -36,23 +35,24 @@
 /** A specialized {@link BlockJUnit4ClassRunner} that can handle timeouts */
 public class AndroidJUnit4ClassRunner extends BlockJUnit4ClassRunner {
 
-  private final AndroidRunnerParams androidRunnerParams;
+  private final long perTestTimeout;
 
+  /**
+   * @deprecated use {@link AndroidJUnit4ClassRunner(Class)} instead.
+   */
+  @Deprecated
   public AndroidJUnit4ClassRunner(Class<?> klass, AndroidRunnerParams runnerParams)
       throws InitializationError {
-    super(klass);
-    androidRunnerParams = runnerParams;
+    this(klass, runnerParams.getPerTestTimeout());
   }
 
-  public AndroidJUnit4ClassRunner(Class<?> klass) throws InitializationError {
-    this(klass, createRunnerParams());
+  public AndroidJUnit4ClassRunner(Class<?> klass, long perTestTimeout) throws InitializationError {
+    super(klass);
+    this.perTestTimeout = perTestTimeout;
   }
 
-  private static AndroidRunnerParams createRunnerParams() {
-    RunnerArgs runnerArgs =
-        new RunnerArgs.Builder().fromBundle(getInstrumentation(), getArguments()).build();
-    return new AndroidRunnerParams(
-        getInstrumentation(), getArguments(), runnerArgs.testTimeout, false);
+  public AndroidJUnit4ClassRunner(Class<?> klass) throws InitializationError {
+    this(klass, RunnerArgs.parseTestTimeout(getArguments()));
   }
 
   /** Returns a {@link Statement} that invokes {@code method} on {@code test} */
@@ -77,9 +77,8 @@ protected Statement withAfters(FrameworkMethod method, Object target, Statement
   }
 
   /**
-   * Default to <a href="http://junit.org/javadoc/latest/org/junit/Test.html#timeout()"><code>
-   * org.junit.Test#timeout()</code></a> level timeout if set. Otherwise, set the timeout that was
-   * passed to the instrumentation via argument.
+   * Default to {@link org.junit.Test#timeout()} level timeout if set. Otherwise, set the timeout
+   * that was passed to the instrumentation via argument.
    */
   @Override
   protected Statement withPotentialTimeout(FrameworkMethod method, Object test, Statement next) {
@@ -87,8 +86,8 @@ protected Statement withPotentialTimeout(FrameworkMethod method, Object test, St
     long timeout = getTimeout(method.getAnnotation(Test.class));
 
     // use runner arg timeout if test level timeout is not present
-    if (timeout <= 0 && androidRunnerParams.getPerTestTimeout() > 0) {
-      timeout = androidRunnerParams.getPerTestTimeout();
+    if (timeout <= 0 && perTestTimeout > 0) {
+      timeout = perTestTimeout;
     }
 
     if (timeout <= 0) {
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/package-info.java
new file mode 100644
index 000000000..c534e220f
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.junit4;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunAfters.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunAfters.java
index 25b7afc66..f7d0beb21 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunAfters.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunAfters.java
@@ -18,6 +18,7 @@
 
 package androidx.test.internal.runner.junit4.statement;
 
+import android.util.Log;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.junit.runners.model.FrameworkMethod;
@@ -32,6 +33,9 @@ public class RunAfters extends UiThreadStatement {
 
   private final List<FrameworkMethod> afters;
 
+  /** Tag for logging. Set to TestRunner to match LogRunListener.TAG for easier debugging. */
+  private static final String TAG = "TestRunner";
+
   /**
    * Run all non-overridden {@code @After} methods on this class and superclasses before running
    * {@code next}; all After methods are always executed: exceptions thrown by previous steps are
@@ -62,6 +66,7 @@ public void evaluate() throws Throwable {
     } catch (Throwable e) {
       errors.add(e);
     } finally {
+      Log.d(TAG, "starting @After execution");
       for (final FrameworkMethod each : afters) {
         if (shouldRunOnUiThread(each)) {
           runOnUiThread(
@@ -83,6 +88,8 @@ public void run() {
           }
         }
       }
+
+      Log.d(TAG, "finished @After execution");
     }
     MultipleFailureException.assertEmpty(errors);
   }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunBefores.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunBefores.java
index ddb7949e2..2e8a19506 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunBefores.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/RunBefores.java
@@ -18,6 +18,7 @@
 
 package androidx.test.internal.runner.junit4.statement;
 
+import android.util.Log;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 import org.junit.runners.model.FrameworkMethod;
@@ -31,6 +32,9 @@ public class RunBefores extends UiThreadStatement {
 
   private final List<FrameworkMethod> befores;
 
+  /** Tag for logging. Set to TestRunner to match LogRunListener.TAG for easier debugging. */
+  private static final String TAG = "TestRunner";
+
   /**
    * Run all non-overridden {@code @Before} methods on this class and superclasses before running
    * {@code next}; if any throws an Exception, stop execution and pass the exception on.
@@ -52,6 +56,7 @@ public RunBefores(
 
   @Override
   public void evaluate() throws Throwable {
+    Log.d(TAG, "starting @Before execution");
     final AtomicReference<Throwable> exceptionRef = new AtomicReference<>();
     for (final FrameworkMethod before : befores) {
       if (shouldRunOnUiThread(before)) {
@@ -77,6 +82,7 @@ public void run() {
       }
     }
 
+    Log.d(TAG, "finished @Before execution");
     next.evaluate();
   }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/package-info.java
new file mode 100644
index 000000000..d63712a08
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.junit4.statement;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/package.html
deleted file mode 100644
index 27d887eef..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/junit4/statement/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/lifecycle/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/lifecycle/package.html
deleted file mode 100644
index 27d887eef..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/lifecycle/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/ActivityFinisherRunListener.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/ActivityFinisherRunListener.java
index 832857d11..7109f6fb9 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/ActivityFinisherRunListener.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/ActivityFinisherRunListener.java
@@ -19,8 +19,12 @@
 import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.app.Instrumentation;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
 import androidx.test.internal.runner.InstrumentationConnection;
-import androidx.test.runner.MonitoringInstrumentation;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunListener;
 
@@ -30,28 +34,64 @@
  */
 public class ActivityFinisherRunListener extends RunListener {
   private final Instrumentation instrumentation;
-  private final MonitoringInstrumentation.ActivityFinisher activityFinisher;
-  private final Runnable waitForActivitiesToFinishRunnable;
+  private final NotifyingRunnable activityFinisher;
+  private final Runnable waitForActivitiesToStopRunnable;
+  private final Handler handler;
 
   public ActivityFinisherRunListener(
       Instrumentation instrumentation,
-      MonitoringInstrumentation.ActivityFinisher finisher,
-      Runnable waitForActivitiesToFinishRunnable) {
+      Runnable finisher,
+      Runnable waitForActivitiesToStopRunnable) {
     this.instrumentation = checkNotNull(instrumentation);
-    activityFinisher = checkNotNull(finisher);
-    this.waitForActivitiesToFinishRunnable = checkNotNull(waitForActivitiesToFinishRunnable);
+    this.activityFinisher = new NotifyingRunnable(checkNotNull(finisher));
+    this.waitForActivitiesToStopRunnable = checkNotNull(waitForActivitiesToStopRunnable);
+    this.handler = new Handler(Looper.getMainLooper());
   }
 
   @Override
   public void testStarted(Description description) throws Exception {
-    instrumentation.runOnMainSync(activityFinisher);
-    waitForActivitiesToFinishRunnable.run();
+    runActivityFinisher();
+    waitForActivitiesToStopRunnable.run();
+  }
+
+  private void runActivityFinisher() throws InterruptedException {
+    handler.post(activityFinisher);
+    // wait for the finisher to run, but don't wait forever since this will deadlock and timeout
+    // the test if main thread is blocked
+    if (!activityFinisher.await(2, TimeUnit.SECONDS)) {
+      Log.w(
+          "AFRunListener",
+          "activity finisher did not run within 2 seconds. Is main thread blocked?");
+      // remove the finisher to prevent potential test pollution where activities will be finished
+      // mid-test
+      handler.removeCallbacks(activityFinisher);
+    }
   }
 
   @Override
   public void testFinished(Description description) throws Exception {
     InstrumentationConnection.getInstance().requestRemoteInstancesActivityCleanup();
-    instrumentation.runOnMainSync(activityFinisher);
-    waitForActivitiesToFinishRunnable.run();
+    runActivityFinisher();
+    waitForActivitiesToStopRunnable.run();
+  }
+
+  private static class NotifyingRunnable implements Runnable {
+
+    private final Runnable wrappedRunnable;
+    private final CountDownLatch latch = new CountDownLatch(1);
+
+    NotifyingRunnable(Runnable wrappedRunnable) {
+      this.wrappedRunnable = wrappedRunnable;
+    }
+
+    @Override
+    public void run() {
+      wrappedRunnable.run();
+      latch.countDown();
+    }
+
+    public boolean await(long time, TimeUnit unit) throws InterruptedException {
+      return latch.await(time, unit);
+    }
   }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/CoverageListener.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/CoverageListener.java
index 3ab2732c7..03223756a 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/CoverageListener.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/CoverageListener.java
@@ -25,10 +25,7 @@
 import java.io.PrintStream;
 import org.junit.runner.Result;
 
-/**
- * A test <a href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html">
- * <code>RunListener</code></a> that generates EMMA code coverage.
- */
+/** A test {@link org.junit.runner.notification.RunListener} that generates EMMA code coverage. */
 public class CoverageListener extends InstrumentationRunListener {
   private final String coverageFilePath;
   private PlatformTestStorage runnerIO;
@@ -85,8 +82,10 @@ public void setInstrumentation(Instrumentation instr) {
   }
 
   @Override
-  public void instrumentationRunFinished(PrintStream writer, Bundle results, Result junitResults) {
-    String actualCoveragePath = coverageReporter.generateCoverageReport(coverageFilePath, writer);
-    results.putString(REPORT_KEY_COVERAGE_PATH, actualCoveragePath);
+  public void instrumentationRunFinished(
+      PrintStream streamResult, Bundle resultBundle, Result junitResults) {
+    String actualCoveragePath =
+        coverageReporter.generateCoverageReport(coverageFilePath, streamResult);
+    resultBundle.putString(REPORT_KEY_COVERAGE_PATH, actualCoveragePath);
   }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/DelayInjector.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/DelayInjector.java
index f6f14dbbb..df108671d 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/DelayInjector.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/DelayInjector.java
@@ -19,10 +19,7 @@
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunListener;
 
-/**
- * A <a href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a> that injects a given delay between tests.
- */
+/** A {@link org.junit.runner.notification.RunListener} that injects a given delay between tests. */
 public class DelayInjector extends RunListener {
 
   private final int delayMsec;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationResultPrinter.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationResultPrinter.java
index 613a3bb4c..9d47d5cb4 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationResultPrinter.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationResultPrinter.java
@@ -21,15 +21,15 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.test.services.events.internal.StackTrimmer;
 import java.io.PrintStream;
+import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.internal.TextListener;
 import org.junit.runner.Description;
 import org.junit.runner.Result;
 import org.junit.runner.notification.Failure;
 
 /**
- * A <a href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a> that sends detailed pass/fail results back as instrumentation status
- * bundles.
+ * A {@link org.junit.runner.notification.RunListener} that sends detailed pass/fail results back as
+ * instrumentation status bundles.
  *
  * <p>When running instrumentation in '-r' or raw mode, output will be displayed in this format
  *
@@ -44,7 +44,7 @@
  */
 public class InstrumentationResultPrinter extends InstrumentationRunListener {
 
-  private static final String TAG = "InstrumentationResultPrinter";
+  private static final String TAG = "InstrResultPrinter";
 
   /**
    * This value, if stored with key {@link android.app.Instrumentation#REPORT_KEY_IDENTIFIER},
@@ -100,12 +100,12 @@ public class InstrumentationResultPrinter extends InstrumentationRunListener {
    */
   public static final String REPORT_KEY_STACK = "stack";
 
+  private final AtomicInteger testNum = new AtomicInteger(0);
+  private Description description = Description.EMPTY;
   private final Bundle resultTemplate;
   @VisibleForTesting Bundle testResult;
-  int testNum = 0;
-  int testResultCode = -999;
-  String testClass = null;
-  private Description description = Description.EMPTY;
+  private int testResultCode = -999;
+  private String testClass = null;
 
   public InstrumentationResultPrinter() {
     resultTemplate = new Bundle();
@@ -113,21 +113,22 @@ public InstrumentationResultPrinter() {
   }
 
   @Override
-  public void testRunStarted(Description description) throws Exception {
+  public void testRunStarted(Description description) {
     resultTemplate.putString(Instrumentation.REPORT_KEY_IDENTIFIER, REPORT_VALUE_ID);
     resultTemplate.putInt(REPORT_KEY_NUM_TOTAL, description.testCount());
   }
 
   /** send a status for the start of a each test, so long tests can be seen as "running" */
   @Override
-  public void testStarted(Description description) throws Exception {
+  public void testStarted(Description description) {
+    testNum.incrementAndGet();
     this.description = description; // cache Description in case of a crash
     String testClass = description.getClassName();
     String testName = description.getMethodName();
     testResult = new Bundle(resultTemplate);
     testResult.putString(REPORT_KEY_NAME_CLASS, testClass);
     testResult.putString(REPORT_KEY_NAME_TEST, testName);
-    testResult.putInt(REPORT_KEY_NUM_CURRENT, ++testNum);
+    testResult.putInt(REPORT_KEY_NUM_CURRENT, testNum.get());
     // pretty printing
     if (testClass != null && !testClass.equals(this.testClass)) {
       testResult.putString(
@@ -142,7 +143,7 @@ public void testStarted(Description description) throws Exception {
   }
 
   @Override
-  public void testFinished(Description description) throws Exception {
+  public void testFinished(Description description) {
     if (testResultCode == REPORT_VALUE_RESULT_OK) {
       testResult.putString(Instrumentation.REPORT_KEY_STREAMRESULT, ".");
     }
@@ -150,18 +151,24 @@ public void testFinished(Description description) throws Exception {
   }
 
   @Override
-  public void testFailure(Failure failure) throws Exception {
-    boolean shouldCallFinish = false;
-    if (!isAnyTestStarted()) {
-      // Junit failed during initialization and testStarted was never called. For example, an
-      // exception was thrown in @BeforeClass method. We must artificially call testStarted and
-      // testFinished in order to print a descriptive result that external tools (like Studio) can
-      // understand.
+  public void testFailure(Failure failure) {
+    handleFailure(
+        failure,
+        () -> {
+          testResultCode = REPORT_VALUE_RESULT_FAILURE;
+          reportFailure(failure);
+        });
+  }
+
+  private void handleFailure(Failure failure, Runnable action) {
+    // getMethodName() == null when an exception is thrown during @BeforeClass or @AfterClass.
+    // No matching testStart() / testFinish() is emitted, so simulate them here for the sake of
+    // instrumentation consumers.
+    boolean shouldCallFinish = failure.getDescription().getMethodName() == null;
+    if (shouldCallFinish) {
       testStarted(failure.getDescription());
-      shouldCallFinish = true;
     }
-    testResultCode = REPORT_VALUE_RESULT_FAILURE;
-    reportFailure(failure);
+    action.run();
     if (shouldCallFinish) {
       testFinished(failure.getDescription());
     }
@@ -169,8 +176,12 @@ public void testFailure(Failure failure) throws Exception {
 
   @Override
   public void testAssumptionFailure(Failure failure) {
-    testResultCode = REPORT_VALUE_RESULT_ASSUMPTION_FAILURE;
-    testResult.putString(REPORT_KEY_STACK, failure.getTrace());
+    handleFailure(
+        failure,
+        () -> {
+          testResultCode = REPORT_VALUE_RESULT_ASSUMPTION_FAILURE;
+          testResult.putString(REPORT_KEY_STACK, StackTrimmer.getTrimmedStackTrace(failure));
+        });
   }
 
   private void reportFailure(Failure failure) {
@@ -183,7 +194,7 @@ private void reportFailure(Failure failure) {
   }
 
   @Override
-  public void testIgnored(Description description) throws Exception {
+  public void testIgnored(Description description) {
     testStarted(description);
     testResultCode = REPORT_VALUE_RESULT_IGNORED;
     testFinished(description);
@@ -192,6 +203,9 @@ public void testIgnored(Description description) throws Exception {
   /**
    * Produce a more meaningful crash report including stack trace and report it back to
    * Instrumentation results.
+   *
+   * <p>Note: The Instrumentation process could crash for various reasons. Always try to do the
+   * minimum in this method.
    */
   public void reportProcessCrash(Throwable t) {
     try {
@@ -230,6 +244,6 @@ public void instrumentationRunFinished(
   }
 
   private boolean isAnyTestStarted() {
-    return !description.equals(Description.EMPTY) || testNum != 0 || testClass != null;
+    return testNum.get() > 0;
   }
 }
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationRunListener.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationRunListener.java
index f2354154e..3aa3addac 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationRunListener.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationRunListener.java
@@ -22,9 +22,9 @@
 import org.junit.runner.notification.RunListener;
 
 /**
- * A <a href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a> that has access to a {@link Instrumentation}. This is useful for test
- * result listeners that want to dump data back to the instrumentation results.
+ * A {@link org.junit.runner.notification.RunListener} that has access to a {@link Instrumentation}.
+ * This is useful for test result listeners that want to dump data back to the instrumentation
+ * results.
  */
 public abstract class InstrumentationRunListener extends RunListener {
 
@@ -53,8 +53,8 @@ public void sendString(String msg) {
   /**
    * Optional callback subclasses can implement. Will be called when instrumentation run completes.
    *
-   * @param streamResult the {@link PrintStream} to instrumentation out. Will be displayed even when
-   *     instrumentation not run in -r mode
+   * @param streamResult the {@link java.io.PrintStream} to instrumentation out. Will be displayed
+   *     even when instrumentation not run in -r mode
    * @param resultBundle the instrumentation result bundle. Can be used to inject key-value pairs
    *     into the instrumentation output when run in -r/raw mode
    * @param junitResults the test results
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/LogRunListener.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/LogRunListener.java
index 2f3f34f4a..aa558be2a 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/LogRunListener.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/LogRunListener.java
@@ -22,8 +22,7 @@
 import org.junit.runner.notification.RunListener;
 
 /**
- * A <a href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a> that outputs test events to logcat.
+ * A {@link org.junit.runner.notification.RunListener} that outputs test events to logcat.
  *
  * <p>Attempts to follow similar format as InstrumentationTestRunner.
  */
@@ -59,16 +58,14 @@ public void testFinished(Description description) throws Exception {
   @Override
   public void testFailure(Failure failure) throws Exception {
     Log.e(TAG, "failed: " + failure.getDescription().getDisplayName());
-    Log.e(TAG, "----- begin exception -----");
-    Log.e(TAG, failure.getTrace());
+    Log.e(TAG, "----- begin exception -----", failure.getException());
     Log.e(TAG, "----- end exception -----");
   }
 
   @Override
   public void testAssumptionFailure(Failure failure) {
     Log.e(TAG, "assumption failed: " + failure.getDescription().getDisplayName());
-    Log.e(TAG, "----- begin exception -----");
-    Log.e(TAG, failure.getTrace());
+    Log.e(TAG, "----- begin exception -----", failure.getException());
     Log.e(TAG, "----- end exception -----");
   }
 
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/TraceRunListener.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/TraceRunListener.java
new file mode 100644
index 000000000..09cc3db02
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/TraceRunListener.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.runner.listener;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.tracing.Trace;
+import org.junit.runner.Description;
+import org.junit.runner.notification.RunListener;
+
+/** A JUnit RunListener that reports {@link android.os.Trace} info for each test case */
+public class TraceRunListener extends RunListener {
+  private static final String TAG = TraceRunListener.class.getSimpleName();
+
+  /** android.os.Trace.beginSection() has a limit on name length. */
+  private static final int MAX_SECTION_NAME_LEN = 127;
+
+  private Thread startedThread = null;
+
+  @Override
+  public void testStarted(Description description) throws Exception {
+    startedThread = Thread.currentThread();
+    String testClassName =
+        description.getTestClass() != null ? description.getTestClass().getSimpleName() : "None";
+    String methodName = description.getMethodName() != null ? description.getMethodName() : "None";
+    Trace.beginSection(sanitizeSpanName("test:" + testClassName + "#" + methodName));
+  }
+
+  @Override
+  public void testFinished(Description description) throws Exception {
+    if (Thread.currentThread().equals(startedThread)) {
+      Trace.endSection();
+    } else {
+      // Trace expects the begin/end section calls to be on same thread.
+      // Listeners should always be invoked on test/instrumentation thread,
+      // but log an error in case this changes.
+      Log.e("TraceRunListener", "testFinished called on different thread than testStarted");
+    }
+    startedThread = null;
+  }
+
+  /**
+   * android.os.Trace.beginSection() has a hard limit on the name length and throws if the name is
+   * too long. We shorten here with a warning if needed.
+   */
+  @NonNull
+  private static String sanitizeSpanName(@NonNull String name) {
+    if (name.length() > MAX_SECTION_NAME_LEN) {
+      Log.w(TAG, "Span name exceeds limits: " + name);
+      name = name.substring(0, MAX_SECTION_NAME_LEN);
+    }
+    return name;
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/package-info.java
new file mode 100644
index 000000000..76cd156d2
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.listener;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/listener/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/listener/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/package-info.java
new file mode 100644
index 000000000..3e2e8dee1
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/package.html b/runner/android_junit_runner/java/androidx/test/internal/runner/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/UsageTrackerRegistry.java b/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/UsageTrackerRegistry.java
index fa818829f..3d88cab97 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/UsageTrackerRegistry.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/UsageTrackerRegistry.java
@@ -28,17 +28,21 @@
 @Deprecated
 public final class UsageTrackerRegistry {
 
-  /** Contains versions for AXT libraries */
+  /**
+   * Contains versions for AXT libraries
+   *
+   * @deprecated obsolete
+   */
+  @Deprecated
   public interface AxtVersions {
     // Espresso version includes: Espresso, Espresso-Web, Intents, Espresso-MPE
-    String ESPRESSO_VERSION = "3.5.0-alpha01";
-    // Runner version includes: Runner, Rules, ATO, Monitor
-    String RUNNER_VERSION = "1.5.0-alpha01";
+    String ESPRESSO_VERSION = "na";
+    // Runner version includes: Runner
+    String RUNNER_VERSION = "na";
     // Test services version.
-    String SERVICES_VERSION = RUNNER_VERSION;
+    String SERVICES_VERSION = "na";
   }
 
-
   // By default we use a NoOp class.
   private static volatile UsageTracker instance = new UsageTracker.NoOpUsageTracker();
 
diff --git a/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/package-info.java
new file mode 100644
index 000000000..2b81320f6
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/runner/tracker/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.tracker;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/util/AndroidRunnerParams.java b/runner/android_junit_runner/java/androidx/test/internal/util/AndroidRunnerParams.java
index 6bc985e06..23dcf2546 100644
--- a/runner/android_junit_runner/java/androidx/test/internal/util/AndroidRunnerParams.java
+++ b/runner/android_junit_runner/java/androidx/test/internal/util/AndroidRunnerParams.java
@@ -19,7 +19,12 @@
 import android.app.Instrumentation;
 import android.os.Bundle;
 
-/** Helper class to store frequently passed test parameters between the different classes */
+/**
+ * Helper class to store frequently passed test parameters between the different classes.
+ *
+ * @deprecated use {@link androidx.test.platform.app.InstrumentationRegistry} instead
+ */
+@Deprecated
 public class AndroidRunnerParams {
   private final Instrumentation instrumentation;
   private final Bundle bundle;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/util/package-info.java b/runner/android_junit_runner/java/androidx/test/internal/util/package-info.java
new file mode 100644
index 000000000..43a9f821a
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/internal/util/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.util;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/android_junit_runner/java/androidx/test/internal/util/package.html b/runner/android_junit_runner/java/androidx/test/internal/util/package.html
deleted file mode 100644
index 27d887eef..000000000
--- a/runner/android_junit_runner/java/androidx/test/internal/util/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/android_junit_runner/java/androidx/test/orchestrator/callback/NoOpOrchestratorConnection.java b/runner/android_junit_runner/java/androidx/test/orchestrator/callback/NoOpOrchestratorConnection.java
index 44fc88caf..a0a1d49bb 100644
--- a/runner/android_junit_runner/java/androidx/test/orchestrator/callback/NoOpOrchestratorConnection.java
+++ b/runner/android_junit_runner/java/androidx/test/orchestrator/callback/NoOpOrchestratorConnection.java
@@ -17,13 +17,20 @@
 package androidx.test.orchestrator.callback;
 
 import android.content.Context;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.internal.events.client.TestDiscoveryEventService;
 import androidx.test.internal.events.client.TestEventServiceConnection;
 import androidx.test.internal.events.client.TestRunEventService;
 import androidx.test.services.events.discovery.TestDiscoveryEvent;
 import androidx.test.services.events.run.TestRunEvent;
 
-/** A no-op connection to the Android test orchestrator. */
+/**
+ * A no-op connection to the Android test orchestrator.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public class NoOpOrchestratorConnection
     implements TestEventServiceConnection, TestRunEventService, TestDiscoveryEventService {
 
diff --git a/runner/android_junit_runner/java/androidx/test/orchestrator/callback/OrchestratorV1Connection.java b/runner/android_junit_runner/java/androidx/test/orchestrator/callback/OrchestratorV1Connection.java
index ef0fac338..d1dfa3fea 100644
--- a/runner/android_junit_runner/java/androidx/test/orchestrator/callback/OrchestratorV1Connection.java
+++ b/runner/android_junit_runner/java/androidx/test/orchestrator/callback/OrchestratorV1Connection.java
@@ -21,6 +21,8 @@
 
 import android.os.RemoteException;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.internal.events.client.TestDiscoveryEventService;
 import androidx.test.internal.events.client.TestEventClientConnectListener;
 import androidx.test.internal.events.client.TestEventClientException;
@@ -34,7 +36,10 @@
  * Handles the communication with the remote {@code androidx.test.orchestrator.OrchestratorService}.
  * The Orchestrator v1 service supports both test discovery notifications and test run event
  * notifications.
+ *
+ * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 public final class OrchestratorV1Connection
     extends TestEventServiceConnectionBase<OrchestratorCallback>
     implements TestRunEventService, TestDiscoveryEventService {
diff --git a/runner/android_junit_runner/java/androidx/test/release_jarjar_rules.txt b/runner/android_junit_runner/java/androidx/test/release_jarjar_rules.txt
deleted file mode 100644
index f00064e94..000000000
--- a/runner/android_junit_runner/java/androidx/test/release_jarjar_rules.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-rule com.google.android.aidl.** androidx.test.runner.internal.deps.aidl.@1
-rule com.google.devtools.build.android.desugar.runtime.** androidx.test.runner.internal.deps.desugar.@1
diff --git a/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnit4.java b/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnit4.java
index f2e4c6d38..c207ad803 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnit4.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnit4.java
@@ -17,6 +17,8 @@
 package androidx.test.runner;
 
 import android.util.Log;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 import androidx.test.internal.util.AndroidRunnerParams;
 import java.lang.reflect.InvocationTargetException;
@@ -36,7 +38,7 @@
  * Developers wanting to explicitly tag a class as an Android JUnit 4 class should use
  * {@code @RunWith(AndroidJUnit4.class)}
  *
- * @deprecated use androidx.test.ext.junit.runners.AndroidJUnit4 instead.
+ * @deprecated use {@link androidx.test.ext.junit.runners.AndroidJUnit4} instead.
  */
 @Deprecated
 public final class AndroidJUnit4 extends Runner implements Filterable, Sortable {
@@ -45,11 +47,28 @@ public final class AndroidJUnit4 extends Runner implements Filterable, Sortable
 
   private final Runner delegate;
 
-  /** Constructs a new instance of the default runner */
+  /**
+   * Constructs a new instance of the default runner
+   *
+   * @hide
+   * @deprecated use {@link AndroidJUnit4(Class, long)}
+   */
+  @RestrictTo(Scope.LIBRARY)
+  @Deprecated
   public AndroidJUnit4(Class<?> klass, AndroidRunnerParams runnerParams)
       throws InitializationError {
+    this(klass, runnerParams.getPerTestTimeout());
+  }
+
+  /**
+   * Constructs a new instance of the default runner
+   *
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY)
+  public AndroidJUnit4(Class<?> klass, long perTestTimeout) throws InitializationError {
     // this is expected to be called when in Android environment.
-    delegate = new AndroidJUnit4ClassRunner(klass, runnerParams);
+    delegate = new AndroidJUnit4ClassRunner(klass, perTestTimeout);
   }
 
   /**
diff --git a/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnitRunner.java b/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnitRunner.java
index 245ea5e5d..e8da8f6d0 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnitRunner.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/AndroidJUnitRunner.java
@@ -18,11 +18,12 @@
 
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Debug;
 import android.os.StrictMode;
 import android.util.Log;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
@@ -30,6 +31,8 @@
 import androidx.test.internal.events.client.TestEventClient;
 import androidx.test.internal.events.client.TestEventClientArgs;
 import androidx.test.internal.events.client.TestEventClientConnectListener;
+import androidx.test.internal.platform.reflect.ReflectionException;
+import androidx.test.internal.platform.reflect.ReflectiveMethod;
 import androidx.test.internal.runner.ClassPathScanner;
 import androidx.test.internal.runner.RunnerArgs;
 import androidx.test.internal.runner.TestExecutor;
@@ -40,8 +43,7 @@
 import androidx.test.internal.runner.listener.InstrumentationResultPrinter;
 import androidx.test.internal.runner.listener.LogRunListener;
 import androidx.test.internal.runner.listener.SuiteAssignmentPrinter;
-import androidx.test.internal.util.ReflectionUtil;
-import androidx.test.internal.util.ReflectionUtil.ReflectionException;
+import androidx.test.internal.runner.listener.TraceRunListener;
 import androidx.test.orchestrator.callback.OrchestratorV1Connection;
 import androidx.test.platform.io.FileTestStorage;
 import androidx.test.platform.io.PlatformTestStorageRegistry;
@@ -50,12 +52,12 @@
 import androidx.test.runner.screenshot.ScreenCaptureProcessor;
 import androidx.test.runner.screenshot.Screenshot;
 import androidx.test.services.storage.TestStorage;
+import androidx.tracing.Trace;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.WeakHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.junit.runner.Request;
 import org.junit.runner.manipulation.Filter;
 import org.junit.runner.notification.RunListener;
@@ -71,9 +73,8 @@
  *
  * <h3>Typical Usage</h3>
  *
- * <p>Write JUnit3 style {@link junit.framework.TestCase}s and/or JUnit4 style <a
- * href="http://junit.org/javadoc/latest/org/junit/Test.html"><code>Test</code></a>s that perform
- * tests against the classes in your package. Make use of the {@link
+ * <p>Write JUnit3 style {@link junit.framework.TestCase}s and/or JUnit4 style {@link
+ * org.junit.Test}s that perform tests against the classes in your package. Make use of the {@link
  * androidx.test.InstrumentationRegistry} if needed.
  *
  * <p>In an appropriate AndroidManifest.xml, define an instrumentation with android:name set to
@@ -111,6 +112,8 @@
  * character of the last identifier is a capitalized letter. Valid method names are valid class
  * names with a '#' character and an additional java identifier appended to the end. (expected class
  * format: com.android.foo.FooClassName#testMethodName) (expected package format: com.android.foo)
+ * If -e useTestStorageService is also provided, the testfile will be converted to a relative path
+ * and retrieved from {@link TestStorage}
  *
  * <p><b>Running all tests not listed in a file:</b> adb shell am instrument -w -e notTestFile
  * /sdcard/tmp/notTestFile.txt com.android.foo/com.android.test.runner.AndroidJUnitRunner The file
@@ -121,6 +124,8 @@
  * character of the last identifier is a capitalized letter. Valid method names are valid class
  * names with a '#' character and an additional java identifier appended to the end. (expected class
  * format: com.android.foo.FooClassName#testMethodName) (expected package format: com.android.foo)
+ * If -e useTestStorageService is also provided, the testfile will be converted to a relative path
+ * and retrieved from {@link TestStorage}
  *
  * <p><b>Running all tests in a java package:</b> adb shell am instrument -w -e package
  * com.android.foo.bar com.android.foo/androidx.test.runner.AndroidJUnitRunner
@@ -202,41 +207,35 @@
  * <p><b> To specify EMMA or JaCoCo code coverage results file path:</b> -e coverage true -e
  * coverageFile /sdcard/myFile.ec
  *
- * <p><b> To specify one or more <a
- * href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a>s to observe the test run:</b> -e listener
- * com.foo.Listener,com.foo.Listener2
+ * <p><b> To specify one or more {@link org.junit.runner.notification.RunListener}s to observe the
+ * test run:</b> -e listener com.foo.Listener,com.foo.Listener2
  *
- * <p><b> To use the new order of <a
- * href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a>s during a test run: </b> -e newRunListenerMode true
+ * <p><b> To use the new order of {@link org.junit.runner.notification.RunListener}s during a test
+ * run: </b> -e newRunListenerMode true
  *
- * <p>New order of listeners guarantee that user defined <a
- * href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a>s will be running before any of the default listeners defined in this
- * runner. Legacy order had those user defined listeners running after the default ones.
+ * <p>New order of listeners guarantee that user defined {@link
+ * org.junit.runner.notification.RunListener}s will be running before any of the default listeners
+ * defined in this runner. Legacy order had those user defined listeners running after the default
+ * ones.
  *
  * <p></b>Note:</b>The new order will become the default in the future.
  *
- * <p><a
- * href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- *    can also be specified via java.util.ServiceLoader metadata.
+ * <p>{@link org.junit.runner.notification.RunListener} can also be specified via {@link
+ * java.util.ServiceLoader} metadata.
  *
  * <p><b> To specify a custom {@link java.lang.ClassLoader} to load the test class: </b> -e
  * classLoader com.foo.CustomClassLoader
  *
- * <p><b>Set timeout (in milliseconds) that will be applied to each test:</b> -e timeout_msec 5000
+ * <p><b>Deprecated: Set timeout (in milliseconds) that will be applied to each test:</b> -e
+ * timeout_msec 5000 <br>
+ * -e timeout essentially reuses the deprecated @Test(timeout) functionality. Use junit's Timeout
+ * Rule instead.
  *
  * <p>Supported for both JUnit3 and JUnit4 style tests. For JUnit3 tests, this flag is the only way
- * to specify timeouts. For JUnit4 tests, this flag is only supported when using the
- * the {@link androidx.test.ext.junit.runners.AndroidJUnit4) runner. It overrides timeouts
- * specified via <a
- * href="http://junit.org/javadoc/latest/org/junit/rules/Timeout.html"><code>org.junit.rules.Timeout
- * </code></a>. Please note that in JUnit4 <a
- * href="http://junit.org/javadoc/latest/org/junit/Test.html#timeout()"><code>
- * org.junit.Test#timeout()</code></a> annotation will take precedence over both, this flag and <a
- * href="http://junit.org/javadoc/latest/org/junit/rules/Timeout.html"><code>org.junit.rules.Timeout
- * </code></a> rule.
+ * to specify timeouts. For JUnit4 tests, this flag is only supported when using the the {@link
+ * androidx.test.ext.junit.runners.AndroidJUnit4} runner. It overrides timeouts specified via {@link
+ * org.junit.rules.Timeout}. Please note that in JUnit4 {@link org.junit.Test#timeout()} annotation
+ * will take precedence over both, this flag and {@link org.junit.rules.Timeout} rule.
  *
  * <p><b>(Beta)To specify a custom {@link androidx.test.runner.screenshot.ScreenCaptureProcessor} to
  * use when processing a {@link androidx.test.runner.screenshot.ScreenCapture} produced by {@link
@@ -278,37 +277,45 @@ public class AndroidJUnitRunner extends MonitoringInstrumentation
   private Bundle arguments;
   private final InstrumentationResultPrinter instrumentationResultPrinter =
       new InstrumentationResultPrinter();
-  private final AtomicBoolean isConnectedToOrchestrator = new AtomicBoolean(false);
+  ;
   private RunnerArgs runnerArgs;
   private TestEventClient testEventClient = TestEventClient.NO_OP_CLIENT;
   private final Set<Throwable> appExceptionsHandled =
       Collections.newSetFromMap(new WeakHashMap<>());
 
+
   /** {@inheritDoc} */
   @Override
   public void onCreate(Bundle arguments) {
-    super.onCreate(arguments);
-    this.arguments = arguments;
-    parseRunnerArgs(this.arguments);
-
-    if (waitForDebugger(runnerArgs)) {
-      Log.i(LOG_TAG, "Waiting for debugger to connect...");
-      Debug.waitForDebugger();
-      Log.i(LOG_TAG, "Debugger connected.");
-    }
+    Log.i(LOG_TAG, "onCreate " + arguments.toString());
+    Trace.beginSection("AndroidJUnitRunner#onCreate");
+    try {
+      super.onCreate(arguments);
+      this.arguments = arguments;
+      registerTestStorage(this.arguments);
+      parseRunnerArgs(this.arguments);
+
+      if (waitForDebugger(runnerArgs)) {
+        Log.i(LOG_TAG, "Waiting for debugger to connect...");
+        Debug.waitForDebugger();
+        Log.i(LOG_TAG, "Debugger connected.");
+      }
 
-    for (ApplicationLifecycleCallback listener : runnerArgs.appListeners) {
-      ApplicationLifecycleMonitorRegistry.getInstance().addLifecycleCallback(listener);
-    }
+      for (ApplicationLifecycleCallback listener : runnerArgs.appListeners) {
+        ApplicationLifecycleMonitorRegistry.getInstance().addLifecycleCallback(listener);
+      }
 
-    addScreenCaptureProcessors(runnerArgs);
+      addScreenCaptureProcessors(runnerArgs);
 
-    if (isOrchestratorServiceProvided()) {
-      Log.v(LOG_TAG, "Waiting to connect to the Orchestrator service...");
-    } else {
-      // If no orchestration service is given, or we are not the primary process we can
-      // start() immediately.
-      start();
+      if (shouldWaitForOrchestratorService()) {
+        Log.v(LOG_TAG, "Waiting to connect to the Orchestrator service...");
+      } else {
+        // If no orchestration service is given, or we are not the primary process we can
+        // start() immediately.
+        start();
+      }
+    } finally {
+      Trace.endSection();
     }
   }
 
@@ -318,7 +325,7 @@ public void onCreate(Bundle arguments) {
    *
    * @return true if running in "orchestrated mode".
    */
-  private boolean isOrchestratorServiceProvided() {
+  private boolean shouldWaitForOrchestratorService() {
     TestEventClientArgs args =
         TestEventClientArgs.builder()
             .setConnectionFactory(OrchestratorV1Connection::new)
@@ -333,7 +340,7 @@ private boolean isOrchestratorServiceProvided() {
             .setTestPlatformMigration(runnerArgs.testPlatformMigration)
             .build();
     testEventClient = TestEventClient.connect(getContext(), this, args);
-    return testEventClient.isTestDiscoveryEnabled() || testEventClient.isTestRunEventsEnabled();
+    return testEventClient.isOrchestrationServiceEnabled();
   }
 
   /** Checks if need to wait for debugger. */
@@ -348,6 +355,7 @@ private boolean waitForDebugger(RunnerArgs arguments) {
    * @deprecated use onTestEventClientConnect()
    * @hide
    */
+  @RestrictTo(Scope.LIBRARY)
   @Deprecated // TODO(b/161833844): Remove onOrchestratorConnect(), use onTestEventClientConnect()
   public void onOrchestratorConnect() {
     onTestEventClientConnect();
@@ -359,9 +367,10 @@ public void onOrchestratorConnect() {
    *
    * @hide
    */
+  @RestrictTo(Scope.LIBRARY)
   @Override
   public void onTestEventClientConnect() {
-    isConnectedToOrchestrator.set(true);
+    testEventClient.setConnectedToOrchestrator(true);
     start();
   }
 
@@ -391,58 +400,53 @@ InstrumentationResultPrinter getInstrumentationResultPrinter() {
     return instrumentationResultPrinter;
   }
 
+  private void invokeRemoteMethod() {
+    try {
+      new ReflectiveMethod<Void>(
+              runnerArgs.remoteMethod.testClassName, runnerArgs.remoteMethod.methodName)
+          .invokeStatic();
+    } catch (ReflectionException e) {
+      Log.e(
+          LOG_TAG,
+          String.format(
+              "Reflective call to remote method %s#%s failed",
+              runnerArgs.remoteMethod.testClassName, runnerArgs.remoteMethod.methodName),
+          e);
+    }
+  }
+
   @Override
   public void onStart() {
-    setJsBridgeClassName("androidx.test.espresso.web.bridge.JavaScriptBridge");
-    super.onStart();
-    Request testRequest = buildRequest(runnerArgs, getArguments());
-
-    /*
-     * The orchestrator cannot collect the list of tests as it is running in a different process
-     * than the test app.  On first run, the Orchestrator will ask AJUR to list the tests
-     * out that would be run for a given class parameter.  AJUR will then be successively
-     * called with whatever it passes back to the orchestrator service.
-     */
-    if (testEventClient.isTestDiscoveryEnabled()) {
-      testEventClient.addTests(testRequest.getRunner().getDescription());
-      finish(Activity.RESULT_OK, new Bundle());
-      return;
-    }
+    Log.d(LOG_TAG, "onStart is called.");
+    Trace.beginSection("AndroidJUnitRunner#onStart");
+    Bundle results = new Bundle();
+    try {
+      setJsBridgeClassName("androidx.test.espresso.web.bridge.JavaScriptBridge");
+      super.onStart();
 
-    if (runnerArgs.remoteMethod != null) {
-      try {
-        ReflectionUtil.callStaticMethod(
-            runnerArgs.remoteMethod.testClassName, runnerArgs.remoteMethod.methodName);
-      } catch (ReflectionException e) {
-        Log.e(
-            LOG_TAG,
-            String.format(
-                "Reflective call to remote method %s#%s failed",
-                runnerArgs.remoteMethod.testClassName, runnerArgs.remoteMethod.methodName),
-            e);
-      }
-    }
+      Request testRequest = buildRequest(runnerArgs, getArguments());
 
-    // TODO(b/162075422): using deprecated isPrimaryInstrProcess(argsProcessName) method
-    if (!isPrimaryInstrProcess(runnerArgs.targetProcess)) {
-      Log.i(LOG_TAG, "Runner is idle...");
-      return;
-    }
+      if (runnerArgs.remoteMethod != null) {
+        invokeRemoteMethod();
+      }
 
-    registerTestStorage(runnerArgs);
+      // TODO(b/162075422): using deprecated isPrimaryInstrProcess(argsProcessName) method
+      if (!isPrimaryInstrProcess(runnerArgs.targetProcess)) {
+        Log.i(LOG_TAG, "Runner is idle...");
+        return;
+      }
 
-    Bundle results = new Bundle();
-    try {
       TestExecutor.Builder executorBuilder = new TestExecutor.Builder(this);
       addListeners(runnerArgs, executorBuilder);
       results = executorBuilder.build().execute(testRequest);
-    } catch (RuntimeException e) {
+    } catch (Throwable t) {
       final String msg = "Fatal exception when running tests";
-      Log.e(LOG_TAG, msg, e);
-      // report the exception to instrumentation out
-      results.putString(
-          Instrumentation.REPORT_KEY_STREAMRESULT, msg + "\n" + Log.getStackTraceString(e));
+      Log.e(LOG_TAG, msg, t);
+      onException(this, t);
+    } finally {
+      Trace.endSection();
     }
+    // finish kills the process, so this needs to happen after Trace.endSection
     finish(Activity.RESULT_OK, results);
   }
 
@@ -464,8 +468,9 @@ private void addListenersLegacyOrder(RunnerArgs args, TestExecutor.Builder build
       builder.addRunListener(new SuiteAssignmentPrinter());
     } else {
       builder.addRunListener(new LogRunListener());
-      if (testEventClient.isTestRunEventsEnabled()) {
-        builder.addRunListener(testEventClient.getRunListener());
+      RunListener testEventClientListener = testEventClient.getRunListener();
+      if (testEventClientListener != null) {
+        builder.addRunListener(testEventClientListener);
       } else {
         builder.addRunListener(getInstrumentationResultPrinter());
       }
@@ -486,6 +491,7 @@ public void run() {
       }
       addDelayListener(args, builder);
       addCoverageListener(args, builder);
+      builder.addRunListener(new TraceRunListener());
     }
     addListenersFromClasspath(builder);
     addListenersFromArg(args, builder);
@@ -507,8 +513,9 @@ private void addListenersNewOrder(RunnerArgs args, TestExecutor.Builder builder)
       builder.addRunListener(new LogRunListener());
       addDelayListener(args, builder);
       addCoverageListener(args, builder);
-      if (testEventClient.isTestRunEventsEnabled()) {
-        builder.addRunListener(testEventClient.getRunListener());
+      RunListener testEventListener = testEventClient.getRunListener();
+      if (testEventListener != null) {
+        builder.addRunListener(testEventListener);
       } else {
         builder.addRunListener(getInstrumentationResultPrinter());
       }
@@ -526,6 +533,7 @@ public void run() {
                   }
                 }));
       }
+      builder.addRunListener(new TraceRunListener());
     }
   }
 
@@ -545,10 +553,6 @@ private void addCoverageListener(RunnerArgs args, TestExecutor.Builder builder)
   private void addDelayListener(RunnerArgs args, TestExecutor.Builder builder) {
     if (args.delayInMillis > 0) {
       builder.addRunListener(new DelayInjector(args.delayInMillis));
-    } else if (args.logOnly && Build.VERSION.SDK_INT < 16) {
-      // On older platforms, collecting tests can fail for large volume of tests.
-      // Insert a small delay between each test to prevent this
-      builder.addRunListener(new DelayInjector(15 /* msec */));
     }
   }
 
@@ -576,39 +580,58 @@ public boolean onException(Object obj, Throwable e) {
       return false;
     }
 
-    Log.e(LOG_TAG, "An unhandled exception was thrown by the app.", cause);
+    Log.w(LOG_TAG, "An unhandled exception was thrown by the app.", e);
     appExceptionsHandled.add(cause);
 
     // Report better error message back to Instrumentation results.
     InstrumentationResultPrinter instResultPrinter = getInstrumentationResultPrinter();
-    if (instResultPrinter.getInstrumentation() == null) {
-      // App could crash before #onCreate(Bundle) is called, where the instrumentation instance is
-      // not properly set yet. Setting the Instrumentation here rather than in the constructor to
-      // minimize the dependencies during initialization.
-      instResultPrinter.setInstrumentation(this);
-    }
+    // If the app crashes before instrumentation has started, instrumentationResultPrinter could
+    // be null
+    if (instResultPrinter != null) {
+      if (instResultPrinter.getInstrumentation() == null) {
+        // App could crash before #onCreate(Bundle) is called, where the instrumentation instance is
+        // not properly set yet. Setting the Instrumentation here rather than in the constructor to
+        // minimize the dependencies during initialization.
+        instResultPrinter.setInstrumentation(this);
+      }
 
-    // Allows DISK_WRITE as `sendStatus` writes to standard output.
-    final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
-    try {
-      instResultPrinter.reportProcessCrash(e);
-    } finally {
-      StrictMode.setThreadPolicy(oldPolicy);
+      // Allows DISK_WRITE as `sendStatus` writes to standard output.
+      final StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskWrites();
+      try {
+        instResultPrinter.reportProcessCrash(e);
+      } catch (Throwable t) {
+        // It is possible for the test infrastructure to get sufficiently messed up that even this
+        // can fail (with a NoSuchMethodError from Failure.getTrace()!). Don't let that get in the
+        // way of sending events reporting the problems, since that can make the difference between
+        // "test failed with a useful error message" and "test mysteriously timed out and the
+        // developer has to go spelunking in the system logcat".
+        Log.e(LOG_TAG, "Failed to report process crash.", t);
+      } finally {
+        StrictMode.setThreadPolicy(oldPolicy);
+      }
     }
 
-    // If the app crashes in #newApplication(ClassLoader, String, Context), before #onCreate(Bundle)
-    // is called, `testEventClient` could possibly be null.
-    if (testEventClient != null
-        && testEventClient.isTestRunEventsEnabled()
-        && isConnectedToOrchestrator.get()) {
-      // Report the error message back to the orchestrator.
-      Log.d(LOG_TAG, "Reporting the crash to the test run event service.");
+    // If the app crashes before instrumentation has started, `testEventClient` could possibly be
+    // null or not connected.
+    if (testEventClient != null) {
+      Log.d(LOG_TAG, "Reporting the crash to an event service.");
       testEventClient.reportProcessCrash(e);
     }
+
     Log.i(LOG_TAG, "Bringing down the entire Instrumentation process.");
     return super.onException(obj, e);
   }
 
+  @Override
+  public void sendStatus(int resultCode, Bundle results) {
+    Trace.beginSection("sendStatus");
+    try {
+      super.sendStatus(resultCode, results);
+    } finally {
+      Trace.endSection();
+    }
+  }
+
   /** Builds a {@link Request} based on given input arguments. */
   @VisibleForTesting
   Request buildRequest(RunnerArgs runnerArgs, Bundle bundleArgs) {
@@ -628,8 +651,8 @@ TestRequestBuilder createTestRequestBuilder(Instrumentation instr, Bundle argume
     return new TestRequestBuilder(instr, arguments);
   }
 
-  private void registerTestStorage(RunnerArgs runnerArgs) {
-    if (runnerArgs.useTestStorageService) {
+  private void registerTestStorage(Bundle bundleArgs) {
+    if (Boolean.parseBoolean(bundleArgs.getString(RunnerArgs.ARGUMENT_USE_TEST_STORAGE_SERVICE))) {
       Log.d(LOG_TAG, "Use the test storage service for managing file I/O.");
       PlatformTestStorageRegistry.registerInstance(new TestStorage());
     } else {
diff --git a/runner/android_junit_runner/java/androidx/test/runner/UsageTrackerFacilitator.java b/runner/android_junit_runner/java/androidx/test/runner/UsageTrackerFacilitator.java
index d334cac6a..f6b2170f4 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/UsageTrackerFacilitator.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/UsageTrackerFacilitator.java
@@ -18,9 +18,11 @@
 
 import static androidx.test.internal.util.Checks.checkNotNull;
 
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.internal.runner.RunnerArgs;
 import androidx.test.internal.runner.tracker.UsageTracker;
 import androidx.test.internal.runner.tracker.UsageTrackerRegistry;
@@ -32,6 +34,8 @@ public class UsageTrackerFacilitator implements UsageTracker {
 
   private final boolean shouldTrackUsage;
 
+  /** @hide */
+  @RestrictTo(Scope.LIBRARY)
   public UsageTrackerFacilitator(@NonNull RunnerArgs runnerArgs) {
     checkNotNull(runnerArgs, "runnerArgs cannot be null!");
 
@@ -51,6 +55,8 @@ public boolean shouldTrackUsage() {
     return shouldTrackUsage;
   }
 
+  /** @hide */
+  @RestrictTo(Scope.LIBRARY)
   public void registerUsageTracker(@Nullable UsageTracker usageTracker) {
     if (usageTracker != null && shouldTrackUsage()) {
       Log.i(TAG, "Usage tracking enabled");
diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/GrantPermissionCallable.java b/runner/android_junit_runner/java/androidx/test/runner/permission/GrantPermissionCallable.java
index 79bb88f6f..6c0124b51 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/permission/GrantPermissionCallable.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/permission/GrantPermissionCallable.java
@@ -17,10 +17,10 @@
 package androidx.test.runner.permission;
 
 import android.content.Context;
-import androidx.annotation.NonNull;
 import android.util.Log;
+import androidx.annotation.NonNull;
 
-/** Grants a permission at runtime using a @{link ShellCommand} */
+/** Grants a permission at runtime using a {@link ShellCommand} */
 class GrantPermissionCallable extends RequestPermissionCallable {
 
   private static final String TAG = "GrantPermissionCallable";
diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java b/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java
index 4ab0bb05e..9c9272c2b 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/permission/PermissionRequester.java
@@ -24,11 +24,13 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.annotation.ChecksSdkIntAtLeast;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import androidx.test.internal.platform.content.PermissionGranter;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.permission.UiAutomationShellCommand.PmCommand;
@@ -45,17 +47,19 @@
  * #addPermissions(String...)} to add a permission to the permission list. To request all
  * permissions use the {@link #requestPermissions()} method.
  *
- * <p>Note: Usually this class would not be used directly, but through {@link
- * androidx.test.rule.GrantPermissionRule}.
+ * <p>Note: This class is not intended to be used directly, but rather through {@link
+ * androidx.test.rule.GrantPermissionRule}. For tests running on Android SDKs >= API 28, use {@link
+ * android.app.UiAutomation#grantRuntimePermission(String, String)} instead.
  *
- * <p><b>This API is currently in beta.</b>
+ * @hide
  */
-@Beta
+@RestrictTo(Scope.LIBRARY_GROUP) // used by rule
 @TargetApi(value = 23)
 public class PermissionRequester implements PermissionGranter {
 
   private static final String TAG = "PermissionRequester";
 
+  @ChecksSdkIntAtLeast(extension = 0)
   private int androidRuntimeVersion = Build.VERSION.SDK_INT;
 
   @NonNull private final Context targetContext;
@@ -81,6 +85,7 @@ public PermissionRequester() {
    *
    * @param permissions a list of Android runtime permissions.
    */
+  @Override
   public void addPermissions(@NonNull String... permissions) {
     checkNotNull(permissions, "permissions cannot be null!");
     if (deviceSupportsRuntimePermissions()) {
@@ -103,6 +108,7 @@ public void addPermissions(@NonNull String... permissions) {
    * <p>Precondition: This method does nothing when called on an API level lower than {@link
    * Build.VERSION_CODES#M}.
    */
+  @Override
   public void requestPermissions() {
     if (deviceSupportsRuntimePermissions()) {
       for (RequestPermissionCallable requestPermissionCallable : requestedPermissions) {
diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/RequestPermissionCallable.java b/runner/android_junit_runner/java/androidx/test/runner/permission/RequestPermissionCallable.java
index 0224ad5e9..9778b7c6a 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/permission/RequestPermissionCallable.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/permission/RequestPermissionCallable.java
@@ -21,8 +21,10 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.runner.permission.RequestPermissionCallable.Result;
 import java.util.Objects;
@@ -32,8 +34,11 @@
  * Base class for runtime permission {@link Callable}s.
  *
  * <p>Note: This class is visible only for testing. Please do not use it directly.
+ *
+ * @hide
  */
 @VisibleForTesting
+@RestrictTo(Scope.LIBRARY)
 public abstract class RequestPermissionCallable implements Callable<Result> {
 
   private final ShellCommand shellCommand;
diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/ShellCommand.java b/runner/android_junit_runner/java/androidx/test/runner/permission/ShellCommand.java
index c0a8db1e5..3214a1743 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/permission/ShellCommand.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/permission/ShellCommand.java
@@ -17,14 +17,19 @@
 package androidx.test.runner.permission;
 
 import android.app.UiAutomation;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
 
 /**
  * Ideally we wouldn't need this abstraction but since {@link UiAutomation} is final we need an
  * abstraction on top to be able to mock it in tests. It also gives us the flexibility to switch to
  * another implementation in the future.
+ *
+ * @hide
  */
 @VisibleForTesting
+@RestrictTo(Scope.LIBRARY)
 public abstract class ShellCommand {
 
   /** Characters that have no special meaning to the shell. */
@@ -53,5 +58,5 @@ static String shellEscape(String word) {
     return word;
   }
 
-  abstract void execute() throws Exception;
+  protected abstract void execute() throws Exception;
 }
diff --git a/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationPermissionGranter.java b/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationPermissionGranter.java
new file mode 100644
index 000000000..b72737f81
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/runner/permission/UiAutomationPermissionGranter.java
@@ -0,0 +1,55 @@
+package androidx.test.runner.permission;
+
+import android.app.UiAutomation;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.test.internal.platform.content.PermissionGranter;
+import androidx.test.platform.app.InstrumentationRegistry;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+/**
+ * A {@link PermissionGranter} that uses {@link
+ * android.app.UiAutomation#grantRuntimePermission(String, String)}
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+@RequiresApi(28)
+public class UiAutomationPermissionGranter implements PermissionGranter {
+  private static final String TAG = "UiAutomationPermGranter";
+  private final Set<String> permissionsToGrant = new LinkedHashSet<>();
+
+  @Override
+  public void addPermissions(@NonNull String... permissions) {
+    Collections.addAll(permissionsToGrant, permissions);
+  }
+
+  @Override
+  public void requestPermissions() {
+    Context targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+    UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+    for (String permission : permissionsToGrant) {
+      if (!isPermissionGranted(targetContext, permission)) {
+        Log.i(
+            TAG,
+            String.format(
+                "Attempting to grant %s to %s", permission, targetContext.getPackageName()));
+        uiAutomation.grantRuntimePermission(targetContext.getPackageName(), permission);
+      } else {
+        Log.i(TAG, "Permission: " + permission + " is already granted!");
+      }
+    }
+  }
+
+  private boolean isPermissionGranted(Context targetContext, String permission) {
+    return targetContext.checkCallingOrSelfPermission(permission)
+        == PackageManager.PERMISSION_GRANTED;
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/runner/screenshot/BasicScreenCaptureProcessor.java b/runner/android_junit_runner/java/androidx/test/runner/screenshot/BasicScreenCaptureProcessor.java
index f9425fe34..e8667d3e9 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/screenshot/BasicScreenCaptureProcessor.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/screenshot/BasicScreenCaptureProcessor.java
@@ -22,7 +22,6 @@
 import android.os.Build;
 import android.util.Log;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -37,9 +36,10 @@
  * android.os.Environment.getExternalStoragePublicDirectory(DIRECTORY_PICTURES), with a simple name
  * that includes a few characteristics about the device it was saved on followed by a UUID.
  *
- * <p><b>This API is currently in beta.</b>
+ * @deprecated use androidx.test.espresso.screenshot.captureToBitmap or
+ *     androidx.test.core.app.DeviceCapture instead
  */
-@Beta
+@Deprecated
 public class BasicScreenCaptureProcessor implements ScreenCaptureProcessor {
   private static int sAndroidRuntimeVersion = Build.VERSION.SDK_INT;
   private static String sAndroidDeviceName = Build.DEVICE;
diff --git a/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCapture.java b/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCapture.java
index 95df80e1d..dea735374 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCapture.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCapture.java
@@ -22,7 +22,6 @@
 import android.graphics.Bitmap;
 import android.graphics.Bitmap.CompressFormat;
 import androidx.annotation.NonNull;
-import androidx.test.annotation.Beta;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
@@ -39,9 +38,10 @@
  * will take precedence over the set of global processors and the {@link
  * BasicScreenCaptureProcessor}.
  *
- * <p><b>This API is currently in beta.</b>
+ * @deprecated use androidx.test.espresso.screenshot.captureToBitmap or
+ *     androidx.test.core.app.DeviceCapture instead
  */
-@Beta
+@Deprecated
 public final class ScreenCapture {
   private static final Bitmap.CompressFormat DEFAULT_FORMAT = PNG;
 
diff --git a/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCaptureProcessor.java b/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCaptureProcessor.java
index 4f2767f98..dfc7a368a 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCaptureProcessor.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/screenshot/ScreenCaptureProcessor.java
@@ -16,15 +16,15 @@
 
 package androidx.test.runner.screenshot;
 
-import androidx.test.annotation.Beta;
 import java.io.IOException;
 
 /**
  * Interface for an object that is capable of processing {@link ScreenCapture}s.
  *
- * <p><b>This API is currently in beta.</b>
+ * @deprecated use androidx.test.espresso.screenshot.captureToBitmap or
+ *     androidx.test.core.app.DeviceCapture instead
  */
-@Beta
+@Deprecated
 public interface ScreenCaptureProcessor {
 
   /**
diff --git a/runner/android_junit_runner/java/androidx/test/runner/screenshot/Screenshot.java b/runner/android_junit_runner/java/androidx/test/runner/screenshot/Screenshot.java
index db7f358f2..e45fce5c8 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/screenshot/Screenshot.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/screenshot/Screenshot.java
@@ -20,13 +20,11 @@
 
 import android.app.Activity;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.os.Looper;
-import androidx.annotation.NonNull;
 import android.view.View;
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.InstrumentationRegistry;
-import androidx.test.annotation.Beta;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
@@ -42,11 +40,11 @@
  * passed to each {@link ScreenCapture} object when they are created during any test. These {@link
  * ScreenCaptureProcessor}s are capable of processing the {@link ScreenCapture} that was created.
  *
- * <p><b>This API is currently in beta.</b>
+ * @deprecated use androidx.test.espresso.screenshot.captureToBitmap or
+ *     androidx.test.core.app.DeviceCapture instead
  */
-@Beta
+@Deprecated
 public final class Screenshot {
-  private static int androidRuntimeVersion = Build.VERSION.SDK_INT;
   private static UiAutomationWrapper uiWrapper = new UiAutomationWrapper();
   // Set of processors to pass to every ScreenCapture when it is created.
   private static Set<ScreenCaptureProcessor> screenCaptureProcessorSet = new HashSet<>();
@@ -54,17 +52,11 @@ public final class Screenshot {
       new TakeScreenshotCallable.Factory();
 
   /**
-   * Creates a {@link ScreenCapture} that contains a {@link Bitmap} of the visible screen content
-   * for Build.VERSION_CODES.JELLY_BEAN_MR2 and above.
+   * Creates a {@link ScreenCapture} that contains a {@link Bitmap} of the visible screen content.
    *
    * <p>The {@link ScreenCapture} that is returned will also contain the set of {@link
    * ScreenCaptureProcessor}s that have been set in this instance.
    *
-   * <p>Note: Only use this method if all your tests run on API versions
-   * Build.VERSION_CODES.JELLY_BEAN_MR2 or above. If you need to take screenshots on lower API
-   * levels, you need to use {@link #capture(Activity)} or {@link #capture(View)} for those
-   * versions.
-   *
    * @return a {@link ScreenCapture} that contains the bitmap of the visible screen content.
    * @throws IllegalStateException if used on API below Build.VERSION_CODES.JELLY_BEAN_MR2
    * @throws ScreenShotException If there was an error capturing the screenshot
@@ -165,7 +157,7 @@ public static void setScreenshotProcessors(Set<ScreenCaptureProcessor> screenCap
   private static ScreenCapture captureImpl(View targetView)
       throws IOException, InterruptedException, ExecutionException {
     Bitmap bitmap;
-    if (targetView == null && androidRuntimeVersion >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+    if (targetView == null) {
       bitmap = captureUiAutomatorImpl();
     } else {
       bitmap = captureViewBasedImpl(targetView);
@@ -204,13 +196,14 @@ static void setUiAutomationWrapper(UiAutomationWrapper wrapper) {
     uiWrapper = wrapper;
   }
 
-  @VisibleForTesting
-  static void setAndroidRuntimeVersion(int sdkInt) {
-    androidRuntimeVersion = sdkInt;
-  }
-
-  /** An Exception associated with failing to capture a screenshot. */
-  static final class ScreenShotException extends RuntimeException {
+  /**
+   * An Exception associated with failing to capture a screenshot.
+   *
+   * @deprecated use androidx.test.espresso.screenshot.captureToBitmap or
+   *     androidx.test.core.app.DeviceCapture instead
+   */
+  @Deprecated
+  public static final class ScreenShotException extends RuntimeException {
     ScreenShotException(Throwable cause) {
       super(cause);
     }
diff --git a/runner/android_junit_runner/java/androidx/test/runner/screenshot/UiAutomationWrapper.java b/runner/android_junit_runner/java/androidx/test/runner/screenshot/UiAutomationWrapper.java
index df56c89fc..ce9cba936 100644
--- a/runner/android_junit_runner/java/androidx/test/runner/screenshot/UiAutomationWrapper.java
+++ b/runner/android_junit_runner/java/androidx/test/runner/screenshot/UiAutomationWrapper.java
@@ -24,7 +24,10 @@
  *
  * <p>Ideally we wouldn't need this abstraction but since {@link android.app.UiAutomation} is final
  * we need an abstraction on top to be able to mock it in tests.
+ *
+ * @deprecated use androidx.test.core.app.DeviceCapture instead
  */
+@Deprecated
 public class UiAutomationWrapper {
 
   @VisibleForTesting
diff --git a/runner/android_junit_runner/java/androidx/test/runner/suites/AndroidClasspathSuite.java b/runner/android_junit_runner/java/androidx/test/runner/suites/AndroidClasspathSuite.java
new file mode 100644
index 000000000..d43d77cb9
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/runner/suites/AndroidClasspathSuite.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.runner.suites;
+
+import static androidx.test.internal.runner.ClassPathScanner.getDefaultClasspaths;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.test.internal.runner.ClassPathScanner;
+import androidx.test.internal.runner.ErrorReportingRunner;
+import androidx.test.internal.runner.TestLoader;
+import androidx.test.runner.suites.AndroidClasspathSuite.RunnerSuite;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import org.junit.runner.RunWith;
+import org.junit.runner.Runner;
+import org.junit.runners.Suite;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.RunnerBuilder;
+
+/**
+ * Test suite that finds all JUnit3 and JUnit4 test classes in the instrumentation context apk.
+ *
+ * <p>This is intended to replicate the legacy AndroidJUnitRunner behavior of discovering and
+ * running all tests when no '-e class' option is specified. e.g. the following AJUR invocations are
+ * equivalent
+ *
+ * <p>'adb shell am instrument mypkg/androidx.test.runner.AndroidJUnitRunner' 'adb shell am
+ * instrument -e class androidx.test.runner.suites.AndroidClasspathSuite
+ * mypkg/androidx.test.runner.AndroidJUnitRunner'
+ */
+@RunWith(RunnerSuite.class)
+public final class AndroidClasspathSuite {
+
+  /**
+   * Only called reflectively. Do not use programmatically.
+   *
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY)
+  public AndroidClasspathSuite() {}
+
+  /**
+   * Internal suite class that performs the work of class path scanning.
+   *
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY)
+  public static class RunnerSuite extends Suite {
+
+    /**
+     * Only called reflectively. Do not use programmatically.
+     *
+     * @hide
+     */
+    @RestrictTo(Scope.LIBRARY)
+    public RunnerSuite(Class<?> klass, RunnerBuilder builder) throws InitializationError {
+      super(klass, getRunnersForClasses(builder));
+    }
+
+    private static List<Runner> getRunnersForClasses(RunnerBuilder builder) {
+      try {
+        Collection<String> classNames =
+            new ClassPathScanner(getDefaultClasspaths(getInstrumentation())).getClassPathEntries();
+        return TestLoader.Factory.create(null, builder, true).getRunnersFor(classNames);
+      } catch (IOException e) {
+        return Arrays.asList(
+            new ErrorReportingRunner(
+                getInstrumentation().getContext().getPackageName(),
+                new RuntimeException(
+                    "Failed to perform classpath scanning to determine tests to run", e)));
+      }
+    }
+  }
+}
diff --git a/runner/android_junit_runner/java/androidx/test/runner/suites/PackagePrefixClasspathSuite.java b/runner/android_junit_runner/java/androidx/test/runner/suites/PackagePrefixClasspathSuite.java
new file mode 100644
index 000000000..8b8e9340b
--- /dev/null
+++ b/runner/android_junit_runner/java/androidx/test/runner/suites/PackagePrefixClasspathSuite.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.runner.suites;
+
+import static androidx.test.internal.runner.ClassPathScanner.getDefaultClasspaths;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.test.internal.runner.ClassPathScanner;
+import androidx.test.internal.runner.ClassPathScanner.ChainedClassNameFilter;
+import androidx.test.internal.runner.ClassPathScanner.ExternalClassNameFilter;
+import androidx.test.internal.runner.ClassPathScanner.InclusivePackageNamesFilter;
+import androidx.test.internal.runner.ErrorReportingRunner;
+import androidx.test.internal.runner.TestLoader;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import org.junit.runner.Runner;
+import org.junit.runners.Suite;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.RunnerBuilder;
+
+/**
+ * An alternative to {@link AndroidClasspathSuite} that ignores classes whose java package is not
+ * within the current class's java package.
+ *
+ * <p>Example usage: * *
+ *
+ * <pre>
+ * package com.example.foo;
+ *
+ * {@literal @}RunWith(PackagePrefixClasspathSuite.class)
+ * public class AllTests {
+ * }
+ * </pre>
+ *
+ * <p>This class was intended for large applications using {@link AndroidClasspathSuite} results in
+ * LinearAlloc errors (b/36936369) and performance overhead when scanning the entire classpath.
+ */
+public final class PackagePrefixClasspathSuite extends Suite {
+
+  /**
+   * Only called reflectively. Do not use programmatically.
+   *
+   * @hide
+   */
+  @RestrictTo(Scope.LIBRARY)
+  public PackagePrefixClasspathSuite(Class<?> klass, RunnerBuilder builder)
+      throws InitializationError {
+    super(klass, getRunnersForClasses(klass, builder));
+  }
+
+  private static List<Runner> getRunnersForClasses(Class<?> klass, RunnerBuilder builder) {
+    try {
+      ChainedClassNameFilter filter = new ChainedClassNameFilter();
+      filter.add(new InclusivePackageNamesFilter(Arrays.asList(klass.getPackage().getName())));
+      filter.add(new ExternalClassNameFilter());
+      Collection<String> classNames =
+          new ClassPathScanner(getDefaultClasspaths(getInstrumentation()))
+              .getClassPathEntries(filter);
+      classNames.remove(klass.getName());
+      return TestLoader.Factory.create(null, builder, true).getRunnersFor(classNames);
+    } catch (IOException e) {
+      return Arrays.asList(
+          new ErrorReportingRunner(
+              getInstrumentation().getContext().getPackageName(),
+              new RuntimeException(
+                  "Failed to perform classpath scanning to determine tests to run", e)));
+    }
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/BUILD b/runner/android_junit_runner/javatests/androidx/test/BUILD
new file mode 100644
index 000000000..509242c78
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/BUILD
@@ -0,0 +1,157 @@
+# Description: Tests for Runner
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "legacy_test_manifest",
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+)
+
+axt_android_library_test(
+    name = "FailureAssumptionTest",
+    srcs = ["FailureAssumptionTest.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "JUnit4CategoryTest",
+    srcs = ["JUnit4CategoryTest.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "MyAndroidTestCase",
+    srcs = ["MyAndroidTestCase.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@androidsdk//:legacy_test-36",
+    ],
+)
+
+axt_android_library_test(
+    name = "MyInstrumentationTestCase",
+    srcs = ["MyInstrumentationTestCase.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@androidsdk//:legacy_test-36",
+    ],
+)
+
+axt_android_library_test(
+    name = "MyParameterizedTest",
+    srcs = ["MyParameterizedTest.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ParameterizedWithCommaTest",
+    srcs = ["ParameterizedWithCommaTest.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "TheoriesAndTestsTogether",
+    srcs = ["TheoriesAndTestsTogether.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "TimeoutTest",
+    srcs = ["TimeoutTest.java"],
+    deps = [
+        ":legacy_test_manifest",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+# intentionally omitted tests
+# suites not supported in Google3
+#"JUnitTestSuiteTest.java",
+#"MyTestSuiteBuilder.java",
+# performance/profiling test
+#"JUnit3HogTest.java",
+#"JUnit4HogTest.java",
+# empty tests not supported
+#"MyEmptyTest.java",
+
+# A basic test to use as baseline benchmark
+axt_android_library_test(
+    name = "SimpleTest",
+    srcs = [
+        "SimpleTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/BUILD.bazel b/runner/android_junit_runner/javatests/androidx/test/BUILD.bazel
deleted file mode 100644
index 6eabaed12..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/BUILD.bazel
+++ /dev/null
@@ -1,166 +0,0 @@
-# Description: Tests for Runner
-
-load(
-    "//build_extensions:android_library_instrumentation_tests.bzl",
-    "android_library_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "legacy_test_manifest",
-    exports_manifest = 1,
-    manifest = "AndroidManifest.xml",
-)
-
-PARAMETERIZED_SRCS = [
-    "internal/runner/AndroidLogOnlyBuilderTest.java",
-    "internal/runner/TestLoaderTest.java",
-]
-
-UI_THREAD_STATEMENT_TEST_EXAMPLES = [
-    "internal/runner/junit4/statement/UiThreadTestInterface.java",
-    "internal/runner/junit4/statement/UiThreadTestOnClass.java",
-    "internal/runner/junit4/statement/UiThreadTestOnImplementedInterface.java",
-    "internal/runner/junit4/statement/UiThreadTestOnMethod.java",
-    "internal/runner/junit4/statement/UiThreadTestOnSuperclass.java",
-]
-
-# TODO(b/26110951) - remove when these classes are standalone parameterized tests
-android_library(
-    name = "parameterized",
-    srcs = PARAMETERIZED_SRCS,
-    deps = [
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-    ],
-)
-
-android_library(
-    name = "ui_thread_statement_test_examples",
-    srcs = UI_THREAD_STATEMENT_TEST_EXAMPLES,
-    deps = [
-        "//ext/junit",
-        "//runner/rules",
-        "@maven//:junit_junit",
-    ],
-)
-
-# test classpath scanning for a multidex test apk, with a small app apk
-android_binary(
-    name = "stub_target_app",
-    manifest = "//build_extensions:AndroidManifest_target_stub.xml",
-    manifest_values = {
-        "applicationId": "androidx.test.multidex",
-    },
-    deps = [
-        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
-    ],
-)
-
-android_binary(
-    name = "ClassPathScannerTest_app",
-    srcs = ["internal/runner/ClassPathScannerTest.java"],
-    instruments = ":stub_target_app",
-    manifest = "//build_extensions:AndroidManifest_instrumentation_test_template.xml",
-    manifest_values = {
-        "applicationId": "androidx.test.tests",
-        "instrumentationTargetPackage": "androidx.test.multidex",
-    },
-    multidex = "legacy",
-    deps = [
-        # include the large number of methods that will force classes off main dex
-        "//testapps/multidex_testapp/java/androidx/test/multidex/app:src",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "@maven//:junit_junit",
-        "@maven//:com_google_truth_truth",
-    ],
-)
-
-android_instrumentation_test(
-    name = "ClassPathScannerTest",
-    args = [
-        "--test_class=androidx.test.internal.runner.ClassPathScannerTest",
-        "--test_filter_spec",
-        "-TEST_NAME",
-        "--test_package_names",
-        "androidx.test.testing",
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_19_x86",
-    test_app = ":ClassPathScannerTest_app",
-)
-
-android_library_instrumentation_tests(
-    name = "android_junit_runner_tests",
-    size = "large",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = [
-            # suites not supported in Google3
-            "JUnitTestSuiteTest.java",
-            "MyTestSuiteBuilder.java",
-            # performance/profiling test
-            "JUnit3HogTest.java",
-            "JUnit4HogTest.java",
-            # empty tests not supported
-            "MyEmptyTest.java",
-            # parameterized tests not supported
-            "MyParameterizedTest.java",
-            # suppressed
-            "TheoriesAndTestsTogether.java",
-            # tested separately
-            "internal/runner/ClassPathScannerTest.java",
-            "internal/runner/TestRequestBuilderLocalTest.java",
-        ] + PARAMETERIZED_SRCS + UI_THREAD_STATEMENT_TEST_EXAMPLES,
-    ),
-    args = [
-        "--test_filter_spec",
-        "-TEST_NAME",
-        "--test_package_names",
-        "androidx.test.testing",
-    ],
-    target_devices = devices(),
-    deps = [
-        ":legacy_test_manifest",
-        ":parameterized",
-        ":ui_thread_statement_test_examples",
-        "//core",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
-        "//runner/rules",
-        "//services/events/java/androidx/test/services/events",
-        "@androidsdk//:legacy_test-30",
-        "@maven//:com_google_truth_truth",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
-
-android_local_test(
-    name = "TestRequestBuilderLocalTest",
-    srcs = ["internal/runner/TestRequestBuilderLocalTest.java"],
-    test_class = "androidx.test.internal.runner.TestRequestBuilderLocalTest",
-    deps = [
-        "runner/android_junit_runner",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:com_google_truth_truth",
-    ],
-)
diff --git a/runner/android_junit_runner/javatests/androidx/test/MyParameterizedTest.java b/runner/android_junit_runner/javatests/androidx/test/MyParameterizedTest.java
index ea69928bd..b47303916 100644
--- a/runner/android_junit_runner/javatests/androidx/test/MyParameterizedTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/MyParameterizedTest.java
@@ -17,7 +17,6 @@
 
 import android.app.Instrumentation;
 import androidx.test.filters.SmallTest;
-import androidx.test.filters.Suppress;
 import java.util.Arrays;
 import java.util.Collection;
 import org.junit.Assert;
@@ -29,7 +28,6 @@
 /**
  * Placeholder to verify {@link Instrumentation} can be injected into {@link Parameterized} tests
  */
-@Suppress // b/26110951
 @RunWith(Parameterized.class)
 @SmallTest
 public class MyParameterizedTest {
diff --git a/runner/android_junit_runner/javatests/androidx/test/ParameterizedWithCommaTest.java b/runner/android_junit_runner/javatests/androidx/test/ParameterizedWithCommaTest.java
new file mode 100644
index 000000000..52d15fcf3
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/ParameterizedWithCommaTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test;
+
+import androidx.test.filters.SmallTest;
+import java.util.Arrays;
+import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Verifies Parameterized test with commas as part of name.
+ *
+ * <p>Comma is used as a separater token to run multiple test classes, so this test verifies the
+ * runner correctly handles the comma when run via orchestrator.
+ */
+@RunWith(Parameterized.class)
+@SmallTest
+public class ParameterizedWithCommaTest {
+
+  @Parameters(name = "{index}, fib({0})={1}")
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{0, 0}, {1, 1}, {2, 1}, {3, 2}, {4, 3}, {5, 5}, {6, 8}});
+  }
+
+  private final int mInput;
+  private final int mExpected;
+
+  public ParameterizedWithCommaTest(int input, int expected) {
+    mInput = input;
+    mExpected = expected;
+  }
+
+  @Test
+  public void testFib() {
+    Assert.assertEquals(mExpected, fibonacci(mInput));
+    // verify Instrumentation was injected in a Parameterized test
+    Assert.assertNotNull(InstrumentationRegistry.getInstrumentation());
+  }
+
+  private int fibonacci(int n) {
+    if (n == 0 || n == 1) return n;
+    else return fibonacci(n - 1) + fibonacci(n - 2);
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/ParameterizedWithHashTest.java b/runner/android_junit_runner/javatests/androidx/test/ParameterizedWithHashTest.java
new file mode 100644
index 000000000..87625c5b2
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/ParameterizedWithHashTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test;
+
+import androidx.test.filters.SmallTest;
+import java.util.Arrays;
+import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
+
+/**
+ * Verifies Parameterized test with number sign as part of name.
+ *
+ * <p>The # symbol is used as a class/method separator so this test verifies the runner correctly
+ * handles the method name when run via orchestrator.
+ */
+@RunWith(Parameterized.class)
+@SmallTest
+public class ParameterizedWithHashTest {
+
+  @Parameters(name = "{index}# fib({0})={1}")
+  public static Collection<Object[]> data() {
+    return Arrays.asList(new Object[][] {{0, 0}, {1, 1}, {2, 1}, {3, 2}, {4, 3}, {5, 5}, {6, 8}});
+  }
+
+  private final int mInput;
+  private final int mExpected;
+
+  public ParameterizedWithHashTest(int input, int expected) {
+    mInput = input;
+    mExpected = expected;
+  }
+
+  @Test
+  public void testFib() {
+    Assert.assertEquals(mExpected, fibonacci(mInput));
+    // verify Instrumentation was injected in a Parameterized test
+    Assert.assertNotNull(InstrumentationRegistry.getInstrumentation());
+  }
+
+  private int fibonacci(int n) {
+    if (n == 0 || n == 1) return n;
+    else return fibonacci(n - 1) + fibonacci(n - 2);
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/SimpleTest.java b/runner/android_junit_runner/javatests/androidx/test/SimpleTest.java
index 1b2b63070..a9dbe9c2d 100644
--- a/runner/android_junit_runner/javatests/androidx/test/SimpleTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/SimpleTest.java
@@ -16,7 +16,7 @@ public void singleTest() {
   }
 
   @Test
-  public void singleTes1t() {
+  public void singleTest1() {
     assertThat(2 + 2).isEqualTo(4);
   }
 
diff --git a/runner/android_junit_runner/javatests/androidx/test/TheoriesAndTestsTogether.java b/runner/android_junit_runner/javatests/androidx/test/TheoriesAndTestsTogether.java
index 87e9946e4..9a1df36cc 100644
--- a/runner/android_junit_runner/javatests/androidx/test/TheoriesAndTestsTogether.java
+++ b/runner/android_junit_runner/javatests/androidx/test/TheoriesAndTestsTogether.java
@@ -23,7 +23,6 @@
 import static org.junit.Assume.assumeThat;
 
 import androidx.test.filters.SmallTest;
-import androidx.test.filters.Suppress;
 import org.junit.Assume;
 import org.junit.Test;
 import org.junit.experimental.theories.DataPoint;
@@ -31,7 +30,6 @@
 import org.junit.experimental.theories.Theory;
 import org.junit.runner.RunWith;
 
-@Suppress // b/26110951
 @RunWith(Theories.class)
 @SmallTest
 public class TheoriesAndTestsTogether {
diff --git a/runner/android_junit_runner/javatests/androidx/test/TimeoutTest.java b/runner/android_junit_runner/javatests/androidx/test/TimeoutTest.java
index 460bc36de..d1d89f25e 100644
--- a/runner/android_junit_runner/javatests/androidx/test/TimeoutTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/TimeoutTest.java
@@ -32,7 +32,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.rules.Timeout;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
@@ -51,23 +50,10 @@ public void setUp() throws Exception {
   }
 
   @Test
-  public void testTimeoutsInJUnit4WithRule() {
+  public void testTimeoutsInJUnit4() {
     Request request =
         builder
-            .addTestClass(JUnit4WithRuleClass.class.getName())
-            .setPerTestTimeout(JUnit3StyleTimeoutClass.GLOBAL_ARG_TIMEOUT)
-            .build();
-    JUnitCore junitCore = new JUnitCore();
-    Result result = junitCore.run(request);
-    assertThat(result.getFailures()).isEmpty();
-    assertThat(result.getRunCount()).isEqualTo(2);
-  }
-
-  @Test
-  public void testTimeoutsInJUnit4WithNoRule() {
-    Request request =
-        builder
-            .addTestClass(JUnit4NoRuleClass.class.getName())
+            .addTestClass(JUnit4Class.class.getName())
             .setPerTestTimeout(JUnit3StyleTimeoutClass.GLOBAL_ARG_TIMEOUT)
             .build();
     JUnitCore junitCore = new JUnitCore();
@@ -107,7 +93,7 @@ public void testJUnit3TimeoutTestsThatFailButNotTimeout() {
     Request request =
         builder
             .addTestClass(JUnit3StyleTimeoutClass.class.getName())
-            .setPerTestTimeout(200)
+            .setPerTestTimeout(2000)
             .build();
     JUnitCore junitCore = new JUnitCore();
     Result result = junitCore.run(request);
@@ -138,36 +124,11 @@ public boolean matchesSafely(List<?> item) {
     };
   }
 
-  /**
-   * Test various timeout functionality without @RunWith(AndroidJUnit4.class) annotation. By default
-   * the Android specific runner should be used.
-   */
-  public static class JUnit4WithRuleClass {
-    @Rule public Timeout globalTimeout = new Timeout(JUnit3StyleTimeoutClass.GLOBAL_RULE_TIMEOUT);
-    @Rule public final ExpectedException thrown = ExpectedException.none();
-
-    @Test
-    public void checkGlobalRuleTimeoutInterruptsOverArgTimeout() throws InterruptedException {
-      thrown.expectMessage(getTimeoutExceptionMessage(JUnit3StyleTimeoutClass.GLOBAL_RULE_TIMEOUT));
-      Thread.sleep(JUnit3StyleTimeoutClass.GLOBAL_ARG_TIMEOUT);
-    }
-
-    @Test(timeout = JUnit3StyleTimeoutClass.TEST_TIMEOUT)
-    public void checkTestTimeoutInterruptsOverAllOthers() throws InterruptedException {
-      thrown.expectMessage(getTimeoutExceptionMessage(JUnit3StyleTimeoutClass.TEST_TIMEOUT));
-      Thread.sleep(JUnit3StyleTimeoutClass.GLOBAL_RULE_TIMEOUT);
-    }
-
-    private String getTimeoutExceptionMessage(int millis) {
-      return String.format("test timed out after %s milliseconds", millis);
-    }
-  }
-
   /**
    * Test various timeout functionality with @RunWith(AndroidJUnit4.class) annotation. All Android
    * specific features should still work when RunWith explicitly defined.
    */
-  public static class JUnit4NoRuleClass {
+  public static class JUnit4Class {
     @Rule public final ExpectedException thrown = ExpectedException.none();
 
     @Test
@@ -180,7 +141,7 @@ public void checkArgTimeoutInterrupts() throws InterruptedException {
     @Test(timeout = JUnit3StyleTimeoutClass.TEST_TIMEOUT)
     public void checkTestTimeoutInterruptsOverArgTimeout() throws InterruptedException {
       thrown.expectMessage(getTimeoutExceptionMessage(JUnit3StyleTimeoutClass.TEST_TIMEOUT));
-      Thread.sleep(JUnit3StyleTimeoutClass.GLOBAL_ARG_TIMEOUT);
+      Thread.sleep(JUnit3StyleTimeoutClass.TEST_TIMEOUT + JUnit3StyleTimeoutClass.WAIT_FOR_TIMEOUT);
     }
 
     private String getTimeoutExceptionMessage(int millis) {
diff --git a/runner/android_junit_runner/javatests/androidx/test/build_defs.bzl b/runner/android_junit_runner/javatests/androidx/test/build_defs.bzl
new file mode 100644
index 000000000..f29dc2fd2
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/build_defs.bzl
@@ -0,0 +1,50 @@
+"""Common functions for androidx_test tests."""
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_test")
+
+API_LEVELS = [
+    "15_x86",
+    "16_x86",
+    "17_x86",
+    "18_x86",
+    "19_x86",
+    "21_x86",
+    "22_x86",
+    "23_x86",
+    "24_x86",
+    "25_x86",
+]
+
+def axt_test(src, deps, extra_args = [], shard_count = 1, size = "medium", timeout = "moderate"):
+    # assume src has .java suffix
+    name_prefix = src[:-5]
+    for api in API_LEVELS:
+        axt_test_target(name_prefix, src, api, deps, extra_args, shard_count, size, timeout)
+
+def axt_test_target(
+        name_prefix,
+        src,
+        api_level,
+        deps,
+        extra_args = [],
+        shard_count = 1,
+        size = "medium",
+        timeout = "moderate",
+        extra_tags = []):
+    android_test(
+        name = "%s_%s" % (name_prefix, api_level),
+        size = size,
+        timeout = timeout,
+        srcs = [src],
+        args = [
+            "--clear_package_data",
+            "--test_filter_spec=-TEST_NAME",
+            "--test_package_names=androidx.test.testing.fixtures",
+            "--install_test_services=True",
+        ] + extra_args,
+        manifest = "AndroidManifest.xml",
+        shard_count = shard_count,
+        tags = extra_tags,
+        target_devices = ["//tools/android/emulated_devices/generic_phone:android_%s" % (api_level)],
+        deps = deps,
+    )
diff --git a/runner/android_junit_runner/javatests/androidx/test/filters/BUILD b/runner/android_junit_runner/javatests/androidx/test/filters/BUILD
new file mode 100644
index 000000000..e655b909b
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/filters/BUILD
@@ -0,0 +1,27 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "TestsRegExFilterTest",
+    srcs = [
+        "TestsRegExFilterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:filters",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/filters/TestsRegExFilterTest.java b/runner/android_junit_runner/javatests/androidx/test/filters/TestsRegExFilterTest.java
similarity index 77%
rename from runner/android_junit_runner/javatests/androidx/test/internal/runner/filters/TestsRegExFilterTest.java
rename to runner/android_junit_runner/javatests/androidx/test/filters/TestsRegExFilterTest.java
index 784a89151..fdc7f978f 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/filters/TestsRegExFilterTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/filters/TestsRegExFilterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package androidx.test.internal.runner.filters;
+package androidx.test.filters;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -30,7 +30,7 @@ public static class TestFixture {}
 
   @Test
   public void emptyPasses() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     Description d = Description.createTestDescription(TestFixture.class, "any");
     ;
     assertThat(filter.evaluateTest(d)).isTrue();
@@ -38,7 +38,7 @@ public void emptyPasses() {
 
   @Test
   public void partialClassName() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     filter.setPattern("TestFixture");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
@@ -47,7 +47,7 @@ public void partialClassName() {
 
   @Test
   public void partialClassName_noMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     filter.setPattern("NotTheClassImLookingFor");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
@@ -56,8 +56,8 @@ public void partialClassName_noMatch() {
 
   @Test
   public void packageMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
-    filter.setPattern("androidx.test.internal.runner.filters");
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
+    filter.setPattern("androidx.test.filters");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
     assertThat(filter.evaluateTest(d)).isTrue();
@@ -65,8 +65,8 @@ public void packageMatch() {
 
   @Test
   public void package_noMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
-    filter.setPattern("androidx.test.internal.runner.filters.notit");
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
+    filter.setPattern("androidx.test.filters.notit");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
     assertThat(filter.evaluateTest(d)).isFalse();
@@ -74,7 +74,7 @@ public void package_noMatch() {
 
   @Test
   public void methodMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new androidx.test.filters.TestsRegExFilter();
     filter.setPattern("TestFixture#any");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
@@ -87,7 +87,7 @@ public void methodMatch() {
 
   @Test
   public void methodOrMatch() {
-    TestsRegExFilter filter = new TestsRegExFilter();
+    androidx.test.filters.TestsRegExFilter filter = new TestsRegExFilter();
     filter.setPattern("TestFixture#any|TestFixture#excluded");
     Description d = Description.createTestDescription(TestFixture.class, "any");
 
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD
new file mode 100644
index 000000000..797694268
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD
@@ -0,0 +1,120 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+# Description: Tests for the Orchestrator client connection
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "TestEventServiceConnectionBaseTest",
+    size = "small",
+    srcs = [
+        "TestEventServiceConnectionBaseTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+android_library(
+    name = "sampletest",
+    testonly = 1,
+    srcs = ["SampleJUnitTest.java"],
+    deps = ["@maven//:junit_junit"],
+)
+
+axt_android_local_test(
+    name = "OrchestratedInstrumentationListenerTest",
+    size = "small",
+    srcs = [
+        "OrchestratedInstrumentationListenerTest.java",
+    ],
+    deps = [
+        ":sampletest",
+        "//runner/android_junit_runner",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestDiscoveryListenerTest",
+    size = "small",
+    srcs = [
+        "TestDiscoveryListenerTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestEventClientArgsTest",
+    size = "small",
+    srcs = [
+        "TestEventClientArgsTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestEventClientTest",
+    size = "small",
+    srcs = [
+        "TestEventClientTest.java",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestPlatformListenerTest",
+    size = "small",
+    srcs = [
+        "TestPlatformListenerTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "JUnitDescriptionParserTest",
+    size = "small",
+    srcs = ["JUnitDescriptionParserTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD.bazel b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD.bazel
deleted file mode 100644
index 908b21554..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/BUILD.bazel
+++ /dev/null
@@ -1,4 +0,0 @@
-# Description: Tests for the Orchestrator client connection
-licenses(["notice"])  # Apache License 2.0
-
-# TODO(b/161812565): create Bazel files for test events and new AJUR files
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestDiscoveryListenerTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestDiscoveryListenerTest.java
new file mode 100644
index 000000000..b17e4f59e
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestDiscoveryListenerTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.internal.events.client;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.services.events.discovery.TestDiscoveryErrorEvent;
+import androidx.test.services.events.discovery.TestDiscoveryEvent;
+import androidx.test.services.events.discovery.TestDiscoveryFinishedEvent;
+import androidx.test.services.events.discovery.TestDiscoveryStartedEvent;
+import androidx.test.services.events.discovery.TestFoundEvent;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runner.notification.Failure;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/** Unit tests fpr {@link TestDiscoveryListener}. */
+@RunWith(AndroidJUnit4.class)
+public class TestDiscoveryListenerTest {
+  @Mock TestEventClientConnectListener mockConnectListener;
+  @Mock TestDiscoveryEventService discoveryEventService;
+
+  @Before
+  public void before() {
+    MockitoAnnotations.initMocks(this);
+  }
+
+  @Test
+  public void testFound() throws TestEventClientException {
+    TestDiscoveryListener testDiscoveryListener = new TestDiscoveryListener(discoveryEventService);
+    Description testDescription = Description.createTestDescription(getClass(), "sampleTest");
+
+    testDiscoveryListener.testRunStarted(Description.EMPTY);
+    testDiscoveryListener.testFinished(testDescription);
+    testDiscoveryListener.testRunFinished(new Result());
+
+    ArgumentCaptor<TestDiscoveryEvent> argument = ArgumentCaptor.forClass(TestDiscoveryEvent.class);
+    verify(discoveryEventService, times(3)).send(argument.capture());
+
+    assertThat(argument.getAllValues().get(0), instanceOf(TestDiscoveryStartedEvent.class));
+    TestFoundEvent infoEvent = (TestFoundEvent) argument.getAllValues().get(1);
+    assertThat(argument.getAllValues().get(2), instanceOf(TestDiscoveryFinishedEvent.class));
+
+    assertThat(
+        infoEvent.testCase.getClassAndMethodName(),
+        is(getClass().getCanonicalName() + "#sampleTest"));
+  }
+
+  @Test
+  public void testFailure_initError() throws TestEventClientException {
+    ArgumentCaptor<TestDiscoveryEvent> argument = ArgumentCaptor.forClass(TestDiscoveryEvent.class);
+    TestDiscoveryListener testDiscoveryListener = new TestDiscoveryListener(discoveryEventService);
+    Description testDescription = Description.createTestDescription("a.b", "initializationError");
+
+    testDiscoveryListener.testRunStarted(Description.EMPTY);
+    testDiscoveryListener.testFailure(new Failure(testDescription, new RuntimeException()));
+    testDiscoveryListener.testFinished(testDescription);
+    testDiscoveryListener.testRunFinished(new Result());
+
+    verify(discoveryEventService, times(3)).send(argument.capture());
+    assertThat(argument.getAllValues().get(0), instanceOf(TestDiscoveryStartedEvent.class));
+    assertThat(argument.getAllValues().get(1), instanceOf(TestDiscoveryErrorEvent.class));
+    assertThat(argument.getAllValues().get(2), instanceOf(TestDiscoveryFinishedEvent.class));
+    verifyNoMoreInteractions(discoveryEventService);
+  }
+
+  @Test
+  public void reportProcessCrashed() throws TestEventClientException {
+    ArgumentCaptor<TestDiscoveryEvent> argument = ArgumentCaptor.forClass(TestDiscoveryEvent.class);
+    TestDiscoveryListener testDiscoveryListener = new TestDiscoveryListener(discoveryEventService);
+
+    boolean result = testDiscoveryListener.reportProcessCrash(new RuntimeException());
+
+    assertTrue(result);
+    verify(discoveryEventService, times(3)).send(argument.capture());
+    assertThat(argument.getAllValues().get(0), instanceOf(TestDiscoveryStartedEvent.class));
+    assertThat(argument.getAllValues().get(1), instanceOf(TestDiscoveryErrorEvent.class));
+    assertThat(argument.getAllValues().get(2), instanceOf(TestDiscoveryFinishedEvent.class));
+    verifyNoMoreInteractions(discoveryEventService);
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestDiscoveryTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestDiscoveryTest.java
deleted file mode 100644
index b6298565a..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestDiscoveryTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.internal.events.client;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.services.events.discovery.TestDiscoveryEvent;
-import androidx.test.services.events.discovery.TestDiscoveryFinishedEvent;
-import androidx.test.services.events.discovery.TestDiscoveryStartedEvent;
-import androidx.test.services.events.discovery.TestFoundEvent;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.Description;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-/** Unit tests fpr {@link TestDiscovery}. */
-@RunWith(AndroidJUnit4.class)
-public class TestDiscoveryTest {
-  @Mock TestEventClientConnectListener mockConnectListener;
-  @Mock TestDiscoveryEventService discoveryEventService;
-
-  @Before
-  public void before() {
-    MockitoAnnotations.initMocks(this);
-  }
-
-  @Test
-  public void addTests() throws TestEventClientException {
-    TestDiscovery testDiscovery = new TestDiscovery(discoveryEventService);
-    Description testDescription = Description.createTestDescription(getClass(), "sampleTest");
-
-    testDiscovery.addTests(testDescription);
-
-    ArgumentCaptor<TestDiscoveryEvent> argument = ArgumentCaptor.forClass(TestDiscoveryEvent.class);
-    verify(discoveryEventService, times(3)).send(argument.capture());
-
-    assertThat(argument.getAllValues().get(0), instanceOf(TestDiscoveryStartedEvent.class));
-    TestFoundEvent infoEvent = (TestFoundEvent) argument.getAllValues().get(1);
-    assertThat(argument.getAllValues().get(2), instanceOf(TestDiscoveryFinishedEvent.class));
-
-    assertThat(
-        infoEvent.testCase.getClassAndMethodName(),
-        is(getClass().getCanonicalName() + "#sampleTest"));
-  }
-
-  @Test
-  public void addBogusTest() throws TestEventClientException {
-    ArgumentCaptor<TestDiscoveryEvent> argument = ArgumentCaptor.forClass(TestDiscoveryEvent.class);
-
-    TestDiscovery testDiscovery = new TestDiscovery(discoveryEventService);
-    Description testDescription = Description.createTestDescription("a.b", "initializationError");
-    testDiscovery.addTests(testDescription);
-
-    verify(discoveryEventService, times(2)).send(argument.capture());
-    assertThat(argument.getAllValues().get(0), instanceOf(TestDiscoveryStartedEvent.class));
-    assertThat(argument.getAllValues().get(1), instanceOf(TestDiscoveryFinishedEvent.class));
-    verifyNoMoreInteractions(discoveryEventService);
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestEventClientTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestEventClientTest.java
index ae5bbc53c..7a0e27dd6 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestEventClientTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/events/client/TestEventClientTest.java
@@ -19,7 +19,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
 
 import android.content.Context;
 import android.os.Bundle;
@@ -62,8 +61,7 @@ public void connect_noOrchestrationServiceProvided_returnsNoOpClient() {
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    assertThat(client.isTestDiscoveryEnabled(), is(false));
-    assertThat(client.isTestRunEventsEnabled(), is(false));
+    assertThat(client.isOrchestrationServiceEnabled(), is(false));
   }
 
   @Test
@@ -74,8 +72,7 @@ public void connect_onlyOrchestrationServiceProvided_returnsRunEventsClient() {
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    assertThat(client.isTestDiscoveryEnabled(), is(false));
-    assertThat(client.isTestRunEventsEnabled(), is(true));
+    assertThat(client.isOrchestrationServiceEnabled(), is(true));
   }
 
   @Test
@@ -87,8 +84,7 @@ public void connect_orchestrationServiceProvided_listTestsArgFalse_returnsRunEve
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    assertThat(client.isTestDiscoveryEnabled(), is(false));
-    assertThat(client.isTestRunEventsEnabled(), is(true));
+    assertThat(client.isOrchestrationServiceEnabled(), is(true));
   }
 
   @Test
@@ -100,12 +96,11 @@ public void connect_orchestrationServiceProvided_listTestsArgTrue_returnsDiscove
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    assertThat(client.isTestDiscoveryEnabled(), is(true));
-    assertThat(client.isTestRunEventsEnabled(), is(false));
+    assertThat(client.isOrchestrationServiceEnabled(), is(true));
   }
 
   @Test
-  public void getNotificationRunListener_listTestsArgTrue_returnsNull() {
+  public void getNotificationRunListener_listTestsArgTrue_returnsDiscoveryListener() {
     Bundle bundle = new Bundle();
     bundle.putString(ARGUMENT_ORCHESTRATOR_SERVICE, "foo.OrchestratorService");
     bundle.putString(ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR, "true");
@@ -113,7 +108,7 @@ public void getNotificationRunListener_listTestsArgTrue_returnsNull() {
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    assertThat(client.getRunListener(), nullValue());
+    assertThat(client.getRunListener(), instanceOf(RunListener.class));
   }
 
   @Test
@@ -129,7 +124,7 @@ public void getNotificationRunListener_listTestsArgFalse_returnsRunListenerInsta
   }
 
   @Test
-  public void addTests_listTestsArgFalse_doesNotThrow() {
+  public void addTests_listTestsArgFalse_doesNotThrow() throws Exception {
     Bundle bundle = new Bundle();
     bundle.putString(ARGUMENT_ORCHESTRATOR_SERVICE, "foo.OrchestratorService");
     bundle.putString(ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR, "false");
@@ -137,11 +132,13 @@ public void addTests_listTestsArgFalse_doesNotThrow() {
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    client.addTests(Description.createTestDescription(getClass(), "sampleTest"));
+    client
+        .getRunListener()
+        .testFinished(Description.createTestDescription(getClass(), "sampleTest"));
   }
 
   @Test
-  public void addTests_listTestsArgTrue_doesNotThrow() {
+  public void addTests_listTestsArgTrue_doesNotThrow() throws Exception {
     Bundle bundle = new Bundle();
     bundle.putString(ARGUMENT_ORCHESTRATOR_SERVICE, "foo.OrchestratorService");
     bundle.putString(ARGUMENT_LIST_TESTS_FOR_ORCHESTRATOR, "true");
@@ -149,7 +146,9 @@ public void addTests_listTestsArgTrue_doesNotThrow() {
 
     TestEventClient client = TestEventClient.connect(context, listener, args);
 
-    client.addTests(Description.createTestDescription(getClass(), "sampleTest"));
+    client
+        .getRunListener()
+        .testFinished(Description.createTestDescription(getClass(), "sampleTest"));
   }
 
   private static TestEventClientArgs argsFromBundle(Bundle bundle) {
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderNotScanningPathTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderNotScanningPathTest.java
deleted file mode 100644
index 10ebe91b6..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderNotScanningPathTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner;
-
-import androidx.test.filters.SmallTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Work around for lack of support for Parameterized tests in Google 3.
- *
- * <p>TODO(b/26110951) remove when super class can be Parameterized.
- */
-@RunWith(JUnit4.class)
-@SmallTest
-public class AndroidLogOnlyBuilderNotScanningPathTest extends AndroidLogOnlyBuilderTest {
-
-  public AndroidLogOnlyBuilderNotScanningPathTest() {
-    super(false);
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderScanningPathTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderScanningPathTest.java
deleted file mode 100644
index b6a3a2af3..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderScanningPathTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner;
-
-import androidx.test.filters.SmallTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-
-/**
- * Work around for lack of support for Parameterized tests in Google 3.
- *
- * <p>TODO(b/26110951) remove when super class can be Parameterized.
- */
-@RunWith(JUnit4.class)
-@SmallTest
-public class AndroidLogOnlyBuilderScanningPathTest extends AndroidLogOnlyBuilderTest {
-
-  public AndroidLogOnlyBuilderScanningPathTest() {
-    super(true);
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderTest.java
index b6a240230..6de46b1b3 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidLogOnlyBuilderTest.java
@@ -16,54 +16,32 @@
 
 package androidx.test.internal.runner;
 
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.hamcrest.Matchers.typeCompatibleWith;
-import static org.junit.Assert.assertThat;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
-import androidx.test.internal.runner.junit3.JUnit38ClassRunner;
-import androidx.test.internal.util.AndroidRunnerParams;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.testing.fixtures.JUnit3FailingTestCase;
 import androidx.test.testing.fixtures.JUnit3FailingTestSuiteWithSuite;
 import androidx.test.testing.fixtures.JUnit4Failing;
 import androidx.test.testing.fixtures.JUnit4ParameterizedTest;
 import java.util.Collections;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.runners.Enclosed;
-import org.junit.internal.runners.ErrorReportingRunner;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
 import org.junit.runners.Suite;
 import org.junit.runners.model.RunnerBuilder;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
-// TODO(b/26110951) not supported yet (note this class is ignored in BUILD file as well)
-// @RunWith(Parameterized.class)
-public abstract class AndroidLogOnlyBuilderTest {
-
-  @Mock private AndroidRunnerParams mockAndroidRunnerParams;
+@RunWith(AndroidJUnit4.class)
+public class AndroidLogOnlyBuilderTest {
 
   private AndroidLogOnlyBuilder androidLogOnlyBuilder;
 
-  @Parameter public boolean scanningPath;
-
-  public AndroidLogOnlyBuilderTest(boolean scanningPath) {
-    this.scanningPath = scanningPath;
-  }
-
-  @Parameters
-  public static Object[] parameters() {
-    return new Object[] {true, false};
-  }
+  public AndroidLogOnlyBuilderTest() {}
 
   public static class AnotherJUnit4Test {
     @Test
@@ -88,33 +66,32 @@ public static class JUnit4TestSuite {}
 
   public static class NotATest {}
 
+  @Ignore
+  public static class IgnoredTest {
+    @Test
+    public void testFoo() {
+      fail("broken");
+    }
+  }
+
   @Before
   public void initBuilder() {
-    MockitoAnnotations.initMocks(this);
     androidLogOnlyBuilder =
-        new AndroidLogOnlyBuilder(
-            mockAndroidRunnerParams,
-            scanningPath,
-            Collections.<Class<? extends RunnerBuilder>>emptyList());
+        new AndroidLogOnlyBuilder(false, Collections.<Class<? extends RunnerBuilder>>emptyList());
   }
 
   @Test
   public void builderHandlesNotATest() throws Throwable {
     Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(NotATest.class);
-    if (scanningPath) {
-      assertThat(selectedRunner, nullValue());
-    } else {
-      assertThat(selectedRunner, notNullValue());
-      assertThat(selectedRunner.getClass(), typeCompatibleWith(ErrorReportingRunner.class));
+    assertThat(selectedRunner).isNotNull();
+    assertThat(selectedRunner.getClass()).isAssignableTo(ErrorReportingRunner.class);
       runWithRunner(selectedRunner, 1, 1);
-    }
   }
 
   @Test
   public void builderHandlesJUnit3Tests() throws Throwable {
     Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(JUnit3FailingTestCase.class);
-    assertThat(selectedRunner, notNullValue());
-    assertThat(selectedRunner.getClass(), typeCompatibleWith(JUnit38ClassRunner.class));
+    assertThat(selectedRunner).isNotNull();
     runWithRunner(selectedRunner, 1, 0);
   }
 
@@ -122,51 +99,56 @@ public void builderHandlesJUnit3Tests() throws Throwable {
   public void builderHandlesJUnit3TestSuites() throws Throwable {
     Runner selectedRunner =
         androidLogOnlyBuilder.runnerForClass(JUnit3FailingTestSuiteWithSuite.class);
-    assertThat(selectedRunner, notNullValue());
-    assertThat(selectedRunner.getClass(), typeCompatibleWith(JUnit38ClassRunner.class));
+    assertThat(selectedRunner).isNotNull();
+
     runWithRunner(selectedRunner, 1, 0);
   }
 
   @Test
   public void builderHandlesJUnit4Tests() throws Throwable {
     Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(JUnit4Failing.class);
-    assertThat(selectedRunner, notNullValue());
-    assertThat(selectedRunner.getClass(), typeCompatibleWith(NonExecutingRunner.class));
+    assertThat(selectedRunner).isNotNull();
+
     runWithRunner(selectedRunner, 1, 0);
   }
 
   @Test
   public void builderHandlesParameterizedRunnerTests() throws Throwable {
     Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(JUnit4ParameterizedTest.class);
-    assertThat(selectedRunner, notNullValue());
-    assertThat(selectedRunner.getClass(), typeCompatibleWith(NonExecutingRunner.class));
+    assertThat(selectedRunner).isNotNull();
+
     runWithRunner(selectedRunner, 3, 0);
   }
 
   @Test
   public void builderHandlesJunit4SuitesTests() throws Throwable {
     Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(JUnit4TestSuite.class);
-    assertThat(selectedRunner, notNullValue());
+    assertThat(selectedRunner).isNotNull();
     // Although this returns a Suite all the nested Runner implementations will be
     // NonExecutingRunner otherwise there will be failures when run.
-    assertThat(selectedRunner.getClass(), typeCompatibleWith(Suite.class));
     runWithRunner(selectedRunner, 2, 0);
   }
 
   @Test
   public void builderHandlesJunit4EnclosedRunnerTests() throws Throwable {
     Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(JUnit4EnclosedTest.class);
-    assertThat(selectedRunner, notNullValue());
-    // Although this returns an Enclosed all the nested Runner implementations will be
-    // NonExecutingRunner otherwise there will be failures when run.
-    assertThat(selectedRunner.getClass(), typeCompatibleWith(Enclosed.class));
+    assertThat(selectedRunner).isNotNull();
     runWithRunner(selectedRunner, 1, 0);
   }
 
+  @Test
+  public void builderHandlesJunit4IgnoredTest() throws Throwable {
+    Runner selectedRunner = androidLogOnlyBuilder.runnerForClass(IgnoredTest.class);
+    assertThat(selectedRunner).isNotNull();
+    JUnitCore testRunner = new JUnitCore();
+    Result result = testRunner.run(selectedRunner);
+    assertThat(result.getIgnoreCount()).isEqualTo(1);
+  }
+
   private static void runWithRunner(Runner runner, int runCount, int failureCount) {
     JUnitCore testRunner = new JUnitCore();
     Result result = testRunner.run(runner);
-    assertThat(result.getRunCount(), is(equalTo(runCount)));
-    assertThat(result.getFailureCount(), is(equalTo(failureCount)));
+    assertThat(result.getRunCount()).isEqualTo(runCount);
+    assertThat(result.getFailureCount()).isEqualTo(failureCount);
   }
 }
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml
new file mode 100644
index 000000000..efdc715db
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.internal.runner"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
+
+    <application android:label="AndroidJUnitRunner" >
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="androidx.test.internal.runner"/>
+
+</manifest>
+
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidRunnerBuilderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidRunnerBuilderTest.java
index 378b063a7..2010d8df0 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidRunnerBuilderTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/AndroidRunnerBuilderTest.java
@@ -18,27 +18,22 @@
 
 import static org.hamcrest.Matchers.typeCompatibleWith;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.when;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.internal.runner.junit3.JUnit38ClassRunner;
-import androidx.test.internal.util.AndroidRunnerParams;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.Runner;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class AndroidRunnerBuilderTest {
 
-  @Mock public AndroidRunnerParams mockAndroidRunnerParams;
-
   private AndroidRunnerBuilder androidRunnerBuilder;
 
   public static class JUnit3Class extends TestCase {
@@ -59,7 +54,7 @@ public static junit.framework.Test suite() {
   @Before
   public void initMocks() {
     MockitoAnnotations.initMocks(this);
-    androidRunnerBuilder = new AndroidRunnerBuilder(mockAndroidRunnerParams);
+    androidRunnerBuilder = new AndroidRunnerBuilder(false);
   }
 
   @Test
@@ -67,14 +62,4 @@ public void jUnit3SuitePicksJUnit38ClassRunner() throws Throwable {
     Runner runner = androidRunnerBuilder.runnerForClass(JUnit3Suite.class);
     assertThat(runner.getClass(), typeCompatibleWith(JUnit38ClassRunner.class));
   }
-
-  @Test
-  public void jUnit3Suite_skippedExecutionTrue_jUnit3SuitePicksJUnit38ClassRunner()
-      throws Throwable {
-    // mock skip execution flag to return true
-    when(mockAndroidRunnerParams.isSkipExecution()).thenReturn(true);
-
-    Runner runner = androidRunnerBuilder.runnerForClass(JUnit3Suite.class);
-    assertThat(runner.getClass(), typeCompatibleWith(JUnit38ClassRunner.class));
-  }
 }
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD
new file mode 100644
index 000000000..d6bbb7bec
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/BUILD
@@ -0,0 +1,279 @@
+# Description: Tests for Runner
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "AndroidLogOnlyBuilderTest",
+    srcs = [
+        "AndroidLogOnlyBuilderTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "AndroidRunnerBuilderTest",
+    srcs = [
+        "AndroidRunnerBuilderTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "DirectTestLoaderTest",
+    srcs = [
+        "DirectTestLoaderTest.java",
+    ],
+    # needs uses-library android.test.runner
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ExcludePackageNameFilterTest",
+    srcs = [
+        "ExcludePackageNameFilterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ExternalClassNameFilterTest",
+    srcs = [
+        "ExternalClassNameFilterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "InclusivePackageNamesFilterTest",
+    srcs = [
+        "InclusivePackageNamesFilterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "RunnerArgsTest",
+    srcs = ["RunnerArgsTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "RunnerArgsTest_android",
+    srcs = ["RunnerArgsTest.java"],
+    shard_count = 4,
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ScanningTestLoaderTest",
+    srcs = [
+        "ScanningTestLoaderTest.java",
+    ],
+    # needs uses-library android.test.runner
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "SdkSuppressTest",
+    srcs = ["SdkSuppressTest.java"],
+    deps = [
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "TestExecutorTest",
+    srcs = [
+        "TestExecutorTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRequestBuilderLocalTest",
+    srcs = ["TestRequestBuilderLocalTest.java"],
+    deps = [
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "TestRequestBuilderTest",
+    srcs = [
+        "TestRequestBuilderTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    shard_count = 5,
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "TestSizeTest",
+    srcs = [
+        "TestSizeTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/ClassPathScannerTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/ClassPathScannerTest.java
deleted file mode 100644
index 1ce354800..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/ClassPathScannerTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner;
-
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.internal.runner.ClassPathScanner.AcceptAllFilter;
-import java.io.IOException;
-import java.util.Set;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Unit tests for {@link ClassPathScanner}.
- *
- * <p>is the instrumentation target, and is a multidex binary. Its critical this test is executed
- * across APIs <=20 and newer APIs.
- */
-@RunWith(AndroidJUnit4.class)
-public class ClassPathScannerTest {
-
-  private ClassPathScanner classPathScanner;
-
-  @Before
-  public void setUp() throws Exception {
-    // scan the target aka app under test
-    classPathScanner =
-        new ClassPathScanner(ClassPathScanner.getDefaultClasspaths(getInstrumentation()));
-  }
-
-  /** Verify that all classes are scanned in a multidex apk */
-  @Test
-  public void multidex() throws IOException {
-    Set<String> result = classPathScanner.getClassPathEntries(new AcceptAllFilter());
-    assertThat(result)
-        .containsAtLeast(
-            "androidx.test.multidex.app.MultiDexTestClassA",
-            "androidx.test.multidex.app.MultiDexTestClassB",
-            "androidx.test.multidex.app.MultiDexTestClassC",
-            "androidx.test.multidex.app.MultiDexTestClassD",
-            "androidx.test.multidex.app.MultiDexApplication");
-
-    // ensure classes from binary under test are not included
-    // this relies on build adding "androidx.test.testing.fixtures.CustomTestFilter" to target app
-    // only
-    assertThat(result).doesNotContain("androidx.test.testing.fixtures.CustomTestFilter");
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/DirectTestLoaderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/DirectTestLoaderTest.java
new file mode 100644
index 000000000..abcc012ce
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/DirectTestLoaderTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.runner;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.testing.fixtures.AbstractTest;
+import androidx.test.testing.fixtures.CollectingRunListener;
+import androidx.test.testing.fixtures.CustomTest;
+import androidx.test.testing.fixtures.EmptyJUnit3Test;
+import androidx.test.testing.fixtures.EmptyJUnit4Test;
+import androidx.test.testing.fixtures.JUnit3Test;
+import androidx.test.testing.fixtures.JUnit4Test;
+import androidx.test.testing.fixtures.NotATest;
+import androidx.test.testing.fixtures.SubClassAbstractTest;
+import androidx.test.testing.fixtures.SubClassJUnit4Test;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runner.Runner;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.RunnerBuilder;
+
+/** Unit tests for {@link DirectTestLoader}. */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DirectTestLoaderTest {
+
+  private TestLoader loader;
+
+  @Before
+  public void setUp() throws Exception {
+    AndroidRunnerBuilder runnerBuilder =
+        new AndroidRunnerBuilder(false, 0, Collections.<Class<? extends RunnerBuilder>>emptyList());
+    loader = TestLoader.Factory.create(null, runnerBuilder, false);
+  }
+
+  private CollectingRunListener loadAndRun(String... classNames) {
+    CollectingRunListener listener = new CollectingRunListener();
+    RunNotifier runNotifier = new RunNotifier();
+    runNotifier.addListener(listener);
+    for (Runner runner : loader.getRunnersFor(Arrays.asList(classNames))) {
+      runner.run(runNotifier);
+    }
+    return listener;
+  }
+
+  private void assertFailure(Class<?> clazz) {
+    assertFailure(clazz.getName());
+  }
+
+  private void assertFailure(String className) {
+    CollectingRunListener listener = loadAndRun(className);
+    assertThat(listener.tests).hasSize(1);
+    assertThat(listener.failures).hasSize(1);
+    assertThat(listener.failures.get(0).getDescription().getMethodName()).isNotEmpty();
+  }
+
+  private void assertSuccess(Class<?> clazz, String methodName) {
+    CollectingRunListener listener = loadAndRun(clazz.getName());
+    assertThat(listener.tests).hasSize(1);
+    assertThat(listener.tests.get(0).getMethodName()).isEqualTo(methodName);
+    assertThat(listener.failures).isEmpty();
+  }
+
+  @Test
+  public void testLoadTests_junit3() {
+    assertSuccess(JUnit3Test.class, "testFoo");
+  }
+
+  @Test
+  public void testLoadTests_emptyjunit3() {
+    assertFailure(EmptyJUnit3Test.class);
+  }
+
+  @Test
+  public void testLoadTests_junit4() {
+    assertSuccess(JUnit4Test.class, "thisIsATest");
+  }
+
+  @Test
+  public void testLoadTests_runWith() {
+    // This fails because it has no @Test annotated methods.
+    assertFailure(EmptyJUnit4Test.class);
+  }
+
+  @Test
+  public void testLoadTests_notATest() {
+    // This fails because it is not a test
+    assertFailure(NotATest.class);
+  }
+
+  @Test
+  public void testLoadTests_customTest() {
+    assertFailure(CustomTest.class);
+  }
+
+  @Test
+  public void testLoadTests_notExist() {
+    assertFailure("notexist");
+  }
+
+  @Test
+  public void testLoadTests_abstract() {
+    assertFailure(AbstractTest.class);
+  }
+
+  @Test
+  public void testLoadTests_junit4SubclassAbstract() {
+    assertSuccess(SubClassJUnit4Test.class, "thisIsATest");
+  }
+
+  @Test
+  public void testLoadTests_junit3SubclassAbstract() {
+    assertSuccess(SubClassAbstractTest.class, "testFoo");
+  }
+
+  /** Verify loading a class that has already been loaded */
+  @Test
+  public void testLoadTests_loadAlreadyLoadedClass() {
+    CollectingRunListener listener =
+        loadAndRun(JUnit4Test.class.getName(), JUnit4Test.class.getName());
+    assertThat(listener.tests).hasSize(1);
+    assertThat(listener.tests.get(0).getMethodName()).isEqualTo("thisIsATest");
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/RunnerArgsTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/RunnerArgsTest.java
index 5d3281908..f0a2c87d4 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/RunnerArgsTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/RunnerArgsTest.java
@@ -17,30 +17,44 @@
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 
+import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import androidx.test.platform.io.PlatformTestStorage;
 import androidx.test.testing.fixtures.AppLifecycleListener;
 import androidx.test.testing.fixtures.BrokenCustomTestFilter;
 import androidx.test.testing.fixtures.CustomRunnerBuilder;
 import androidx.test.testing.fixtures.CustomTestFilter;
 import androidx.test.testing.fixtures.CustomTestFilterTakesBundle;
 import java.io.BufferedWriter;
+import java.io.ByteArrayInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.nio.charset.Charset;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import org.junit.Rule;
 import org.junit.Test;
@@ -65,9 +79,9 @@ public void testFromBundle_singleClass() {
     Bundle b = new Bundle();
     b.putString(RunnerArgs.ARGUMENT_TEST_CLASS, "ClassName");
     RunnerArgs args = new RunnerArgs.Builder().fromBundle(getInstrumentation(), b).build();
-    assertEquals(1, args.tests.size());
-    assertEquals("ClassName", args.tests.get(0).testClassName);
-    assertNull(args.tests.get(0).methodName);
+    assertThat(args.tests).hasSize(1);
+    assertThat(args.tests.get(0).testClassName).isEqualTo("ClassName");
+    assertThat(args.tests.get(0).methodName).isNull();
   }
 
   /** Test parsing bundle when multiple class names are provided. */
@@ -109,6 +123,38 @@ public void testFromBundle_classAndMethodCombo() {
     assertNull(args.tests.get(1).methodName);
   }
 
+  /**
+   * Test case where there is a comma as part of the method filter, which can happen for
+   * parameterized tests.
+   */
+  @Test
+  public void testFromBundle_classAndMethodWithComma() {
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_TEST_CLASS, "ClassName1#method[foo,bar],Class2");
+    RunnerArgs args = new RunnerArgs.Builder().fromBundle(getInstrumentation(), b).build();
+    assertThat(args.tests).hasSize(2);
+    assertThat(args.tests.get(0).testClassName).isEqualTo("ClassName1");
+    assertThat(args.tests.get(0).methodName).isEqualTo("method[foo,bar]");
+    assertThat(args.tests.get(1).testClassName).isEqualTo("Class2");
+    assertThat(args.tests.get(1).methodName).isNull();
+  }
+
+  /**
+   * Test case where there is a hash as part of the method filter, which can happen for
+   * parameterized tests.
+   */
+  @Test
+  public void testFromBundle_classAndMethodWithHash() {
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_TEST_CLASS, "ClassName1#method[foo#bar],Class2#method2");
+    RunnerArgs args = new RunnerArgs.Builder().fromBundle(getInstrumentation(), b).build();
+    assertThat(args.tests).hasSize(2);
+    assertThat(args.tests.get(0).testClassName).isEqualTo("ClassName1");
+    assertThat(args.tests.get(0).methodName).isEqualTo("method[foo#bar]");
+    assertThat(args.tests.get(1).testClassName).isEqualTo("Class2");
+    assertThat(args.tests.get(1).methodName).isEqualTo("method2");
+  }
+
   /** Simple test for parsing test class name */
   @Test
   public void testFromBundle_notSingleClass() {
@@ -239,6 +285,75 @@ public void testFromBundle_testFileFailure() {
     new RunnerArgs.Builder().fromBundle(getInstrumentation(), b).build();
   }
 
+  /** Test failure reading a testfile from storage */
+  @Test
+  public void testFromBundle_testFileStorageFailure() {
+    assumeFalse(Build.FINGERPRINT.contains("robolectric"));
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_USE_TEST_STORAGE_SERVICE, "true");
+    b.putString(RunnerArgs.ARGUMENT_TEST_FILE, "idontexist");
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> new RunnerArgs.Builder().fromBundle(getInstrumentation(), b).build());
+  }
+
+  @Test
+  public void testFromBundle_testFileStorage() throws IOException {
+    FakeTestStorage fakeStorage = new FakeTestStorage();
+    fakeStorage.addInputFile("myTestStorage", "ClassName4#method2");
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_USE_TEST_STORAGE_SERVICE, "true");
+    b.putString(RunnerArgs.ARGUMENT_TEST_FILE, "myTestStorage");
+    RunnerArgs args =
+        new RunnerArgs.Builder(fakeStorage).fromBundle(getInstrumentation(), b).build();
+    assertThat(args.tests).hasSize(1);
+    assertEquals("ClassName4", args.tests.get(0).testClassName);
+    assertEquals("method2", args.tests.get(0).methodName);
+  }
+
+  @Test
+  public void testFromBundle_testFileStorageConvertToRelativePath() throws IOException {
+    FakeTestStorage fakeStorage = new FakeTestStorage();
+    fakeStorage.addInputFile("myTestStorage", "ClassName4#method2");
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_USE_TEST_STORAGE_SERVICE, "true");
+    b.putString(RunnerArgs.ARGUMENT_TEST_FILE, "/myTestStorage");
+    RunnerArgs args =
+        new RunnerArgs.Builder(fakeStorage).fromBundle(getInstrumentation(), b).build();
+    assertThat(args.tests).hasSize(1);
+    assertEquals("ClassName4", args.tests.get(0).testClassName);
+    assertEquals("method2", args.tests.get(0).methodName);
+  }
+
+  @Test
+  public void testFromBundle_testFileStorageFallbackToLocal() throws IOException {
+    final File file = tmpFolder.newFile("myTestFile.txt");
+    writeFiltersToFile(file, Arrays.asList("ClassName4#method2"));
+    FakeTestStorage fakeStorage = new FakeTestStorage();
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_USE_TEST_STORAGE_SERVICE, "true");
+    b.putString(RunnerArgs.ARGUMENT_TEST_FILE, file.getAbsolutePath());
+    RunnerArgs args =
+        new RunnerArgs.Builder(fakeStorage).fromBundle(getInstrumentation(), b).build();
+    assertThat(args.tests).hasSize(1);
+    assertEquals("ClassName4", args.tests.get(0).testClassName);
+    assertEquals("method2", args.tests.get(0).methodName);
+  }
+
+  @Test
+  public void testFromBundle_notTestFileStorage() throws IOException {
+    FakeTestStorage fakeStorage = new FakeTestStorage();
+    fakeStorage.addInputFile("myTestStorage", "ClassName4#method2");
+    Bundle b = new Bundle();
+    b.putString(RunnerArgs.ARGUMENT_USE_TEST_STORAGE_SERVICE, "true");
+    b.putString(RunnerArgs.ARGUMENT_NOT_TEST_FILE, "myTestStorage");
+    RunnerArgs args =
+        new RunnerArgs.Builder(fakeStorage).fromBundle(getInstrumentation(), b).build();
+    assertThat(args.notTests).hasSize(1);
+    assertEquals("ClassName4", args.notTests.get(0).testClassName);
+    assertEquals("method2", args.notTests.get(0).methodName);
+  }
+
   /**
    * Test parsing bundle when package names, class names, and method names are provided within a not
    * test file.
@@ -584,4 +699,78 @@ public void testFromBundle_isTestStorageAvailable_falseValue() {
     RunnerArgs args = new RunnerArgs.Builder().fromBundle(getInstrumentation(), b).build();
     assertFalse(args.useTestStorageService);
   }
+
+  private static class FakeTestStorage implements PlatformTestStorage {
+
+    private final Map<String, InputStream> inputFileMap = new HashMap<>();
+
+    @Override
+    public InputStream openInputFile(String pathname) throws FileNotFoundException {
+
+      InputStream is = inputFileMap.get(pathname);
+      if (is == null) {
+        throw new FileNotFoundException();
+      }
+      return is;
+    }
+
+    public void addInputFile(String key, String value) {
+      inputFileMap.put(key, new ByteArrayInputStream(value.getBytes(Charset.forName("UTF-8"))));
+    }
+
+    @Override
+    public String getInputArg(String argName) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Map<String, String> getInputArgs() {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public OutputStream openOutputFile(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public OutputStream openOutputFile(String pathname, boolean append) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void addOutputProperties(Map<String, Serializable> properties) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Map<String, Serializable> getOutputProperties() {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public InputStream openInternalInputFile(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public OutputStream openInternalOutputFile(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Uri getInputFileUri(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Uri getOutputFileUri(String pathname) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean isTestStorageFilePath(String pathname) {
+      return false;
+    }
+  }
 }
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/ScanningTestLoaderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/ScanningTestLoaderTest.java
new file mode 100644
index 000000000..d77a41f50
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/ScanningTestLoaderTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.runner;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.testing.fixtures.AbstractTest;
+import androidx.test.testing.fixtures.CollectingRunListener;
+import androidx.test.testing.fixtures.CustomTest;
+import androidx.test.testing.fixtures.EmptyJUnit3Test;
+import androidx.test.testing.fixtures.EmptyJUnit4Test;
+import androidx.test.testing.fixtures.JUnit3Test;
+import androidx.test.testing.fixtures.JUnit4Test;
+import androidx.test.testing.fixtures.NotATest;
+import androidx.test.testing.fixtures.SubClassAbstractTest;
+import androidx.test.testing.fixtures.SubClassJUnit4Test;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runner.Runner;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runners.model.RunnerBuilder;
+
+/** Unit tests for {@link DirectTestLoader}. */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ScanningTestLoaderTest {
+
+  private TestLoader loader;
+
+  @Before
+  public void setUp() throws Exception {
+    AndroidRunnerBuilder runnerBuilder =
+        new AndroidRunnerBuilder(false, 0, Collections.<Class<? extends RunnerBuilder>>emptyList());
+    loader = TestLoader.Factory.create(null, runnerBuilder, true);
+  }
+
+  private CollectingRunListener loadAndRun(String... classNames) {
+    CollectingRunListener listener = new CollectingRunListener();
+    RunNotifier runNotifier = new RunNotifier();
+    runNotifier.addListener(listener);
+    for (Runner runner : loader.getRunnersFor(Arrays.asList(classNames))) {
+      runner.run(runNotifier);
+    }
+    return listener;
+  }
+
+  private void assertFailure(Class<?> clazz) {
+    assertFailure(clazz.getName());
+  }
+
+  private void assertFailure(String className) {
+    CollectingRunListener listener = loadAndRun(className);
+    assertThat(listener.tests).hasSize(1);
+    assertThat(listener.failures).hasSize(1);
+    assertThat(listener.failures.get(0).getDescription().getMethodName()).isNotEmpty();
+  }
+
+  private void assertSuccess(Class<?> clazz, String methodName) {
+    CollectingRunListener listener = loadAndRun(clazz.getName());
+    assertThat(listener.tests).hasSize(1);
+    assertThat(listener.tests.get(0).getMethodName()).isEqualTo(methodName);
+    assertThat(listener.failures).isEmpty();
+  }
+
+  private void assertNoResults(Class<?> clazz) {
+    assertNoResults(clazz.getName());
+  }
+
+  private void assertNoResults(String className) {
+    CollectingRunListener listener = loadAndRun(className);
+    assertThat(listener.tests).isEmpty();
+    assertThat(listener.failures).isEmpty();
+  }
+
+  @Test
+  public void testLoadTests_junit3() {
+    assertSuccess(JUnit3Test.class, "testFoo");
+  }
+
+  @Test
+  public void testLoadTests_emptyjunit3() {
+    // for unremembered historical reasons this is not treated as an error. b/203614578
+    assertNoResults(EmptyJUnit3Test.class);
+  }
+
+  @Test
+  public void testLoadTests_junit4() {
+    assertSuccess(JUnit4Test.class, "thisIsATest");
+  }
+
+  @Test
+  public void testLoadTests_runWith() {
+    assertFailure(EmptyJUnit4Test.class);
+  }
+
+  @Test
+  public void testLoadTests_notATest() {
+    assertNoResults(NotATest.class);
+  }
+
+  @Test
+  public void testLoadTests_customTest() {
+    assertNoResults(CustomTest.class);
+  }
+
+  @Test
+  public void testLoadTests_notExist() {
+    assertNoResults("notexist");
+  }
+
+  @Test
+  public void testLoadTests_abstract() {
+    assertNoResults(AbstractTest.class);
+  }
+
+  @Test
+  public void testLoadTests_junit4SubclassAbstract() {
+    assertSuccess(SubClassJUnit4Test.class, "thisIsATest");
+  }
+
+  @Test
+  public void testLoadTests_junit3SubclassAbstract() {
+    assertSuccess(SubClassAbstractTest.class, "testFoo");
+  }
+
+  /** Verify loading a class that has already been loaded */
+  @Test
+  public void testLoadTests_loadAlreadyLoadedClass() {
+    CollectingRunListener listener =
+        loadAndRun(JUnit4Test.class.getName(), JUnit4Test.class.getName());
+    assertThat(listener.tests).hasSize(1);
+    assertThat(listener.tests.get(0).getMethodName()).isEqualTo("thisIsATest");
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/SdkSuppressTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/SdkSuppressTest.java
new file mode 100644
index 000000000..b365eb72e
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/SdkSuppressTest.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 3023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.runner;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import android.os.Build;
+import androidx.test.filters.SdkSuppress;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
+import org.junit.runner.Result;
+import org.junit.runner.RunWith;
+import org.junit.runner.notification.Failure;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class SdkSuppressTest {
+
+  public static class SampleSdkSuppress {
+    @SdkSuppress(minSdkVersion = 25)
+    @Test
+    public void min25() {
+      fail("min25");
+    }
+
+    @SdkSuppress(minSdkVersion = 26)
+    @Test
+    public void min26() {
+      fail("min26");
+    }
+
+    @SdkSuppress(minSdkVersion = 27)
+    @Test
+    public void min27() {
+      fail("min27");
+    }
+
+    @Test
+    public void noSdkSuppress() {
+      fail("noSdkSuppress");
+    }
+
+    @SdkSuppress(maxSdkVersion = 29)
+    @Test
+    public void max29() {
+      fail("max29");
+    }
+
+    @SdkSuppress(excludedSdks = {26, 27})
+    @Test
+    public void excludedSdks2627() {
+      fail("excludedSdks2627");
+    }
+
+    @SdkSuppress(excludedSdks = {29})
+    @Test
+    public void excludedSdks29() {
+      fail("excludedSdks29");
+    }
+
+    @SdkSuppress(excludedSdks = {29, 30, 31})
+    @Test
+    public void excludedSdks293031() {
+      fail("excludedSdks293031");
+    }
+
+    @SdkSuppress(
+        minSdkVersion = 24,
+        maxSdkVersion = 30,
+        excludedSdks = {26, 27})
+    @Test
+    public void min24max30excludedSdks2627() {
+      fail("min24max30excludedSdks2627");
+    }
+
+    @SdkSuppress(minSdkVersion = 27, maxSdkVersion = 29)
+    @Test
+    public void min27max29() {
+      fail("min27max29");
+    }
+
+    @SdkSuppress(minSdkVersion = 24, maxSdkVersion = 26)
+    @Test
+    public void min24max26() {
+      fail("min24max26");
+    }
+
+    @SdkSuppress(minSdkVersion = 35, codeName = "R")
+    @Test
+    public void min35CodeNameR() {
+      fail("min35CodeNameR");
+    }
+
+    @SdkSuppress(minSdkVersion = 36, codeName = "R")
+    @Test
+    public void min36CodeNameR() {
+      fail("min36CodeNameR");
+    }
+  }
+
+  @SdkSuppress(minSdkVersion = 27)
+  public static class SampleSdkSuppressOnClass {
+    @Test
+    public void noSdkSuppress() {
+      fail("noSdkSuppress");
+    }
+  }
+
+  @SdkSuppress(minSdkVersion = 27)
+  public static class SampleSdkSuppressOnClassAndMethod {
+    @Test
+    @SdkSuppress(minSdkVersion = 28)
+    public void min28() {
+      fail("min28");
+    }
+  }
+
+  @SdkSuppress(minSdkVersion = 27)
+  public static class SampleSdkSuppressOnClassAndMethodMaxMin {
+    // the method annotation here will completely take precedence over the class level annotation
+    @Test
+    @SdkSuppress(maxSdkVersion = 28)
+    public void maxSdk28() {
+      fail("maxSdk28");
+    }
+
+    @Test
+    public void noSdkSuppress() {
+      fail("noSdkSuppress");
+    }
+  }
+
+  private static TestRequestBuilder createBuilder() {
+    return new TestRequestBuilder();
+  }
+
+  /** Test that {@link SdkSuppress} filters tests as appropriate */
+  @Test
+  @Config(sdk = 26)
+  public void testSdkSuppress() throws Exception {
+    TestRequestBuilder builder = createBuilder();
+    Request request = builder.addTestClass(SampleSdkSuppress.class.getName()).build();
+    Result result = new JUnitCore().run(request);
+
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
+
+    assertThat(failingMethods)
+        .containsExactly(
+            "min25",
+            "min26",
+            "noSdkSuppress",
+            "max29",
+            "min24max26",
+            "excludedSdks29",
+            "excludedSdks293031");
+  }
+
+  /** Test that {@link SdkSuppress} filters tests as appropriate when codeName specified */
+  @Test
+  @Config(sdk = 35)
+  public void testSdkSuppress_codeName() throws Exception {
+    ReflectionHelpers.setStaticField(Build.VERSION.class, "CODENAME", "R");
+    TestRequestBuilder builder = createBuilder();
+    Request request = builder.addTestClass(SampleSdkSuppress.class.getName()).build();
+    Result result = new JUnitCore().run(request);
+
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
+
+    assertThat(failingMethods)
+        .containsExactly(
+            "min35CodeNameR",
+            "min36CodeNameR",
+            "noSdkSuppress",
+            "min25",
+            "min26",
+            "min27",
+            "excludedSdks2627",
+            "excludedSdks29",
+            "excludedSdks293031");
+  }
+
+  @Test
+  @Config(sdk = 26)
+  public void testSdkSuppress_classAllFiltered() throws Exception {
+    TestRequestBuilder builder = createBuilder();
+    Request request = builder.addTestClass(SampleSdkSuppressOnClass.class.getName()).build();
+    Result result = new JUnitCore().run(request);
+
+    assertThat(result.getFailureCount()).isEqualTo(0);
+  }
+
+  @Test
+  @Config(sdk = 27)
+  public void testSdkSuppress_classAllNotFiltered() throws Exception {
+    TestRequestBuilder builder = createBuilder();
+    Request request = builder.addTestClass(SampleSdkSuppressOnClass.class.getName()).build();
+    Result result = new JUnitCore().run(request);
+
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
+
+    assertThat(failingMethods).containsExactly("noSdkSuppress");
+  }
+
+  @Test
+  @Config(sdk = 27)
+  public void testSdkSuppress_classAndMethod() throws Exception {
+    TestRequestBuilder builder = createBuilder();
+    Request request =
+        builder.addTestClass(SampleSdkSuppressOnClassAndMethod.class.getName()).build();
+    Result result = new JUnitCore().run(request);
+
+    assertThat(result.getFailureCount()).isEqualTo(0);
+  }
+
+  @Test
+  @Config(sdk = 26)
+  public void testSdkSuppress_classAndMethodMaxMin() throws Exception {
+    TestRequestBuilder builder = createBuilder();
+    Request request =
+        builder.addTestClass(SampleSdkSuppressOnClassAndMethodMaxMin.class.getName()).build();
+    Result result = new JUnitCore().run(request);
+
+    List<String> failingMethods = new ArrayList<>();
+    for (Failure failure : result.getFailures()) {
+      failingMethods.add(failure.getDescription().getMethodName());
+    }
+
+    assertThat(failingMethods).containsExactly("maxSdk28");
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestExecutorTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestExecutorTest.java
index a1d844e7e..ccdc6f390 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestExecutorTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestExecutorTest.java
@@ -17,6 +17,8 @@
 package androidx.test.internal.runner;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import android.os.Bundle;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -25,12 +27,14 @@
 import java.io.PrintStream;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.Description;
 import org.junit.runner.Request;
 import org.junit.runner.Result;
 import org.junit.runner.RunWith;
+import org.junit.runner.Runner;
+import org.junit.runner.notification.RunNotifier;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
 /** Unit tests for TestExecutor */
@@ -46,6 +50,17 @@ public class TestExecutorTest {
   @Before
   public void setUp() {
     MockitoAnnotations.initMocks(this);
+    when(mockRequest.getRunner())
+        .thenReturn(
+            new Runner() {
+              @Override
+              public Description getDescription() {
+                return Description.EMPTY;
+              }
+
+              @Override
+              public void run(RunNotifier notifier) {}
+            });
     executor = new TestExecutor.Builder(getInstrumentation()).addRunListener(mockListener).build();
   }
 
@@ -53,7 +68,7 @@ public void setUp() {
   @Test
   public void testExecute() {
     executor.execute(mockRequest);
-    Mockito.verify(mockListener)
+    verify(mockListener)
         .instrumentationRunFinished(
             (PrintStream) ArgumentMatchers.any(),
             (Bundle) ArgumentMatchers.any(),
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderNotScanningPathTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderNotScanningPathTest.java
deleted file mode 100644
index 334af885e..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderNotScanningPathTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import org.junit.runner.RunWith;
-
-/**
- * Work around for lack of support for Parameterized tests in Google 3.
- *
- * <p>TODO(b/26110951) remove when super class can be Parameterized.
- */
-@RunWith(AndroidJUnit4.class)
-public class TestLoaderNotScanningPathTest extends TestLoaderTest {
-
-  public TestLoaderNotScanningPathTest() {
-    super(false);
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderScanningPathTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderScanningPathTest.java
deleted file mode 100644
index 4c32e2637..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderScanningPathTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import org.junit.runner.RunWith;
-
-/**
- * Work around for lack of support for Parameterized tests in Google 3.
- *
- * <p>TODO(b/26110951) remove when super class can be Parameterized.
- */
-@RunWith(AndroidJUnit4.class)
-public class TestLoaderScanningPathTest extends TestLoaderTest {
-
-  public TestLoaderScanningPathTest() {
-    super(true);
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderTest.java
deleted file mode 100644
index 9c709c891..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestLoaderTest.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.internal.runner;
-
-import static junit.framework.Assert.assertEquals;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.internal.runner.TestLoader.UnloadableClassRunner;
-import androidx.test.internal.runner.junit3.JUnit38ClassRunner;
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
-import androidx.test.internal.util.AndroidRunnerParams;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.internal.runners.ErrorReportingRunner;
-import org.junit.runner.RunWith;
-import org.junit.runner.Runner;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-import org.junit.runners.model.RunnerBuilder;
-
-/** Unit tests for {@link TestLoader}. */
-// @RunWith(Parameterized.class) // TODO(b/26110951) not supported yet
-@SmallTest
-public abstract class TestLoaderTest {
-
-  public static class JUnit3Test extends TestCase {
-    public void testFoo() {}
-  }
-
-  public static class EmptyJUnit3Test extends TestCase {}
-
-  public abstract static class AbstractTest extends TestCase {
-    public void testFoo() {}
-  }
-
-  public static class SubClassAbstractTest extends AbstractTest {}
-
-  public static class JUnit4Test {
-    @Test
-    public void thisIsATest() {}
-  }
-
-  public static class SubClassJUnit4Test extends JUnit4Test {}
-
-  @RunWith(value = Parameterized.class)
-  public static class JUnit4RunTest {
-    public void thisIsMayBeATest() {}
-  }
-
-  public static class NotATest {
-    public void thisIsNotATest() {}
-  }
-
-  public static class CustomTest implements junit.framework.Test {
-
-    @Override
-    public int countTestCases() {
-      return 0;
-    }
-
-    @Override
-    public void run(TestResult testResult) {}
-  }
-
-  private TestLoader loader;
-
-  public boolean scanningPath;
-
-  public TestLoaderTest(boolean scanningPath) {
-    this.scanningPath = scanningPath;
-  }
-
-  @Parameters
-  public static Object[] parameters() {
-    return new Object[] {true, false};
-  }
-
-  @Before
-  public void setUp() throws Exception {
-    AndroidRunnerParams runnerParams = new AndroidRunnerParams(null, null, -1, false);
-    AndroidRunnerBuilder runnerBuilder =
-        new AndroidRunnerBuilder(
-            runnerParams, scanningPath, Collections.<Class<? extends RunnerBuilder>>emptyList());
-    loader = TestLoader.testLoader(null, runnerBuilder, scanningPath);
-  }
-
-  private void assertScanningLoadsAnyClass(
-      Class<?> testClass, Class<? extends Runner> expectedRunnerClass) {
-    Collection<String> classNames = Collections.singleton(testClass.getName());
-    List<Runner> runners = loader.getRunnersFor(classNames, true);
-    int expectedClassCount = scanningPath ? 0 : 1;
-    assertEquals(expectedClassCount, runners.size());
-    if (expectedClassCount == 1) {
-      Runner runner = runners.get(0);
-      assertEquals(expectedRunnerClass, runner.getClass());
-    }
-  }
-
-  private void assertLoadTestSuccess(Class<?> clazz, Class<? extends Runner> expectedRunnerClass) {
-    Collection<String> classNames = Collections.singleton(clazz.getName());
-    List<Runner> runners = loader.getRunnersFor(classNames, true);
-    assertEquals(1, runners.size());
-    Runner runner = runners.get(0);
-    assertEquals(expectedRunnerClass, runner.getClass());
-  }
-
-  @Test
-  public void testLoadTests_junit3() {
-    assertLoadTestSuccess(JUnit3Test.class, JUnit38ClassRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_emptyjunit3() {
-    Class<?> testClass = EmptyJUnit3Test.class;
-    assertScanningLoadsAnyClass(testClass, JUnit38ClassRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_junit4() {
-    assertLoadTestSuccess(JUnit4Test.class, AndroidJUnit4ClassRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_runWith() {
-    // This fails because it has no @Test annotated methods.
-    assertLoadTestSuccess(JUnit4RunTest.class, ErrorReportingRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_all() {
-    Collection<String> classNames =
-        Arrays.asList(
-            JUnit3Test.class.getName(),
-            EmptyJUnit3Test.class.getName(),
-            JUnit4Test.class.getName(),
-            JUnit4RunTest.class.getName(),
-            NotATest.class.getName(),
-            CustomTest.class.getName(),
-            "notexist",
-            AbstractTest.class.getName(),
-            SubClassJUnit4Test.class.getName(),
-            SubClassAbstractTest.class.getName());
-
-    List<Runner> runners = loader.getRunnersFor(classNames, false);
-    List<Class<? extends Runner>> runnerClasses = new ArrayList<>();
-    for (Runner runner : runners) {
-      runnerClasses.add(runner == null ? null : runner.getClass());
-    }
-
-    List<Class<? extends Runner>> expectedRunnerClasses;
-    if (scanningPath) {
-      // When scanning path TestLoader is stricter about what it will accept as a test.
-      expectedRunnerClasses =
-          Arrays.asList(
-              JUnit38ClassRunner.class,
-              AndroidJUnit4ClassRunner.class,
-              ErrorReportingRunner.class,
-              UnloadableClassRunner.class,
-              AndroidJUnit4ClassRunner.class,
-              JUnit38ClassRunner.class);
-    } else {
-      expectedRunnerClasses =
-          Arrays.asList(
-              JUnit38ClassRunner.class,
-              JUnit38ClassRunner.class,
-              AndroidJUnit4ClassRunner.class,
-              ErrorReportingRunner.class,
-              ErrorReportingRunner.class,
-              ErrorReportingRunner.class,
-              UnloadableClassRunner.class,
-              JUnit38ClassRunner.class,
-              AndroidJUnit4ClassRunner.class,
-              JUnit38ClassRunner.class);
-    }
-    assertEquals(expectedRunnerClasses, runnerClasses);
-  }
-
-  @Test
-  public void testLoadTests_notATest() {
-    assertScanningLoadsAnyClass(NotATest.class, ErrorReportingRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_CustomTest() {
-    assertScanningLoadsAnyClass(CustomTest.class, ErrorReportingRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_notExist() {
-    Collection<String> classNames = Collections.singleton("notexist");
-    List<Runner> runners = loader.getRunnersFor(classNames, /* isScanningPath */ false);
-    assertEquals(1, runners.size());
-    Runner runner = runners.get(0);
-    // only when users pass in a specific class via -e class should it be treated as a runner
-    assertEquals(UnloadableClassRunner.class, runner.getClass());
-  }
-
-  @Test
-  public void testLoadTests_abstract() {
-    assertScanningLoadsAnyClass(AbstractTest.class, JUnit38ClassRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_junit4SubclassAbstract() {
-    assertLoadTestSuccess(SubClassJUnit4Test.class, AndroidJUnit4ClassRunner.class);
-  }
-
-  @Test
-  public void testLoadTests_junit3SubclassAbstract() {
-    assertLoadTestSuccess(SubClassAbstractTest.class, JUnit38ClassRunner.class);
-  }
-
-  /** Verify loading a class that has already been loaded */
-  @Test
-  public void testLoadTests_loadAlreadyLoadedClass() {
-    Class<?> clazz = SubClassAbstractTest.class;
-    assertLoadTestSuccess(clazz, JUnit38ClassRunner.class);
-    assertLoadTestSuccess(clazz, JUnit38ClassRunner.class);
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderLocalTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderLocalTest.java
index d5bc3e5a5..66d272d98 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderLocalTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderLocalTest.java
@@ -15,12 +15,14 @@
  */
 package androidx.test.internal.runner;
 
+import static androidx.test.internal.runner.TestRequestBuilder.RequiresDeviceFilter.EMULATOR_HARDWARE_GOLDFISH;
 import static androidx.test.platform.app.InstrumentationRegistry.getArguments;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.RequiresDevice;
 import androidx.test.filters.SmallTest;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -37,6 +39,7 @@
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.shadows.ShadowBuild;
 
 /** Unit tests running on local host for TestRequestBuilder. */
 @RunWith(AndroidJUnit4.class)
@@ -52,6 +55,18 @@ public void match() {}
     public void noMatch() {}
   }
 
+  public static class AnotherTestFixture {
+
+    @Test
+    public void anotherTestFixture() {}
+  }
+
+  public static class YetAnotherTestFixture {
+
+    @Test
+    public void yetAnotherTestFixture() {}
+  }
+
   @Mock private ClassPathScanner mockClassPathScanner;
 
   private TestRequestBuilder builder;
@@ -98,6 +113,28 @@ public void addTestSizeFilter() throws IOException {
     assertThat(results).containsExactly(TestFixture.class.getName() + "#match");
   }
 
+  @Test
+  public void classOrder() {
+    builder.addTestClass(YetAnotherTestFixture.class.getName());
+    builder.addTestClass(AnotherTestFixture.class.getName());
+
+    List<String> results = runRequest(builder.build());
+    assertThat(results)
+        .containsExactly(
+            YetAnotherTestFixture.class.getName() + "#yetAnotherTestFixture",
+            AnotherTestFixture.class.getName() + "#anotherTestFixture")
+        .inOrder();
+  }
+
+  /** Test that {@link RequiresDevice} filters tests as appropriate */
+  @Test
+  public void testRequiresDevice() {
+    ShadowBuild.setHardware(EMULATOR_HARDWARE_GOLDFISH);
+    Request request = builder.addTestClass(SampleRequiresDevice.class.getName()).build();
+    ArrayList<String> results = runRequest(request);
+    assertThat(results).hasSize(2);
+  }
+
   private void setClassPathScanningResults(String... names) throws IOException {
     when(mockClassPathScanner.getClassPathEntries(ArgumentMatchers.any()))
         .thenReturn(new HashSet<>(Arrays.asList(names)));
@@ -121,4 +158,20 @@ public void testFinished(Description description) {
       methods.add(description.getClassName() + "#" + description.getMethodName());
     }
   }
+
+  public static class SampleRequiresDevice {
+    @RequiresDevice
+    @Test
+    public void skipThis() {}
+
+    @RequiresDevice
+    @Test
+    public void skipThat() {}
+
+    @Test
+    public void runMe() {}
+
+    @Test
+    public void runMe2() {}
+  }
 }
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderTest.java
index 5cc93185b..a3d64d120 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/TestRequestBuilderTest.java
@@ -15,27 +15,25 @@
  */
 package androidx.test.internal.runner;
 
-import static androidx.test.internal.runner.TestRequestBuilder.RequiresDeviceFilter.EMULATOR_HARDWARE_GOLDFISH;
-import static androidx.test.internal.runner.TestRequestBuilder.RequiresDeviceFilter.EMULATOR_HARDWARE_RANCHU;
-import static androidx.test.platform.app.InstrumentationRegistry.getArguments;
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.AbstractFilter;
+import androidx.test.filters.CustomFilter;
 import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 import androidx.test.filters.MediumTest;
-import androidx.test.filters.RequiresDevice;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.filters.Suppress;
-import androidx.test.internal.runner.TestRequestBuilder.DeviceBuild;
 import androidx.test.testing.fixtures.BrokenRunnerBuilder;
 import androidx.test.testing.fixtures.CustomRunnerBuilder;
 import androidx.test.testing.fixtures.CustomTestFilter;
@@ -48,12 +46,15 @@
 import androidx.test.testing.fixtures.RunWithJUnit4Failing;
 import androidx.test.testing.fixtures.SampleJUnit3Test;
 import java.io.IOException;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import junit.framework.Protectable;
 import junit.framework.TestCase;
 import junit.framework.TestResult;
@@ -61,9 +62,7 @@
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Ignore;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.Description;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Request;
@@ -200,6 +199,62 @@ public void testMedium() {}
     public void testSuppressed() {}
   }
 
+  public static class SampleCustomFilterTestClass {
+    @Test
+    @SampleCustomAnnotation(runTest = true)
+    public void testRun() {}
+
+    @Test
+    @SampleCustomAnnotation(runTest = false)
+    public void testNotRun() {}
+  }
+
+  public static class SampleCustomFilter extends AbstractFilter {
+    public SampleCustomFilter() {}
+
+    @Override
+    protected boolean evaluateTest(Description description) {
+      return description.getAnnotation(SampleCustomAnnotation.class).runTest();
+    }
+
+    @Override
+    public String describe() {
+      return "skip tests if runTest is false";
+    }
+  }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE, ElementType.METHOD})
+  @CustomFilter(filterClass = SampleCustomFilter.class)
+  public @interface SampleCustomAnnotation {
+    boolean runTest() default true;
+  }
+
+  public static class MalformedCustomFilterTestClass {
+    @Test
+    @MalformedCustomAnnotation()
+    public void test() {}
+  }
+
+  public static class CustomFilterWithPrivateConstructor extends AbstractFilter {
+    private CustomFilterWithPrivateConstructor() {}
+
+    @Override
+    protected boolean evaluateTest(Description description) {
+      return description.getAnnotation(SampleCustomAnnotation.class).runTest();
+    }
+
+    @Override
+    public String describe() {
+      return "skip tests if runTest is false";
+    }
+  }
+
+  @Retention(RetentionPolicy.RUNTIME)
+  @Target({ElementType.TYPE, ElementType.METHOD})
+  @CustomFilter(filterClass = CustomFilterWithPrivateConstructor.class)
+  public @interface MalformedCustomAnnotation {}
+
   public static class SampleJUnit3 extends TestCase {
     public void testFromSuper() {}
   }
@@ -239,77 +294,6 @@ public void testRunThis() {
     }
   }
 
-  public static class SampleRequiresDevice {
-    @RequiresDevice
-    @Test
-    public void skipThis() {}
-
-    @RequiresDevice
-    @Test
-    public void skipThat() {}
-
-    @Test
-    public void runMe() {}
-
-    @Test
-    public void runMe2() {}
-  }
-
-  public static class SampleSdkSuppress {
-    @SdkSuppress(minSdkVersion = 15)
-    @Test
-    public void min15() {
-      fail("min15");
-    }
-
-    @SdkSuppress(minSdkVersion = 16)
-    @Test
-    public void min16() {
-      fail("min16");
-    }
-
-    @SdkSuppress(minSdkVersion = 17)
-    @Test
-    public void min17() {
-      fail("min17");
-    }
-
-    @Test
-    public void noSdkSuppress() {
-      fail("noSdkSuppress");
-    }
-
-    @SdkSuppress(maxSdkVersion = 19)
-    @Test
-    public void max19() {
-      fail("max19");
-    }
-
-    @SdkSuppress(minSdkVersion = 17, maxSdkVersion = 19)
-    @Test
-    public void min17max19() {
-      fail("min17max19");
-    }
-
-    @SdkSuppress(minSdkVersion = 14, maxSdkVersion = 16)
-    @Test
-    public void min14max16() {
-      fail("min14max16");
-    }
-
-    @SdkSuppress(minSdkVersion = 29, codeName = "R")
-    @Test
-    public void min29CodeNameR() {
-      fail("min29CodeNameR");
-    }
-
-    @SdkSuppress(minSdkVersion = 20, codeName = "R")
-    @Test
-    public void min20CodeNameR() {
-      fail("min20CodeNameR");
-    }
-  }
-
   public static class DollarMethod {
 
     @Test
@@ -477,8 +461,6 @@ public void run() {
       fail("Broken");
     }
   }
-
-  @Mock private DeviceBuild mockDeviceBuild;
   @Mock private ClassPathScanner mockClassPathScanner;
 
   private TestRequestBuilder builder;
@@ -490,16 +472,7 @@ public void setUp() throws Exception {
   }
 
   private TestRequestBuilder createBuilder() {
-    return new TestRequestBuilder(getInstrumentation(), getArguments()) {
-      @Override
-      ClassPathScanner createClassPathScanner(List<String> paths) {
-        return mockClassPathScanner;
-      }
-    };
-  }
-
-  private TestRequestBuilder createBuilder(DeviceBuild deviceBuild) {
-    return new TestRequestBuilder(deviceBuild, getInstrumentation(), getArguments()) {
+    return new TestRequestBuilder() {
       @Override
       ClassPathScanner createClassPathScanner(List<String> paths) {
         return mockClassPathScanner;
@@ -916,61 +889,28 @@ public void testNoTests() {
     Assert.assertEquals(0, result.getRunCount());
   }
 
-  /** Test that {@link SdkSuppress} filters tests as appropriate */
+  /** Test that {@link CustomFilter} filters tests as appropriate */
   @Test
-  public void testSdkSuppress() throws Exception {
-    MockitoAnnotations.initMocks(this);
-    TestRequestBuilder b = createBuilder(mockDeviceBuild);
-    when(mockDeviceBuild.getSdkVersionInt()).thenReturn(16);
-    when(mockDeviceBuild.getCodeName()).thenReturn("REL");
-    Request request = b.addTestClass(SampleSdkSuppress.class.getName()).build();
+  public void testCustomFilterAnnotation() {
+    Request request = builder.addTestClass(SampleCustomFilterTestClass.class.getName()).build();
     JUnitCore testRunner = new JUnitCore();
     Result result = testRunner.run(request);
-
-    Set<String> expected =
-        new HashSet<>(Arrays.asList("min15", "min16", "noSdkSuppress", "max19", "min14max16"));
-    Assert.assertEquals(expected.size(), result.getRunCount());
-    for (Failure f : result.getFailures()) {
-      assertTrue(
-          "Fail! " + expected + " doesn't contain \"" + f.getMessage() + "\" ",
-          expected.contains(f.getMessage()));
-    }
-  }
-
-  /** Test that {@link SdkSuppress} filters tests as appropriate when codeName specified */
-  @Test
-  public void testSdkSuppress_codeName() throws Exception {
-    MockitoAnnotations.initMocks(this);
-    TestRequestBuilder b = createBuilder(mockDeviceBuild);
-    when(mockDeviceBuild.getSdkVersionInt()).thenReturn(29);
-    when(mockDeviceBuild.getCodeName()).thenReturn("R");
-    Request request = b.addTestClass(SampleSdkSuppress.class.getName()).build();
-    JUnitCore testRunner = new JUnitCore();
-    Result result = testRunner.run(request);
-
-    Set<String> expected =
-        new HashSet<>(
-            Arrays.asList(
-                "min29CodeNameR", "min20CodeNameR", "noSdkSuppress", "min15", "min16", "min17"));
-    Assert.assertEquals(expected.size(), result.getRunCount());
-    for (Failure f : result.getFailures()) {
-      assertTrue(
-          "Fail! " + expected + " doesn't contain \"" + f.getMessage() + "\" ",
-          expected.contains(f.getMessage()));
-    }
+    Assert.assertEquals(1, result.getRunCount());
   }
 
-  /** Test that {@link RequiresDevice} filters tests as appropriate */
+  /** Test that {@link CustomFilter} throws when the filter class cannot be instantiated */
   @Test
-  public void testRequiresDevice() {
-    MockitoAnnotations.initMocks(this);
-    TestRequestBuilder b = createBuilder(mockDeviceBuild);
-    when(mockDeviceBuild.getHardware())
-        .thenReturn(EMULATOR_HARDWARE_GOLDFISH, EMULATOR_HARDWARE_RANCHU);
-    Request request = b.addTestClass(SampleRequiresDevice.class.getName()).build();
+  public void testMalformedCustomFilterAnnotation() {
+    Request request = builder.addTestClass(MalformedCustomFilterTestClass.class.getName()).build();
     JUnitCore testRunner = new JUnitCore();
-    Result result = testRunner.run(request);
-    Assert.assertEquals(2, result.getRunCount());
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> testRunner.run(request));
+    assertThat(e)
+        .hasMessageThat()
+        .isEqualTo(
+            "Must have no argument constructor for class"
+                + " androidx.test.internal.runner.TestRequestBuilderTest"
+                + "$CustomFilterWithPrivateConstructor");
   }
 
   /** Test that a custom filter is applied */
@@ -1004,6 +944,7 @@ public void testCustomRunnerBuilder() {
 
   /** Test that a custom RunnerBuilder is used. */
   @Test
+  @SdkSuppress(maxSdkVersion = 28) // does not throw on api >= 29 for unclear reasons
   public void testBrokenRunnerBuilder() {
     try {
       builder
@@ -1068,15 +1009,18 @@ public void testParameterizedMethods() throws Exception {
     Assert.assertEquals(3, result.getRunCount());
   }
 
-  /** Verify adding and removing same class is rejected */
+  /** Verify adding a class method and removing same class leaves no tests. */
   @Test
   public void testFilterClassAddMethod() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(TestRequestBuilder.MISSING_ARGUMENTS_MSG);
-    builder
-        .addTestMethod(SampleRunnerFilterSizeTest.class.getName(), "testSmall")
-        .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
-        .build();
+    Request request =
+        builder
+            .addTestMethod(SampleRunnerFilterSizeTest.class.getName(), "testSmall")
+            .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
+            .build();
+
+    JUnitCore testRunner = new JUnitCore();
+    Result result = testRunner.run(request);
+    Assert.assertEquals(0, result.getRunCount());
   }
 
   /** Verify that including and excluding different methods leaves 1 method. */
@@ -1134,12 +1078,15 @@ public void testClassAndNotClass_different() {
   /** Verify that including and excluding the same class leaves no tests. */
   @Test
   public void testClassAndNotClass_same() {
-    thrown.expect(IllegalArgumentException.class);
-    thrown.expectMessage(TestRequestBuilder.MISSING_ARGUMENTS_MSG);
-    builder
-        .addTestClass(SampleRunnerFilterSizeTest.class.getName())
-        .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
-        .build();
+    Request request =
+        builder
+            .addTestClass(SampleRunnerFilterSizeTest.class.getName())
+            .removeTestClass(SampleRunnerFilterSizeTest.class.getName())
+            .build();
+
+    JUnitCore testRunner = new JUnitCore();
+    Result result = testRunner.run(request);
+    Assert.assertEquals(0, result.getRunCount());
   }
 
   /** Verify that exclusion filter is filtering out a single test in a class and leaves the rest */
@@ -1280,13 +1227,13 @@ public void testPackageAndNotPackage_same() {
   }
 
   /** Test exception is thrown when no apk path and no class has been provided */
-  @Test(expected = IllegalArgumentException.class)
+  @Test
   public void testNoApkPath() throws Exception {
-    builder.addTestPackage("androidx.test.internal.runner").build();
+    assertThrows(
+        IllegalArgumentException.class,
+        () -> builder.addTestPackage("androidx.test.internal.runner").build());
   }
 
-  @Rule public ExpectedException thrown = ExpectedException.none();
-
   /** Take intersection of test package and class */
   @Test
   public void testBothPackageAndClass() throws Exception {
@@ -1770,7 +1717,12 @@ public void testSkipExecution_JUnit3SuiteMethod_ReturnsCustomTest() {
   public void testNoSkipExecution_JUnit3TestSuite() {
     Request request = builder.addTestClass(JUnit3FailingTestSuite.class.getName()).build();
     JUnitCore testRunner = new JUnitCore();
-    ensureAllTestsFailed(testRunner.run(request), 1, "No runnable methods");
+    ensureAllTestsFailed(
+        testRunner.run(request),
+        1,
+        "Invalid test class '"
+            + JUnit3FailingTestSuite.class.getName()
+            + "': No test methods found");
   }
 
   /**
@@ -1782,7 +1734,12 @@ public void testSkipExecution_JUnit3TestSuite() {
     Request request =
         builder.setSkipExecution(true).addTestClass(JUnit3FailingTestSuite.class.getName()).build();
     JUnitCore testRunner = new JUnitCore();
-    ensureAllTestsFailed(testRunner.run(request), 1, "No runnable methods");
+    ensureAllTestsFailed(
+        testRunner.run(request),
+        1,
+        "Invalid test class '"
+            + JUnit3FailingTestSuite.class.getName()
+            + "': No test methods found");
   }
 
   /** Verify that a JUnit 3 custom Test cannot be executed because it has no runnable methods. */
@@ -1790,7 +1747,12 @@ public void testSkipExecution_JUnit3TestSuite() {
   public void testNoSkipExecution_JUnit3CustomTest() throws Throwable {
     Request request = builder.addTestClass(JUnit3FailingTestSuite.class.getName()).build();
     JUnitCore testRunner = new JUnitCore();
-    ensureAllTestsFailed(testRunner.run(request), 1, "No runnable methods");
+    ensureAllTestsFailed(
+        testRunner.run(request),
+        1,
+        "Invalid test class '"
+            + JUnit3FailingTestSuite.class.getName()
+            + "': No test methods found");
   }
 
   /**
@@ -1802,7 +1764,12 @@ public void testSkipExecution_JUnit3CustomTest() throws Throwable {
     Request request =
         builder.setSkipExecution(true).addTestClass(JUnit3FailingTestSuite.class.getName()).build();
     JUnitCore testRunner = new JUnitCore();
-    ensureAllTestsFailed(testRunner.run(request), 1, "No runnable methods");
+    ensureAllTestsFailed(
+        testRunner.run(request),
+        1,
+        "Invalid test class '"
+            + JUnit3FailingTestSuite.class.getName()
+            + "': No test methods found");
   }
 
   private static void ensureAllTestsFailed(
@@ -1854,6 +1821,7 @@ private void setClassPathScanningResults(String... names) throws IOException {
   private static class RecordingRunListener extends RunListener {
     ArrayList<String> methods = new ArrayList<>();
 
+    @Override
     public void testFinished(Description description) {
       methods.add(description.getClassName() + "#" + description.getMethodName());
     }
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/coverage/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/coverage/BUILD
new file mode 100644
index 000000000..a76c649ca
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/coverage/BUILD
@@ -0,0 +1,30 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "InstrumentationCoverageReporterTest",
+    srcs = [
+        "InstrumentationCoverageReporterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//services/storage",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/intent/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/intent/BUILD
new file mode 100644
index 000000000..afbf145e6
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/intent/BUILD
@@ -0,0 +1,28 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "IntentMonitorImplTest",
+    srcs = [
+        "IntentMonitorImplTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilderTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilderTest.java
index 01dedd6fd..616fa615a 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilderTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/AndroidAnnotatedBuilderTest.java
@@ -17,12 +17,12 @@
 package androidx.test.internal.runner.junit4;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.filters.Suppress;
-import androidx.test.internal.util.AndroidRunnerParams;
-import androidx.test.runner.AndroidJUnit4;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.Collection;
@@ -43,8 +43,6 @@ public class AndroidAnnotatedBuilderTest {
 
   @Mock RunnerBuilder mockRunnerBuilder;
 
-  @Mock AndroidRunnerParams mockAndroidRunnerParams;
-
   @RunWith(AndroidJUnit4.class)
   public static class RunWithAndroidJUnit4Class {
     @Test
@@ -87,7 +85,7 @@ public void initMocks() {
   public void successfullyCreateAndroidRunner() throws Exception {
     final Runner mockedRunner = mock(Runner.class);
     AndroidAnnotatedBuilder ab =
-        new AndroidAnnotatedBuilder(mockRunnerBuilder, mockAndroidRunnerParams) {
+        new AndroidAnnotatedBuilder(mockRunnerBuilder, 0) {
           @Override
           public Runner buildAndroidRunner(Class<? extends Runner> runnerClass, Class<?> testClass)
               throws Exception {
@@ -98,14 +96,14 @@ public Runner buildAndroidRunner(Class<? extends Runner> runnerClass, Class<?> t
         };
     // attempt to create a runner for a class annotated with @RunWith(AndroidJUnit4.class)
     Runner runner = ab.runnerForClass(RunWithAndroidJUnit4Class.class);
-    assertEquals(0, runner.testCount());
+    assertEquals(1, runner.testCount());
   }
 
-  @Test(expected = InvocationTargetException.class)
+  @Test
   public void nonAndroidJUnit4RunWithAnnotation_DefaultsToDefaultAnnotatedBuilder()
       throws Exception {
     AndroidAnnotatedBuilder ab =
-        new AndroidAnnotatedBuilder(mockRunnerBuilder, mockAndroidRunnerParams) {
+        new AndroidAnnotatedBuilder(mockRunnerBuilder, 0) {
           @Override
           public Runner buildAndroidRunner(Class<? extends Runner> runnerClass, Class<?> testClass)
               throws Exception {
@@ -116,13 +114,14 @@ public Runner buildAndroidRunner(Class<? extends Runner> runnerClass, Class<?> t
           }
         };
     // attempt to create a runner for a class annotated with @RunWith(JUnit4.class)
-    ab.runnerForClass(RunWithJUnit4Class.class);
+    assertThrows(
+        InvocationTargetException.class, () -> ab.runnerForClass(RunWithJUnit4Class.class));
   }
 
   @Test
   public void testNoRunWith() throws Exception {
     AndroidAnnotatedBuilder ab =
-        new AndroidAnnotatedBuilder(mockRunnerBuilder, mockAndroidRunnerParams) {
+        new AndroidAnnotatedBuilder(mockRunnerBuilder, 0) {
           @Override
           public Runner buildAndroidRunner(Class<? extends Runner> runnerClass, Class<?> testClass)
               throws Exception {
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/BUILD
new file mode 100644
index 000000000..9c15c5acb
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/BUILD
@@ -0,0 +1,28 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "AndroidAnnotatedBuilderTest",
+    srcs = [
+        "AndroidAnnotatedBuilderTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD
new file mode 100644
index 000000000..97ff0c189
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/junit4/statement/BUILD
@@ -0,0 +1,47 @@
+# Description: Tests for Runner
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "ui_thread_statement_test_examples",
+    srcs = [
+        "UiThreadTestInterface.java",
+        "UiThreadTestOnClass.java",
+        "UiThreadTestOnImplementedInterface.java",
+        "UiThreadTestOnMethod.java",
+        "UiThreadTestOnSuperclass.java",
+    ],
+    deps = [
+        "//ext/junit/java/androidx/test/ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//runner/rules",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "UiThreadStatementTest",
+    srcs = [
+        "UiThreadStatementTest.java",
+    ],
+    deps = [
+        ":ui_thread_statement_test_examples",
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml
new file mode 100644
index 000000000..e435c3ede
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.internal.runner.lifecycle"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application android:label="AndroidJUnitRunner" android:name="androidx.test.testing.fixtures.MyApplication" >
+    </application>
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
+
+    <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="androidx.test.internal.runner.lifecycle">
+      <meta-data
+          android:name="appListener"
+          android:value="androidx.test.testing.fixtures.AppLifecycleListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/BUILD
new file mode 100644
index 000000000..46abfddf8
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/lifecycle/BUILD
@@ -0,0 +1,59 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "ActivityLifecycleMonitorImplTest",
+    srcs = [
+        "ActivityLifecycleMonitorImplTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ApplicationLifecycleMonitorTest",
+    srcs = [
+        "ApplicationLifecycleMonitorTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/AndroidManifest.xml b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/AndroidManifest.xml
new file mode 100644
index 000000000..fb66b1818
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.internal.runner.listener"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+   <application android:label="AndroidJUnitRunner" />
+
+  <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" />
+
+    <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="androidx.test.internal.runner.listener" >
+       <meta-data
+          android:name="listener"
+          android:value="androidx.test.testing.fixtures.ManifestListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/BUILD b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/BUILD
new file mode 100644
index 000000000..3d06f47bf
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/BUILD
@@ -0,0 +1,96 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "CoverageListenerTest",
+    srcs = [
+        "CoverageListenerTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "InstrumentationResultPrinterTest",
+    srcs = [
+        "InstrumentationResultPrinterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ManifestListenerTest",
+    srcs = [
+        "ManifestListenerTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "SuiteAssignmentPrinterTest",
+    srcs = [
+        "SuiteAssignmentPrinterTest.java",
+    ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "//services/storage",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/InstrumentationResultPrinterTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/InstrumentationResultPrinterTest.java
index 037a8cad8..62a5f0b6a 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/InstrumentationResultPrinterTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/InstrumentationResultPrinterTest.java
@@ -17,17 +17,25 @@
 package androidx.test.internal.runner.listener;
 
 import static androidx.test.internal.runner.listener.InstrumentationResultPrinter.REPORT_KEY_STACK;
+import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import android.os.Bundle;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
+import java.util.ArrayList;
+import java.util.List;
 import junit.framework.Assert;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.runner.Computer;
 import org.junit.runner.Description;
+import org.junit.runner.JUnitCore;
+import org.junit.runner.Request;
 import org.junit.runner.RunWith;
-import org.junit.runner.notification.Failure;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -62,27 +70,75 @@ public void sendStatus(int code, Bundle bundle) {
     assertTrue(resultBundle[0].containsKey(REPORT_KEY_STACK));
   }
 
+  private static class TestInstrumentationResultPrinter extends InstrumentationResultPrinter {
+    final List<String> resultsLog = new ArrayList<>();
+
+    @Override
+    public void sendStatus(int code, Bundle bundle) {
+      resultsLog.add(
+          String.format(
+              "code=%s, name=%s#%s",
+              code,
+              bundle.getString(REPORT_KEY_NAME_CLASS),
+              bundle.getString(REPORT_KEY_NAME_TEST)));
+    }
+  }
+
+  public static class ThrowingTest {
+    @BeforeClass
+    public static void setUpClass() {
+      throw new RuntimeException();
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+      throw new RuntimeException();
+    }
+
+    @Test
+    public void emptyTest() {}
+  }
+
   @Test
-  public void verifyFailureDescriptionPropagatedToStartAndFinishMethods() throws Exception {
-    Description[] descriptions = new Description[2];
-    InstrumentationResultPrinter intrResultPrinter =
-        new InstrumentationResultPrinter() {
-          @Override
-          public void testStarted(Description description) throws Exception {
-            descriptions[0] = description;
-          }
+  public void verifyBeforeClassExceptionsReported() throws Exception {
+    JUnitCore core = new JUnitCore();
+    var intrResultPrinter = new TestInstrumentationResultPrinter();
+    core.addListener(intrResultPrinter);
+    Request testRequest = Request.classes(new Computer(), new Class<?>[] {ThrowingTest.class});
+    core.run(testRequest);
 
-          @Override
-          public void testFinished(Description description) throws Exception {
-            descriptions[1] = description;
-          }
-        };
+    String className = ThrowingTest.class.getName();
+    assertEquals(
+        List.of(
+            "code=1, name=" + className + "#null",
+            "code=-2, name=" + className + "#null",
+            "code=1, name=" + className + "#null",
+            "code=-2, name=" + className + "#null"),
+        intrResultPrinter.resultsLog);
+  }
 
-    Description d = Description.createTestDescription(this.getClass(), "Failure Description");
-    Failure testFailure = new Failure(d, new Exception());
-    intrResultPrinter.testFailure(testFailure);
+  public static class AssumptionFailureInClassTest {
+    @BeforeClass
+    public static void setUpClass() {
+      assumeTrue(false);
+    }
+
+    @Test
+    public void emptyTest() {}
+  }
+
+  @Test
+  public void verifyBeforeClassAssumptionsReported() throws Exception {
+    JUnitCore core = new JUnitCore();
+    var intrResultPrinter = new TestInstrumentationResultPrinter();
+    core.addListener(intrResultPrinter);
+    Request testRequest = Request.classes(new Computer(), AssumptionFailureInClassTest.class);
+    core.run(testRequest);
 
-    assertEquals(d, descriptions[0]);
-    assertEquals(d, descriptions[1]);
+    String className = AssumptionFailureInClassTest.class.getName();
+    assertThat(intrResultPrinter.resultsLog)
+        .containsExactly(
+            "code=1, name=" + className + "#null", "code=-4, name=" + className + "#null")
+        .inOrder();
   }
 }
diff --git a/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/ManifestListenerTest.java b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/ManifestListenerTest.java
index e7c6e36d4..e60b3d208 100644
--- a/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/ManifestListenerTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/ManifestListenerTest.java
@@ -24,9 +24,8 @@
 import org.junit.runner.RunWith;
 
 /**
- * Simple test to check that specifying a <a
- * href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a> via a meta-data tag in manifest works.
+ * Simple test to check that specifying a {@link org.junit.runner.notification.RunListener} via a
+ * meta-data tag in manifest works.
  */
 @RunWith(AndroidJUnit4.class)
 @SmallTest
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/BUILD
new file mode 100644
index 000000000..a14ced584
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/orchestrator/BUILD
@@ -0,0 +1,17 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "sample_junit_test",
+    srcs = glob(["*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD
new file mode 100644
index 000000000..27ccf1ae8
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD
@@ -0,0 +1,39 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+# Description: Tests for the Orchestrator client connection
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "BundleConverterTest",
+    size = "small",
+    srcs = [
+        "BundleConverterTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "OrchestratorV1ConnectionTest",
+    size = "small",
+    srcs = [
+        "OrchestratorV1ConnectionTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD.bazel b/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD.bazel
deleted file mode 100644
index 908b21554..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/orchestrator/callback/BUILD.bazel
+++ /dev/null
@@ -1,4 +0,0 @@
-# Description: Tests for the Orchestrator client connection
-licenses(["notice"])  # Apache License 2.0
-
-# TODO(b/161812565): create Bazel files for test events and new AJUR files
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/junit/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/junit/BUILD
new file mode 100644
index 000000000..bf48b2393
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/orchestrator/junit/BUILD
@@ -0,0 +1,25 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+# Description: Tests for the Orchestrator client connection
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "BundleJUnitUtilsTest",
+    size = "small",
+    srcs = [
+        "BundleJUnitUtilsTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/orchestrator:sample_junit_test",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/orchestrator/listeners/BUILD b/runner/android_junit_runner/javatests/androidx/test/orchestrator/listeners/BUILD
new file mode 100644
index 000000000..64051e220
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/orchestrator/listeners/BUILD
@@ -0,0 +1,24 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+# Description: Tests for the Orchestrator client connection
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "OrchestrationListenerManagerTest",
+    size = "small",
+    srcs = [
+        "OrchestrationListenerManagerTest.java",
+    ],
+    deps = [
+        "//runner/android_junit_runner",
+        "//runner/android_junit_runner/javatests/androidx/test/orchestrator:sample_junit_test",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerLifeCycleTest.java b/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerLifeCycleTest.java
deleted file mode 100644
index 538809639..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerLifeCycleTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.runner;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.isIn;
-import static org.mockito.Mockito.inOrder;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.test.ActivityUnitTestCase;
-import android.test.UiThreadTest;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.filters.Suppress;
-import androidx.test.runner.lifecycle.ActivityLifecycleCallback;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.test.runner.lifecycle.Stage;
-import org.mockito.InOrder;
-import org.mockito.Mockito;
-
-/** Integration tests between lifecycle management methods in runner and the LifecycleMonitor. */
-@MediumTest
-public class AndroidJUnitRunnerLifeCycleTest
-    extends ActivityUnitTestCase<AndroidJUnitRunnerLifeCycleTest.PublicLifecycleMethodActivity> {
-
-  private final ActivityLifecycleCallback callback = Mockito.mock(ActivityLifecycleCallback.class);
-
-  private PublicLifecycleMethodActivity spiedActivity;
-  private ActivityLifecycleMonitor monitor;
-
-  public AndroidJUnitRunnerLifeCycleTest() {
-    super(PublicLifecycleMethodActivity.class);
-  }
-
-  @Override
-  public void setActivity(Activity activity) {
-    if (null != activity) {
-      spiedActivity = Mockito.spy((PublicLifecycleMethodActivity) activity);
-    }
-  }
-
-  @Override
-  public PublicLifecycleMethodActivity getActivity() {
-    // otherwise ActivityUnitTestCase will call onCreate which will have side
-    // effects in lifecycle tracking which we are specifically testing for.
-    return null;
-  }
-
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    monitor = ActivityLifecycleMonitorRegistry.getInstance();
-    monitor.addLifecycleCallback(callback);
-  }
-
-  @Override
-  protected void tearDown() throws Exception {
-    monitor.removeLifecycleCallback(callback);
-    super.tearDown();
-  }
-
-  public void testInstrumentationArgumentsRegistryGetsPopulated() {
-    assertNotNull(InstrumentationRegistry.getArguments());
-  }
-
-  @UiThreadTest
-  public void testActivityPreOnCreateCalled() {
-    startActivity(new Intent(), null, null);
-    spiedActivity.setRunnableForOnCreate(
-        new Runnable() {
-          @Override
-          public void run() {
-            assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.PRE_ON_CREATE)));
-            assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.PRE_ON_CREATE));
-          }
-        });
-    getInstrumentation().callActivityOnCreate(spiedActivity, new Bundle());
-  }
-
-  // temporarily suppress - fails due to some sort of mockito issue
-  @Suppress
-  @UiThreadTest
-  public void testOnStartStopCalled() {
-    startActivity(new Intent(), null, null);
-
-    // if we dont pair start/stop together the test runner will block until a timeout
-    // occurs waiting for the activity to stop.
-    getInstrumentation().callActivityOnStart(spiedActivity);
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.STARTED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.STARTED));
-
-    getInstrumentation().callActivityOnStop(spiedActivity);
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.STOPPED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.STOPPED));
-
-    InOrder order = inOrder(spiedActivity, callback);
-    order.verify(spiedActivity).onStart();
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.STARTED);
-    order.verify(spiedActivity).onStop();
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.STOPPED);
-  }
-
-  @UiThreadTest
-  public void testOnCreateCalled() {
-    startActivity(new Intent(), null, null);
-    Bundle b = new Bundle();
-    getInstrumentation().callActivityOnCreate(spiedActivity, b);
-
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.CREATED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.CREATED));
-    InOrder order = inOrder(spiedActivity, callback);
-    order.verify(spiedActivity).onCreate(b);
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.CREATED);
-  }
-
-  @UiThreadTest
-  public void testOnResumeCalled() {
-    startActivity(new Intent(), null, null);
-    getInstrumentation().callActivityOnResume(spiedActivity);
-
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.RESUMED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.RESUMED));
-    InOrder order = inOrder(spiedActivity, callback);
-    order.verify(spiedActivity).onResume();
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.RESUMED);
-  }
-
-  @UiThreadTest
-  public void testOnPauseCalled() {
-    startActivity(new Intent(), null, null);
-    getInstrumentation().callActivityOnPause(spiedActivity);
-
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.PAUSED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.PAUSED));
-    InOrder order = inOrder(spiedActivity, callback);
-    order.verify(spiedActivity).onPause();
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.PAUSED);
-  }
-
-  @UiThreadTest
-  public void testOnRestartCalled() {
-    startActivity(new Intent(), null, null);
-    getInstrumentation().callActivityOnRestart(spiedActivity);
-
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.RESTARTED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.RESTARTED));
-    InOrder order = inOrder(spiedActivity, callback);
-    order.verify(spiedActivity).onRestart();
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.RESTARTED);
-  }
-
-  @UiThreadTest
-  public void testOnDestroyCalled() {
-    startActivity(new Intent(), null, null);
-    getInstrumentation().callActivityOnDestroy(spiedActivity);
-
-    assertThat(spiedActivity, isIn(monitor.getActivitiesInStage(Stage.DESTROYED)));
-    assertThat(monitor.getLifecycleStageOf(spiedActivity), is(Stage.DESTROYED));
-    InOrder order = inOrder(spiedActivity, callback);
-    order.verify(spiedActivity).onDestroy();
-    order.verify(callback).onActivityLifecycleChanged(spiedActivity, Stage.DESTROYED);
-  }
-
-  /** Makes lifecycle methods public so we can verify on them. */
-  public static class PublicLifecycleMethodActivity extends Activity {
-    private Runnable runnableForOnCreate;
-
-    /**
-     * Invokes the runnable in onCreate of this activity.
-     *
-     * @param runnable runnable to invoke in onCreate or {@code null} for no-op runnable.
-     */
-    public void setRunnableForOnCreate(Runnable runnable) {
-      runnableForOnCreate = runnable;
-    }
-
-    @Override
-    public void onStart() {
-      super.onStart();
-    }
-
-    @Override
-    public void onStop() {
-      super.onStop();
-    }
-
-    @Override
-    public void onCreate(Bundle b) {
-      super.onCreate(b);
-      if (runnableForOnCreate != null) {
-        runnableForOnCreate.run();
-      }
-    }
-
-    @Override
-    public void onRestart() {
-      super.onRestart();
-    }
-
-    @Override
-    public void onDestroy() {
-      super.onDestroy();
-    }
-
-    @Override
-    public void onPause() {
-      super.onPause();
-    }
-
-    @Override
-    public void onResume() {
-      super.onResume();
-    }
-  }
-}
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerTest.java b/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerTest.java
index 32b53224e..4046a1ab7 100644
--- a/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/AndroidJUnitRunnerTest.java
@@ -38,7 +38,6 @@
 import androidx.test.internal.runner.RunnerArgs;
 import androidx.test.internal.runner.TestExecutor;
 import androidx.test.internal.runner.TestRequestBuilder;
-import androidx.test.internal.runner.listener.ActivityFinisherRunListener;
 import androidx.test.internal.runner.listener.CoverageListener;
 import androidx.test.internal.runner.listener.DelayInjector;
 import androidx.test.internal.runner.listener.InstrumentationResultPrinter;
@@ -202,9 +201,6 @@ public void testLegacyOrderRunListeners() {
     order
         .verify(executorBuilder)
         .addRunListener(ArgumentMatchers.isA(InstrumentationResultPrinter.class));
-    order
-        .verify(executorBuilder)
-        .addRunListener(ArgumentMatchers.isA(ActivityFinisherRunListener.class));
     order.verify(executorBuilder).addRunListener(ArgumentMatchers.isA(DelayInjector.class));
     order.verify(executorBuilder).addRunListener(ArgumentMatchers.isA(CoverageListener.class));
     // Two extra user added listeners
@@ -248,9 +244,6 @@ public void testNewOrderRunListeners() {
     order
         .verify(executorBuilder)
         .addRunListener(ArgumentMatchers.isA(InstrumentationResultPrinter.class));
-    order
-        .verify(executorBuilder)
-        .addRunListener(ArgumentMatchers.isA(ActivityFinisherRunListener.class));
   }
 
   /** Ensure classpathToScan paths are added to the runner. */
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/BUILD b/runner/android_junit_runner/javatests/androidx/test/runner/BUILD
new file mode 100644
index 000000000..b59dda02b
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/BUILD
@@ -0,0 +1,53 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "AndroidJUnitRunnerTest",
+    srcs = ["AndroidJUnitRunnerTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_local_test(
+    name = "AndroidJUnit4RoboTest",
+    srcs = ["AndroidJUnit4RoboTest.java"],
+    deps = [
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TraceRunListenerTest",
+    srcs = ["TraceRunListenerTest.java"],
+    manifest_values = {
+        "minSdkVersion": "28",
+        "targetSdkVersion": "28",
+    },
+    deps = [
+        "//runner/android_junit_runner",
+        "@maven//:androidx_tracing_tracing",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/TraceRunListenerTest.java b/runner/android_junit_runner/javatests/androidx/test/runner/TraceRunListenerTest.java
new file mode 100644
index 000000000..0f38fde73
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/TraceRunListenerTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.runner;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.internal.runner.listener.TraceRunListener;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.Description;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowTrace;
+
+/** Robolectric unit test for {@link TraceRunListener}. */
+@RunWith(RobolectricTestRunner.class)
+public final class TraceRunListenerTest {
+  @Before
+  public void setUp() throws Exception {
+    ShadowTrace.setEnabled(true);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    ShadowTrace.reset();
+  }
+
+  @Test
+  public void createsSection_withShortName() throws Exception {
+    TraceRunListener listener = new TraceRunListener();
+    Description description =
+        Description.createTestDescription(ClassUnderTest.class, "theMethodName");
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections()).isEmpty();
+
+    listener.testStarted(description);
+    listener.testFinished(description);
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections())
+        .containsExactly("test:ClassUnderTest#theMethodName");
+  }
+
+  @Test
+  public void createsSection_withLongName() throws Exception {
+    TraceRunListener listener = new TraceRunListener();
+    Description description =
+        Description.createTestDescription(
+            ClassUnderTest.class,
+            "anExcessivelyLongDescriptionStringWithLengthAboveThe127CharLimitWillBeTrimmedToAvoidThrowingAnExceptionFromBeginSpan");
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections()).isEmpty();
+
+    listener.testStarted(description);
+    listener.testFinished(description);
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections())
+        .containsExactly(
+            "test:ClassUnderTest#anExcessivelyLongDescriptionStringWithLengthAboveThe127CharLimitWillBeTrimmedToAvoidThrowingAnExceptionFrom");
+  }
+
+  private static final class ClassUnderTest {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/permission/BUILD b/runner/android_junit_runner/javatests/androidx/test/runner/permission/BUILD
new file mode 100644
index 000000000..ece1f83d6
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/permission/BUILD
@@ -0,0 +1,51 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "GrantPermissionCallableTest",
+    srcs = ["GrantPermissionCallableTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "PermissionRequesterTest",
+    srcs = ["PermissionRequesterTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "UiAutomationShellCommandTest",
+    srcs = ["UiAutomationShellCommandTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/permission/PermissionRequesterTest.java b/runner/android_junit_runner/javatests/androidx/test/runner/permission/PermissionRequesterTest.java
index 2195253c1..9ff6aba55 100644
--- a/runner/android_junit_runner/javatests/androidx/test/runner/permission/PermissionRequesterTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/permission/PermissionRequesterTest.java
@@ -29,7 +29,6 @@
 import android.content.Context;
 import android.os.Build;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.permission.RequestPermissionCallable.Result;
 import org.junit.Before;
@@ -67,7 +66,6 @@ public void initMocks() {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 23)
   public void permissionAddsPermissionToSet() {
     RequestPermissionCallable requestPermissionCallable1 =
         withGrantPermissionCallable(RUNTIME_PERMISSION1);
@@ -90,14 +88,12 @@ public void permissionAddsPermissionToSet() {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 23)
   public void duplicatePermissionThrows() {
     expected.expect(IllegalStateException.class);
     permissionRequester.addPermissions(RUNTIME_PERMISSION1, RUNTIME_PERMISSION1);
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 23)
   public void requestPermission_SuccessInGrantingPermissionRunsTest() throws Throwable {
     RequestPermissionCallable stubbedCallable = withStubbedCallable(Result.SUCCESS);
 
@@ -107,7 +103,6 @@ public void requestPermission_SuccessInGrantingPermissionRunsTest() throws Throw
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 23)
   public void failureInGrantingPermissionFailsTest() throws Throwable {
     expected.expect(AssertionError.class);
 
@@ -119,7 +114,6 @@ public void failureInGrantingPermissionFailsTest() throws Throwable {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 23)
   public void callableThrowsExceptionFailsTest() throws Throwable {
     expected.expect(AssertionError.class);
 
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/permission/UiAutomationShellCommandTest.java b/runner/android_junit_runner/javatests/androidx/test/runner/permission/UiAutomationShellCommandTest.java
index bc8837cc4..779cba6e6 100644
--- a/runner/android_junit_runner/javatests/androidx/test/runner/permission/UiAutomationShellCommandTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/permission/UiAutomationShellCommandTest.java
@@ -21,7 +21,6 @@
 import static org.junit.Assert.assertTrue;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.permission.UiAutomationShellCommand.PmCommand;
 import org.junit.Test;
@@ -36,13 +35,7 @@ public class UiAutomationShellCommandTest {
 
   private static final String RUNTIME_PERMISSION1 = "android.permission.PERMISSION1";
 
-  // Placeholder test to avoid the 'empty test suite' error on < sdk 23.
   @Test
-  @SdkSuppress(maxSdkVersion = 22)
-  public void emptyTest() {}
-
-  @Test
-  @SdkSuppress(minSdkVersion = 23)
   public void commandForPermission() {
     assertTrue(true);
     UiAutomationShellCommand shellCmdGrant =
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/BUILD b/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/BUILD
new file mode 100644
index 000000000..1a0fc5dda
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/BUILD
@@ -0,0 +1,57 @@
+# Description: Tests for Runner
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "BasicScreenCaptureProcessorTest",
+    srcs = ["BasicScreenCaptureProcessorTest.java"],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ScreenCaptureTest",
+    srcs = ["ScreenCaptureTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ScreenshotTest",
+    srcs = ["ScreenshotTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "TakeScreenshotCallableTest",
+    srcs = ["TakeScreenshotCallableTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/ScreenshotTest.java b/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/ScreenshotTest.java
index 7ef602d3f..4aa29edc5 100644
--- a/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/ScreenshotTest.java
+++ b/runner/android_junit_runner/javatests/androidx/test/runner/screenshot/ScreenshotTest.java
@@ -26,7 +26,6 @@
 
 import android.app.Activity;
 import android.graphics.Bitmap;
-import android.os.Build;
 import android.view.View;
 import android.view.Window;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -35,9 +34,7 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -54,8 +51,6 @@ public class ScreenshotTest {
   @Mock private Window window;
   @Mock private View view;
 
-  @Rule public final ExpectedException expectedException = ExpectedException.none();
-
   private Bitmap stubBitmap = Bitmap.createBitmap(10, 10, ARGB_8888);
   private Bitmap stubBitmapLegacy = Bitmap.createBitmap(10, 10, ARGB_8888);
 
@@ -74,7 +69,6 @@ public void before() throws Exception {
 
     Screenshot.setUiAutomationWrapper(uiAutomationWrapper);
     Screenshot.setTakeScreenshotCallableFactory(stubCallableFactory);
-    Screenshot.setAndroidRuntimeVersion(Build.VERSION.SDK_INT);
     Screenshot.setScreenshotProcessors(new HashSet<ScreenCaptureProcessor>());
 
     doReturn(stubBitmap).when(uiAutomationWrapper).takeScreenshot();
@@ -84,8 +78,7 @@ public void before() throws Exception {
   }
 
   @Test
-  public void captureScreenshotAbove18WithoutActivity_shouldCapture() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(18);
+  public void captureScreenshotWithoutActivity_shouldCapture() throws Exception {
     ScreenCapture comparableScreenCapture = new ScreenCapture(stubBitmap);
 
     assertEquals(Screenshot.capture(), comparableScreenCapture);
@@ -94,8 +87,7 @@ public void captureScreenshotAbove18WithoutActivity_shouldCapture() throws Excep
   }
 
   @Test
-  public void captureScreenshotAbove18WithActivity_shouldCapture() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(18);
+  public void captureScreenshotWithActivity_shouldCapture() throws Exception {
     ScreenCapture comparableScreenCapture = new ScreenCapture(stubBitmapLegacy);
 
     assertEquals(Screenshot.capture(activity), comparableScreenCapture);
@@ -104,8 +96,7 @@ public void captureScreenshotAbove18WithActivity_shouldCapture() throws Exceptio
   }
 
   @Test
-  public void captureScreenshotAbove18WithView_shouldCapture() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(18);
+  public void captureScreenshotWithView_shouldCapture() throws Exception {
     ScreenCapture comparableScreenCapture = new ScreenCapture(stubBitmapLegacy);
 
     assertEquals(Screenshot.capture(view), comparableScreenCapture);
@@ -113,40 +104,8 @@ public void captureScreenshotAbove18WithView_shouldCapture() throws Exception {
     verify(callable).call();
   }
 
-  @Test
-  public void captureScreenshotBelow18WithActivity_shouldCapture() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(17);
-    ScreenCapture comparableScreenCapture = new ScreenCapture(stubBitmapLegacy);
-
-    assertEquals(Screenshot.capture(activity), comparableScreenCapture);
-    verify(uiAutomationWrapper, never()).takeScreenshot();
-    verify(callable).call();
-  }
-
-  @Test
-  public void captureScreenshotBelow18WithView_shouldCapture() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(17);
-    ScreenCapture comparableScreenCapture = new ScreenCapture(stubBitmapLegacy);
-
-    assertEquals(Screenshot.capture(view), comparableScreenCapture);
-    verify(uiAutomationWrapper, never()).takeScreenshot();
-    verify(callable).call();
-  }
-
-  @Test
-  public void captureScreenshotBelow18_WithoutActivityOrView_shouldThrowIllegalState()
-      throws Exception {
-    Screenshot.setAndroidRuntimeVersion(17);
-    expectedException.expect(IllegalStateException.class);
-
-    Screenshot.capture();
-    verify(callable, never()).call();
-    verify(uiAutomationWrapper, never()).takeScreenshot();
-  }
-
   @Test
   public void capture_ShouldAddProcessor() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(18);
     Set screenshotProcessorSet = new HashSet<>();
     screenshotProcessorSet.add(screenCaptureProcessor);
     Screenshot.setScreenshotProcessors(screenshotProcessorSet);
@@ -157,7 +116,6 @@ public void capture_ShouldAddProcessor() throws Exception {
 
   @Test
   public void capture_ShouldAddMultipleProcessors() throws Exception {
-    Screenshot.setAndroidRuntimeVersion(18);
     Set screenshotProcessorSet = new HashSet<>();
     screenshotProcessorSet.add(screenCaptureProcessor);
     screenshotProcessorSet.add(screenCaptureProcessorAdditional);
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/AbstractTest.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/AbstractTest.java
new file mode 100644
index 000000000..79272ddce
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/AbstractTest.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import junit.framework.TestCase;
+
+public abstract class AbstractTest extends TestCase {
+
+  public void testFoo() {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/BUILD b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/BUILD
new file mode 100644
index 000000000..4fd5da5c3
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "fixtures",
+    srcs = glob(["*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/BUILD.bazel b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/BUILD.bazel
deleted file mode 100644
index eb3638028..000000000
--- a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-package(
-    default_testonly = 1,
-)
-
-android_library(
-    name = "fixtures",
-    srcs = glob(["*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "@maven//:junit_junit",
-    ],
-)
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/CollectingRunListener.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/CollectingRunListener.java
new file mode 100644
index 000000000..9de11b5e5
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/CollectingRunListener.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.runner.Description;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+
+public class CollectingRunListener extends RunListener {
+
+  public List<Description> tests = new ArrayList<>();
+  public List<Failure> failures = new ArrayList<>();
+
+  @Override
+  public void testFinished(Description description) throws Exception {
+    super.testFinished(description);
+    tests.add(description);
+  }
+
+  @Override
+  public void testFailure(Failure failure) throws Exception {
+    super.testFailure(failure);
+    failures.add(failure);
+  }
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/CustomTest.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/CustomTest.java
new file mode 100644
index 000000000..16b64673e
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/CustomTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+
+public class CustomTest implements Test {
+
+  @Override
+  public int countTestCases() {
+    return 0;
+  }
+
+  @Override
+  public void run(TestResult testResult) {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/EmptyJUnit3Test.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/EmptyJUnit3Test.java
new file mode 100644
index 000000000..6482f80e1
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/EmptyJUnit3Test.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import junit.framework.TestCase;
+
+public class EmptyJUnit3Test extends TestCase {}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/EmptyJUnit4Test.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/EmptyJUnit4Test.java
new file mode 100644
index 000000000..92c192c13
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/EmptyJUnit4Test.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class EmptyJUnit4Test {}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3StyleTimeoutClass.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3StyleTimeoutClass.java
index 6110aa9ef..72b96ef2c 100644
--- a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3StyleTimeoutClass.java
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3StyleTimeoutClass.java
@@ -8,7 +8,7 @@ public class JUnit3StyleTimeoutClass extends TestCase {
   public static final int GLOBAL_ARG_TIMEOUT = 100;
   public static final int GLOBAL_RULE_TIMEOUT = 50;
   public static final int TEST_TIMEOUT = 25;
-  public static final int WAIT_FOR_TIMEOUT = 25;
+  public static final int WAIT_FOR_TIMEOUT = 100;
 
   public void testArgTimeoutInterrupts() throws InterruptedException {
     Thread.sleep(GLOBAL_ARG_TIMEOUT + WAIT_FOR_TIMEOUT);
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3Test.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3Test.java
new file mode 100644
index 000000000..ec0a1c169
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit3Test.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import junit.framework.TestCase;
+
+public class JUnit3Test extends TestCase {
+
+  public void testFoo() {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit4RunTest.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit4RunTest.java
new file mode 100644
index 000000000..59a16ceab
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit4RunTest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+@RunWith(value = Parameterized.class)
+public class JUnit4RunTest {
+
+  public void thisIsMayBeATest() {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit4Test.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit4Test.java
new file mode 100644
index 000000000..9f78e6e7e
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/JUnit4Test.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+import org.junit.Test;
+
+@SuppressWarnings("JUnit4RunWithMissing")
+public class JUnit4Test {
+
+  @Test
+  public void thisIsATest() {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/ManifestListener.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/ManifestListener.java
index 69130d574..70915149c 100644
--- a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/ManifestListener.java
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/ManifestListener.java
@@ -19,9 +19,8 @@
 import org.junit.runner.notification.RunListener;
 
 /**
- * A <a href="http://junit.org/javadoc/latest/org/junit/runner/notification/RunListener.html"><code>
- * RunListener</code></a> fixture used to ensure listener classes specified via meta-data tags in
- * AndroidManifest are loaded and used properly.
+ * A {@link org.junit.runner.notification.RunListener} fixture used to ensure listener classes
+ * specified via meta-data tags in AndroidManifest are loaded and used properly.
  */
 public class ManifestListener extends RunListener {
 
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/NotATest.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/NotATest.java
new file mode 100644
index 000000000..71783ef71
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/NotATest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+public class NotATest {
+
+  public void thisIsNotATest() {}
+}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/SubClassAbstractTest.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/SubClassAbstractTest.java
new file mode 100644
index 000000000..43d60c1ed
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/SubClassAbstractTest.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+public class SubClassAbstractTest extends AbstractTest {}
diff --git a/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/SubClassJUnit4Test.java b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/SubClassJUnit4Test.java
new file mode 100644
index 000000000..ab3c12e0d
--- /dev/null
+++ b/runner/android_junit_runner/javatests/androidx/test/testing/fixtures/SubClassJUnit4Test.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.testing.fixtures;
+
+public class SubClassJUnit4Test extends JUnit4Test {}
diff --git a/runner/android_test_orchestrator/BUILD b/runner/android_test_orchestrator/BUILD
new file mode 100644
index 000000000..25b201432
--- /dev/null
+++ b/runner/android_test_orchestrator/BUILD
@@ -0,0 +1,30 @@
+# Description:
+#   On Device Orchestrator, to run instrumentation tests sequentially from a single adb command.
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+alias(
+    name = "android_test_orchestrator",
+    actual = "//runner/android_test_orchestrator/java/androidx/test/orchestrator",
+    visibility = [":odo"],
+)
+
+package_group(
+    name = "odo",
+    packages = [
+        "//runner/android_test_orchestrator/java/androidx/test/orchestrator",
+        "//runner/android_test_orchestrator/java/androidx/test/orchestrator/instrumentationlistener",
+        "//runner/android_test_orchestrator/java/androidx/test/orchestrator/junit",
+        "//runner/android_test_orchestrator/java/androidx/test/orchestrator/listeners",
+        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator",
+        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator/instrumentationlistener",
+        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator/junit",
+        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator/listeners",
+        "//runner/android_test_orchestrator/stubapp",
+    ],
+)
diff --git a/runner/android_test_orchestrator/BUILD.bazel b/runner/android_test_orchestrator/BUILD.bazel
deleted file mode 100644
index 17902414c..000000000
--- a/runner/android_test_orchestrator/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-# Description:
-#   On Device Orchestrator, to run instrumentation tests sequentially from a single adb command.
-
-licenses(["notice"])
-
-android_library(
-    name = "android_test_orchestrator",
-    visibility = [":odo"],
-    exports = ["//runner/android_test_orchestrator/java/androidx/test/orchestrator"],
-)
-
-package_group(
-    name = "odo",
-    packages = [
-        "//runner/android_test_orchestrator/java/androidx/test/orchestrator",
-        "//runner/android_test_orchestrator/java/androidx/test/orchestrator/instrumentationlistener",
-        "//runner/android_test_orchestrator/java/androidx/test/orchestrator/junit",
-        "//runner/android_test_orchestrator/java/androidx/test/orchestrator/listeners",
-        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator",
-        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator/instrumentationlistener",
-        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator/junit",
-        "//runner/android_test_orchestrator/javatests/androidx/test/orchestrator/listeners",
-        "//runner/android_test_orchestrator/stubapp",
-    ],
-)
diff --git a/runner/android_test_orchestrator/CHANGELOG.md b/runner/android_test_orchestrator/CHANGELOG.md
new file mode 100644
index 000000000..217b6b59d
--- /dev/null
+++ b/runner/android_test_orchestrator/CHANGELOG.md
@@ -0,0 +1,21 @@
+### orchestrator {version} {:#orchestrator-{version}}
+
+{{date}}
+
+`androidx.test:orchestrator:{version}` is released.
+
+**Bug Fixes**
+
+* Remove use of guava. Fixes https://github.com/android/android-test/issues/2422
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/AndroidTestOrchestrator.java b/runner/android_test_orchestrator/java/androidx/test/orchestrator/AndroidTestOrchestrator.java
index a190cd13e..0158ee60c 100644
--- a/runner/android_test_orchestrator/java/androidx/test/orchestrator/AndroidTestOrchestrator.java
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/AndroidTestOrchestrator.java
@@ -16,6 +16,7 @@
 
 package androidx.test.orchestrator;
 
+import static androidx.test.internal.util.Checks.checkState;
 import static androidx.test.orchestrator.OrchestratorConstants.AJUR_CLASS_ARGUMENT;
 import static androidx.test.orchestrator.OrchestratorConstants.AJUR_COVERAGE;
 import static androidx.test.orchestrator.OrchestratorConstants.AJUR_COVERAGE_FILE;
@@ -24,7 +25,6 @@
 import static androidx.test.orchestrator.OrchestratorConstants.ISOLATED_ARGUMENT;
 import static androidx.test.orchestrator.OrchestratorConstants.ORCHESTRATOR_DEBUG_ARGUMENT;
 import static androidx.test.orchestrator.OrchestratorConstants.TARGET_INSTRUMENTATION_ARGUMENT;
-import static com.google.common.base.Preconditions.checkState;
 
 import android.Manifest.permission;
 import android.app.Activity;
@@ -54,7 +54,7 @@
 import androidx.test.services.shellexecutor.ClientNotConnected;
 import androidx.test.services.shellexecutor.ShellExecSharedConstants;
 import androidx.test.services.shellexecutor.ShellExecutor;
-import androidx.test.services.shellexecutor.ShellExecutorImpl;
+import androidx.test.services.shellexecutor.ShellExecutorFactory;
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -118,6 +118,11 @@
  *
  * <p>Pass {@code -e orchestratorDebug} flag if you need to debug orchestrator itself. Note, to
  * debug test code you still need to pass {@code -e debug}.
+ *
+ * <p>Pass {@code -e orchestratorInstrumentationArgs "params"} to pass {@code params} to the
+ * instrumentation invocation directly instead of adding them to the bundle, {@code params} are
+ * expected to be comma delimited parameters (eg: {@code -e orchestratorInstrumentationArgs
+ * "--no-hidden-api-checks, --no-isolated-storage"})
  */
 public final class AndroidTestOrchestrator extends android.app.Instrumentation
     implements RunFinishedListener {
@@ -128,7 +133,7 @@ public final class AndroidTestOrchestrator extends android.app.Instrumentation
   private static final String ORCHESTRATOR_SERVICE_ARGUMENT = "orchestratorService";
 
   private static final String TEST_COLLECTION_FILENAME = "testCollection.txt";
-  private static final String TEST_RUN_FILENAME = "%s.txt";
+  private static final int MAX_FILENAME_LENGTH = 255;
 
   private static final Pattern FULLY_QUALIFIED_CLASS_AND_METHOD =
       Pattern.compile("[\\w\\.?]+#\\w+");
@@ -272,6 +277,27 @@ private void collectTests() {
     }
   }
 
+  @VisibleForTesting
+  static String makeValidFilename(String testName, int maxFilenameLength) {
+    // Max filename length is limited, so tests with longer names have to be
+    // truncated.
+    // To prevent collisions when filename length exceeds the limit, we replace
+    // the last characters with the test name's hashCode, formatted in hex.
+
+    final String testRunFilenameSuffix = ".txt";
+    final int testNameMaxLength = maxFilenameLength - testRunFilenameSuffix.length();
+
+    if (testName.length() <= testNameMaxLength) {
+      return testName + testRunFilenameSuffix;
+    }
+
+    // Name exceeds max length, truncate it and append its hashCode.
+    String testHashCode = String.format("%08x", testName.hashCode());
+    testName = testName.substring(0, testNameMaxLength - testHashCode.length()) + testHashCode;
+
+    return testName + testRunFilenameSuffix;
+  }
+
   @VisibleForTesting
   static boolean isSingleMethodTest(String classArg) {
     if (TextUtils.isEmpty(classArg)) {
@@ -296,7 +322,7 @@ public void runFinished() {
         return;
       }
     } else {
-      listenerManager.testProcessFinished(getOutputFile());
+      listenerManager.testProcessFinished(getOutputFile(test));
     }
 
     if (runsInIsolatedMode(arguments)) {
@@ -391,17 +417,17 @@ private OutputStream getOutputStream() {
       if (Build.VERSION.SDK_INT >= 24) {
         context = ContextCompat.createDeviceProtectedStorageContext(context);
       }
-      return context.openFileOutput(getOutputFile(), 0);
+      return context.openFileOutput(getOutputFile(test), 0);
     } catch (FileNotFoundException e) {
       throw new RuntimeException("Could not open stream for output");
     }
   }
 
-  private String getOutputFile() {
-    if (null == test) {
+  private String getOutputFile(String testName) {
+    if (testName == null) {
       return TEST_COLLECTION_FILENAME;
     } else {
-      return String.format(TEST_RUN_FILENAME, test);
+      return makeValidFilename(testName, MAX_FILENAME_LENGTH);
     }
   }
 
@@ -431,17 +457,16 @@ private Bundle createResultBundle() {
   @Override
   public void finish(int resultCode, Bundle results) {
 
-      try {
-        super.finish(resultCode, results);
-      } catch (SecurityException e) {
-        Log.e(TAG, "Security exception thrown on shutdown", e);
-        // On API Level 18 a security exception can be occasionally thrown when calling finish
-        // with a result bundle taken from a remote message.  Recreating the result bundle and
-        // retrying finish has a high probability of suppressing the flake.
-        results = createResultBundle();
-        super.finish(resultCode, results);
-      }
-
+    try {
+      super.finish(resultCode, results);
+    } catch (SecurityException e) {
+      Log.e(TAG, "Security exception thrown on shutdown", e);
+      // On API Level 18 a security exception can be occasionally thrown when calling finish
+      // with a result bundle taken from a remote message.  Recreating the result bundle and
+      // retrying finish has a high probability of suppressing the flake.
+      results = createResultBundle();
+      super.finish(resultCode, results);
+    }
   }
 
   @Override
@@ -497,7 +522,7 @@ private static String execShellCommandSync(
     Throwable exception = null;
     //noinspection TryWithIdenticalCatches (not supported be below API lvl 19)
     try {
-      ShellExecutor shellExecutor = new ShellExecutorImpl(context, secret);
+      ShellExecutor shellExecutor = new ShellExecutorFactory(context, secret).create();
       cmdResult = shellExecutor.executeShellCommandSync(cmd, params, new HashMap<>(), false);
     } catch (ClientNotConnected clientNotConnected) {
       exception = clientNotConnected;
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD b/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
new file mode 100644
index 000000000..9ba1f81a9
--- /dev/null
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD
@@ -0,0 +1,43 @@
+# Description:
+#   On Device Orchestrator, to run instrumentation tests sequentially from a single adb command
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+android_library(
+    name = "orchestrator",
+    srcs = glob(["**/*java"]),
+    idl_srcs = glob(["**/*.aidl"]),
+    visibility = [
+        ":export",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//services/shellexecutor:exec_client",
+        "@maven//:androidx_core_core",
+    ],
+)
+
+# Do not link to these targets directly, rely on exporting target instead
+package_group(
+    name = "export",
+    packages = [
+        "//runner/android_test_orchestrator",
+        "//runner/android_test_orchestrator/stubapp",
+    ],
+)
+
+filegroup(
+    name = "orchestrator_src",
+    srcs = [
+        ":liborchestrator-src.jar",
+    ],
+)
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD.bazel b/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD.bazel
deleted file mode 100644
index 1baee126b..000000000
--- a/runner/android_test_orchestrator/java/androidx/test/orchestrator/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-# Description:
-#   On Device Orchestrator, to run instrumentation tests sequentially from a single adb command
-licenses(["notice"])
-
-android_library(
-    name = "orchestrator",
-    srcs = glob(["**/*.java"]),
-    idl_srcs = glob(["**/*.aidl"]),
-    visibility = [
-        ":export",
-    ],
-    deps = [
-        "//:androidx_annotation",
-        "//:androidx_core",
-        "//:androidx_legacy_support_v4",
-        "//runner/android_junit_runner",
-        "//services/shellexecutor:exec_client",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-        "@maven//:net_sf_kxml_kxml2",
-    ],
-)
-
-# Do not link to these targets directly, rely on exporting target instead
-package_group(
-    name = "export",
-    packages = [
-        "//runner/android_test_orchestrator",
-        "//runner/android_test_orchestrator/stubapp",
-    ],
-)
-
-filegroup(
-    name = "orchestrator_src",
-    srcs = [
-        ":liborchestrator-src.jar",
-    ],
-    visibility = [
-        ":export",
-    ],
-)
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/CallbackLogic.java b/runner/android_test_orchestrator/java/androidx/test/orchestrator/CallbackLogic.java
index 0ba702f48..02e393f5a 100644
--- a/runner/android_test_orchestrator/java/androidx/test/orchestrator/CallbackLogic.java
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/CallbackLogic.java
@@ -16,18 +16,19 @@
 
 package androidx.test.orchestrator;
 
+import static androidx.test.internal.util.Checks.checkNotNull;
+import static androidx.test.internal.util.Checks.checkState;
+
 import android.os.Bundle;
 import androidx.test.orchestrator.callback.OrchestratorCallback;
 import androidx.test.orchestrator.listeners.OrchestrationListenerManager;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /** Encapsulates all the logic for receiving callbacks from the app under test. */
 class CallbackLogic extends OrchestratorCallback.Stub {
   private static final String TAG = "CallbackLogic";
-  private static final Splitter CLASS_METHOD_SPLITTER = Splitter.on('#');
 
   private final List<String> listOfTests = new ArrayList<>();
   private final Object testLock = new Object();
@@ -38,7 +39,7 @@ class CallbackLogic extends OrchestratorCallback.Stub {
   @Override
   public void addTest(String test) {
     synchronized (testLock) {
-      List<String> classAndMethod = CLASS_METHOD_SPLITTER.splitToList(test);
+      List<String> classAndMethod = Arrays.asList(test.split("#"));
       if (classAndMethod.size() > 1
           && (classAndMethod.get(1).isEmpty() || classAndMethod.get(1).equals("null"))) {
         listOfTests.add(classAndMethod.get(0));
@@ -51,8 +52,7 @@ public void addTest(String test) {
   @Override
   public void sendTestNotification(Bundle bundle) {
     synchronized (testLock) {
-      Preconditions.checkNotNull(
-          listenerManager, "Unable to process test notification. No ListenerManager");
+      checkNotNull(listenerManager, "Unable to process test notification. No ListenerManager");
       listenerManager.handleNotification(bundle);
     }
   }
@@ -65,8 +65,8 @@ List<String> provideCollectedTests() {
 
   void setListenerManager(OrchestrationListenerManager mListenerManager) {
     synchronized (testLock) {
-      Preconditions.checkState(null == this.listenerManager, "Listener manager assigned twice.");
-      this.listenerManager = Preconditions.checkNotNull(mListenerManager, "Listener manager null");
+      checkState(null == this.listenerManager, "Listener manager assigned twice.");
+      this.listenerManager = checkNotNull(mListenerManager, "Listener manager null");
     }
   }
 }
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/OrchestratorConstants.java b/runner/android_test_orchestrator/java/androidx/test/orchestrator/OrchestratorConstants.java
index f8e7475f3..7444c2bd5 100644
--- a/runner/android_test_orchestrator/java/androidx/test/orchestrator/OrchestratorConstants.java
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/OrchestratorConstants.java
@@ -30,6 +30,11 @@ final class OrchestratorConstants {
   static final String AJUR_COVERAGE = "coverage";
   static final String AJUR_COVERAGE_FILE = "coverageFile";
 
+  // Holds a comma separated listed of args that will be passed to the instrumentation invocation
+  // directly.
+  static final String ORCHESTRATOR_FORWARDED_INSTRUMENTATION_ARGS =
+      "orchestratorInstrumentationArgs";
+
   private OrchestratorConstants() {
     // Do not initialize
   }
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/TestRunnable.java b/runner/android_test_orchestrator/java/androidx/test/orchestrator/TestRunnable.java
index ce131b129..6e875c1c5 100644
--- a/runner/android_test_orchestrator/java/androidx/test/orchestrator/TestRunnable.java
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/TestRunnable.java
@@ -18,20 +18,23 @@
 import static androidx.test.orchestrator.OrchestratorConstants.AJUR_CLASS_ARGUMENT;
 import static androidx.test.orchestrator.OrchestratorConstants.AJUR_LIST_TESTS_ARGUMENT;
 import static androidx.test.orchestrator.OrchestratorConstants.ISOLATED_ARGUMENT;
+import static androidx.test.orchestrator.OrchestratorConstants.ORCHESTRATOR_FORWARDED_INSTRUMENTATION_ARGS;
 import static androidx.test.orchestrator.OrchestratorConstants.TARGET_INSTRUMENTATION_ARGUMENT;
 
 import android.content.Context;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.services.shellexecutor.ClientNotConnected;
-import androidx.test.services.shellexecutor.ShellExecutorImpl;
-import com.google.common.io.ByteStreams;
+import androidx.test.services.shellexecutor.ShellExecutorFactory;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /** Runnable to run a single am instrument command to execute a single test. */
@@ -54,7 +57,7 @@ public class TestRunnable implements Runnable {
    * @param secret A string representing the speakeasy binder key
    * @param arguments contains arguments to be passed to the target instrumentation
    * @param outputStream the stream to write the results of the test process
-   * @param listener, a callback listener to know when the run has completed
+   * @param listener a callback listener to know when the run has completed
    */
   public static TestRunnable legacyTestRunnable(
       Context context,
@@ -72,7 +75,7 @@ public static TestRunnable legacyTestRunnable(
    * @param secret A string representing the speakeasy binder key
    * @param arguments contains arguments to be passed to the target instrumentation
    * @param outputStream the stream to write the results of the test process
-   * @param listener, a callback listener to know when the run has completed
+   * @param listener a callback listener to know when the run has completed
    * @param test contains a specific test#method to run. Will override whatever is specified in the
    *     bundle.
    */
@@ -93,7 +96,7 @@ public static TestRunnable singleTestRunnable(
    * @param secret A string representing the speakeasy binder key
    * @param arguments contains arguments to be passed to the target instrumentation
    * @param outputStream the stream to write the results of the test process
-   * @param listener, a callback listener to know when the run has completed
+   * @param listener a callback listener to know when the run has completed
    */
   public static TestRunnable testCollectionRunnable(
       Context context,
@@ -133,7 +136,7 @@ public void run() {
       InputStream inputStream =
           runShellCommand(buildShellParams(getTargetInstrumentationArguments()));
       try {
-        ByteStreams.copy(inputStream, outputStream);
+        transferInputToOutputStream(inputStream, outputStream);
       } finally {
         if (inputStream != null) {
           inputStream.close();
@@ -155,6 +158,19 @@ public void run() {
     listener.runFinished();
   }
 
+  private static void transferInputToOutputStream(InputStream is, OutputStream os)
+      throws IOException {
+    if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+      is.transferTo(os);
+    } else {
+      byte[] buf = new byte[8192];
+      int bytesRead = -1;
+      while ((bytesRead = is.read(buf)) >= 0) {
+        os.write(buf, 0, bytesRead);
+      }
+    }
+  }
+
   private String getTargetInstrumentation() {
     return arguments.getString(TARGET_INSTRUMENTATION_ARGUMENT);
   }
@@ -184,24 +200,55 @@ private Bundle getTargetInstrumentationArguments() {
     return targetArgs;
   }
 
+  /**
+   * Instrumentation params are delimited by comma, each param is stripped from leading and trailing
+   * whitespace. *
+   *
+   * <p>The order of the params are critical to the correctness here as we split up params that have
+   * whitespace (eg: key value) into two different params `key` and `value` which means that those
+   * two different params must be next to each other the entire time.
+   */
+  private List<String> getInstrumentationParamsAndRemoveBundleArgs(Bundle arguments) {
+    List<String> cleanedParams = new ArrayList<>();
+    String forwardedArgs = arguments.getString(ORCHESTRATOR_FORWARDED_INSTRUMENTATION_ARGS);
+    if (forwardedArgs != null) {
+      for (String param : forwardedArgs.split(",")) {
+        // The instrumentation code within the Android Platform was not designed to deal
+        // with whitespace in the arguments. The options parsing logic:
+        // https://cs.android.com/android/platform/superproject/main/+/main:frameworks/base/cmds/am/src/com/android/commands/am/Am.java;l=160-204;drc=61197364367c9e404c7da6900658f1b16c42d0da;bpv=0;bpt=0?q=am.java&ss=android%2Fplatform%2Fsuperproject%2Fmain
+        // uses `opt.equal("--key")` which assumes that each individual key will live
+        // in its separate string. However, if we start sending strings like "--key value" then
+        // options parsing will fail. The problem here is that this termination is very subtle.
+        // as the instrumentation does not report to logcat, but to System.err which can sometimes
+        // buffer the error and silently drop it on process exit.
+        Collections.addAll(cleanedParams, param.strip().split(" "));
+      }
+      arguments.remove(ORCHESTRATOR_FORWARDED_INSTRUMENTATION_ARGS);
+    }
+    return cleanedParams;
+  }
+
   private List<String> buildShellParams(Bundle arguments) throws IOException, ClientNotConnected {
     List<String> params = new ArrayList<>();
     params.add("instrument");
     params.add("-w");
     params.add("-r");
 
+    params.addAll(getInstrumentationParamsAndRemoveBundleArgs(arguments));
+
     for (String key : arguments.keySet()) {
       params.add("-e");
       params.add(key);
       params.add(arguments.getString(key));
     }
     params.add(getTargetInstrumentation());
-
     return params;
   }
 
   InputStream runShellCommand(List<String> params)
       throws IOException, ClientNotConnected, InterruptedException, RemoteException {
-    return new ShellExecutorImpl(context, secret).executeShellCommand("am", params, null, false);
+    return new ShellExecutorFactory(context, secret)
+        .create()
+        .executeShellCommand("am", params, null, false);
   }
 }
diff --git a/runner/android_test_orchestrator/java/androidx/test/orchestrator/listeners/result/BUILD b/runner/android_test_orchestrator/java/androidx/test/orchestrator/listeners/result/BUILD
new file mode 100644
index 000000000..a8f414f43
--- /dev/null
+++ b/runner/android_test_orchestrator/java/androidx/test/orchestrator/listeners/result/BUILD
@@ -0,0 +1,13 @@
+# Description:
+#  Test results library of common IDE libraries for use with the Android Studio/Build Blaze integration.
+#  Copied from com.android.ddmlib.testrunner libraries.
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# TODO: move this elsewhere
+exports_files(["LICENSE"])
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidManifest.xml b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidManifest.xml
deleted file mode 100644
index ca41278a2..000000000
--- a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidManifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest
-    package="androidx.test.orchestrator.tests"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="28"/>
-
-    <application android:label="AndroidJUnitRunner" android:directBootAware="true">
-        <uses-library android:name="android.test.runner"/>
-    </application>
-
-    <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="androidx.test.orchestrator.tests">
-    </instrumentation>
-
-</manifest>
-
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidTestOrchestratorTest.java b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidTestOrchestratorTest.java
index cab7df93f..892d0fc9e 100644
--- a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidTestOrchestratorTest.java
+++ b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/AndroidTestOrchestratorTest.java
@@ -16,7 +16,9 @@
 package androidx.test.orchestrator;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Test;
@@ -44,4 +46,44 @@ public void testSingleMethodTest_blankInput() {
     assertThat(AndroidTestOrchestrator.isSingleMethodTest(null), is(false));
     assertThat(AndroidTestOrchestrator.isSingleMethodTest(""), is(false));
   }
+
+  @Test
+  public void testMakeValidFilename_notTooLong() {
+    final int maxLength = 20;
+
+    assertThat(
+        // len("hello_world") = 11, with ".txt" appended it's still way below maxLength
+        AndroidTestOrchestrator.makeValidFilename("hello_world", maxLength), is("hello_world.txt"));
+  }
+
+  @Test
+  public void testMakeValidFilename_equalToMaxLength() {
+    final int maxLength = 20;
+
+    assertThat(
+        // len("hello_world_abcd") = 16, with ".txt" appended it's equal to maxLength
+        AndroidTestOrchestrator.makeValidFilename("hello_world_abcd", maxLength),
+        is("hello_world_abcd.txt"));
+  }
+
+  @Test
+  public void testMakeValidFilename_differrentWhenTooLong() {
+    final int maxLength = 20;
+
+    // len() of both of these is 18, with ".txt" appended they exceed maxLength
+    String filename1 = AndroidTestOrchestrator.makeValidFilename("hello_world_abcdef", maxLength);
+    String filename2 = AndroidTestOrchestrator.makeValidFilename("hello_world_ghijkl", maxLength);
+    assertThat(filename1, is(not(equalTo(filename2))));
+  }
+
+  @Test
+  public void testMakeValidFilename_tooLong() {
+    final int maxLength = 20;
+
+    assertThat(
+        // len("hello_world_abcde") is 17, with ".txt" appended it exceeds maxLength
+        AndroidTestOrchestrator.makeValidFilename("hello_world_abcde", maxLength),
+        // hash code of "hello_world_abcde" is "889cc989"
+        is("hello_wo889cc989.txt"));
+  }
 }
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD
new file mode 100644
index 000000000..fd4db0ece
--- /dev/null
+++ b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD
@@ -0,0 +1,62 @@
+# Description: Odo tests.
+
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "AndroidTestOrchestratorTest",
+    size = "small",
+    srcs = [
+        "AndroidTestOrchestratorTest.java",
+    ],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//ext/junit",
+        "//runner/android_test_orchestrator",
+        "@maven//:com_google_guava_guava",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestCoverageTest",
+    size = "small",
+    srcs = [
+        "TestCoverageTest.java",
+    ],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//ext/junit",
+        "//runner/android_test_orchestrator",
+        "@maven//:com_google_guava_guava",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRunnableTest",
+    size = "small",
+    srcs = [
+        "TestRunnableTest.java",
+    ],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//ext/junit",
+        "//runner/android_test_orchestrator",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD.bazel b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD.bazel
deleted file mode 100644
index 4322c7a03..000000000
--- a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/BUILD.bazel
+++ /dev/null
@@ -1,32 +0,0 @@
-# Description: Ato tests.
-
-load(
-    "//build_extensions:android_library_instrumentation_tests.bzl",
-    "android_library_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-android_library_instrumentation_tests(
-    name = "unit_tests",
-    srcs = [
-        "AndroidTestOrchestratorTest.java",
-        "TestCoverageTest.java",
-        "TestRunnableTest.java",
-    ],
-    target_devices = devices(),
-    deps = [
-        "//core/java/androidx/test/core",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/android_test_orchestrator",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-# omit tests for RuntimePermissionsIntegrationTest for now, since it requires
-# api >= 24
-# "RuntimePermissionsIntegrationTest.java",
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/RuntimePermissionsIntegrationTest.java b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/RuntimePermissionsIntegrationTest.java
deleted file mode 100644
index f0b3d2632..000000000
--- a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/RuntimePermissionsIntegrationTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.orchestrator;
-
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-
-import android.Manifest.permission;
-import android.content.pm.PackageManager;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.MediumTest;
-import androidx.test.filters.SdkSuppress;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/** Integration tests for {@link AndroidTestOrchestrator} runtime permission handling */
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class RuntimePermissionsIntegrationTest {
-
-  private static final String ORCHESTRATOR_PACKAGE = "androidx.test.orchestrator";
-
-  @Test
-  @SdkSuppress(minSdkVersion = 24)
-  public void verifyEssentialRuntimePermissionsAreGranted() {
-    assertThat(
-        getInstrumentation()
-            .getContext()
-            .getPackageManager()
-            .checkPermission(permission.READ_EXTERNAL_STORAGE, ORCHESTRATOR_PACKAGE),
-        equalTo(PackageManager.PERMISSION_GRANTED));
-    assertThat(
-        getInstrumentation()
-            .getContext()
-            .getPackageManager()
-            .checkPermission(permission.WRITE_EXTERNAL_STORAGE, ORCHESTRATOR_PACKAGE),
-        equalTo(PackageManager.PERMISSION_GRANTED));
-  }
-}
diff --git a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/TestRunnableTest.java b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/TestRunnableTest.java
index 52b8dd33e..4fd76e778 100644
--- a/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/TestRunnableTest.java
+++ b/runner/android_test_orchestrator/javatests/androidx/test/orchestrator/TestRunnableTest.java
@@ -16,6 +16,7 @@
 package androidx.test.orchestrator;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static com.google.common.truth.Truth.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.endsWith;
@@ -168,6 +169,77 @@ public void testRun_buildsParams_givenNullClassNameAndMethodForTestCollection()
         "-e class com.google.android.example.MyClass");
   }
 
+  @Test
+  public void testRun_buildsParams_givenInstrumentationParamsAreHandledCorrectlyWhenTrue() {
+    arguments.putString(
+        "orchestratorInstrumentationArgs", "--no-hidden-api-checks, --no-isolated-storage");
+    FakeListener listener = new FakeListener();
+    FakeTestRunnable runnable =
+        new FakeTestRunnable(context, "secret", arguments, outputStream, listener, null, true);
+    runnable.run();
+    assertContainsRunnerArgs(runnable.params, "-no-hidden-api-checks --no-isolated-storage");
+  }
+
+  @Test
+  public void testRun_buildsParams_givenInstrumentationParamsAreHandledCorrectlyWithSpace() {
+    arguments.putString(
+        "orchestratorInstrumentationArgs",
+        "--no-hidden-api-checks, --no-isolated-storage, --abi x86_64");
+    FakeListener listener = new FakeListener();
+    FakeTestRunnable runnable =
+        new FakeTestRunnable(context, "secret", arguments, outputStream, listener, null, true);
+    runnable.run();
+    assertContainsRunnerArgs(
+        runnable.params, "-no-hidden-api-checks --no-isolated-storage --abi x86_64");
+  }
+
+  @Test
+  public void testRun_buildsParams_givenInstrumentationParamsAreHandledCorrectlySingleParam() {
+    arguments.putString("orchestratorInstrumentationArgs", "--no-hidden-api-checks");
+    FakeListener listener = new FakeListener();
+    FakeTestRunnable runnable =
+        new FakeTestRunnable(context, "secret", arguments, outputStream, listener, null, true);
+    runnable.run();
+    assertContainsRunnerArgs(runnable.params, "--no-hidden-api-checks");
+  }
+
+  @Test
+  public void testRun_buildsParams_givenInstrumentationParamsAreSpaceDelimited() {
+    arguments.putString("orchestratorInstrumentationArgs", "--abi x86_64");
+    FakeListener listener = new FakeListener();
+    FakeTestRunnable runnable =
+        new FakeTestRunnable(context, "secret", arguments, outputStream, listener, null, true);
+    runnable.run();
+    assertThat(runnable.params).containsAtLeast("--abi", "x86_64").inOrder();
+  }
+
+  @Test
+  public void testRun_buildsParams_allowTestNamesWithSpace() {
+    FakeListener listener = new FakeListener();
+    FakeTestRunnable runnable =
+        new FakeTestRunnable(
+            context,
+            "secret",
+            arguments,
+            outputStream,
+            listener,
+            "com.google.android.example.MyClass#methodNameWith Space",
+            true);
+    runnable.run();
+    assertContainsRunnerArgs(
+        runnable.params, "-e class com.google.android.example.MyClass#methodNameWith Space");
+  }
+
+  @Test
+  public void testRun_buildsParams_givenInstrumentationParamsAreHandledCorrectlyMultipleParam() {
+    arguments.putString("orchestratorInstrumentationArgs", "--A,--B,--C,--key value");
+    FakeListener listener = new FakeListener();
+    FakeTestRunnable runnable =
+        new FakeTestRunnable(context, "secret", arguments, outputStream, listener, null, true);
+    runnable.run();
+    assertContainsRunnerArgs(runnable.params, "--A --B --C --key value");
+  }
+
   private static void assertContainsRunnerArgs(List<String> params, String... containsArgs) {
     String cmdArgs = Joiner.on(" ").join(params);
     assertThat(cmdArgs, startsWith("instrument -w -r"));
diff --git a/runner/android_test_orchestrator/stubapp/BUILD b/runner/android_test_orchestrator/stubapp/BUILD
new file mode 100644
index 000000000..a6bbfc55a
--- /dev/null
+++ b/runner/android_test_orchestrator/stubapp/BUILD
@@ -0,0 +1,44 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("//build_extensions:axt_versions.bzl", "ORCHESTRATOR_VERSION")
+load("//build_extensions/maven:axt_maven_apk.bzl", "axt_maven_apk")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = ["//:__subpackages__"],
+)
+
+# Dummy app to allow the On Device Orchestration to run and execute.
+android_binary(
+    name = "stubapp",
+    srcs = ["src/androidx/test/orchestrator/Orchestrator.java"],
+    custom_package = "androidx.test.orchestrator.stubapp",
+    manifest = "src/AndroidManifest.xml",
+    manifest_values = {
+        "appVersion": ORCHESTRATOR_VERSION,
+    },
+    proguard_specs = [
+        "//:proguard_binary.cfg",
+        "proguard_binary.cfg",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//runner/android_junit_runner",
+        "//runner/android_test_orchestrator",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_maven_apk(
+    name = "orchestrator_release_apk",
+    included_dep = ":stubapp",
+)
+
+maven_artifact(
+    name = "orchestrator_release_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":orchestrator_release_apk",
+)
diff --git a/runner/android_test_orchestrator/stubapp/BUILD.bazel b/runner/android_test_orchestrator/stubapp/BUILD.bazel
deleted file mode 100644
index 0884fadf2..000000000
--- a/runner/android_test_orchestrator/stubapp/BUILD.bazel
+++ /dev/null
@@ -1,44 +0,0 @@
-licenses(["notice"])
-
-package(
-    default_visibility = ["//:__subpackages__"],
-)
-
-# Dummy app to allow the On Device Orchestration to run and execute.
-android_binary(
-    name = "stubapp",
-    srcs = ["src/androidx/test/orchestrator/Orchestrator.java"],
-    custom_package = "androidx.test.orchestrator.stubapp",
-    manifest = "src/AndroidManifest.xml",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//runner/android_junit_runner",
-        "//runner/android_test_orchestrator",
-        "@maven//:com_google_guava_guava",
-        "@maven//:junit_junit",
-    ],
-)
-
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "RUNNER_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-combine_jars(
-    name = "orchestrator_src_jars",
-    srcs = [
-        "//runner/android_test_orchestrator/java/androidx/test/orchestrator:orchestrator_src",
-    ],
-)
-
-maven_artifact(
-    name = "orchestrator_release_maven_artifact",
-    src = ":stubapp.apk",
-    artifact_deps = [
-        "androidx.test.services:test-services:%s" % RUNNER_VERSION,
-    ],
-    artifact_id = "orchestrator",
-    group_id = "androidx.test",
-    last_updated = "20170622000000",
-    src_jar = ":orchestrator_src_jars.jar",
-    version = "%s" % RUNNER_VERSION,
-)
diff --git a/runner/android_test_orchestrator/stubapp/proguard_binary.cfg b/runner/android_test_orchestrator/stubapp/proguard_binary.cfg
index 5303b0a43..65d471184 100644
--- a/runner/android_test_orchestrator/stubapp/proguard_binary.cfg
+++ b/runner/android_test_orchestrator/stubapp/proguard_binary.cfg
@@ -7,4 +7,34 @@
 -keepnames class androidx.test.**
 
 # for 'library class android.test.* extends or implements program class'
--dontwarn android.test.**
\ No newline at end of file
+-dontwarn android.test.**
+
+# ServiceLoader support
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembers class kotlinx.coroutines.** {
+    volatile <fields>;
+}
+
+# Same story for the standard library's SafeContinuation that also uses AtomicReferenceFieldUpdater
+-keepclassmembers class kotlin.coroutines.SafeContinuation {
+    volatile <fields>;
+}
+
+# These classes are only required by kotlinx.coroutines.debug.AgentPremain, which is only loaded when
+# kotlinx-coroutines-core is used as a Java agent, so these are not needed in contexts where ProGuard is used.
+-dontwarn java.lang.instrument.ClassFileTransformer
+-dontwarn sun.misc.SignalHandler
+-dontwarn java.lang.instrument.Instrumentation
+-dontwarn sun.misc.Signal
+
+# Only used in `kotlinx.coroutines.internal.ExceptionsConstructor`.
+# The case when it is not available is hidden in a `try`-`catch`, as well as a check for Android.
+-dontwarn java.lang.ClassValue
+
+# An annotation used for build tooling, won't be directly accessed.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+
+-dontwarn kotlinx.coroutines.internal.ClassValueCtorCache
diff --git a/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml b/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml
index 0570264b1..7c20a80c7 100644
--- a/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml
+++ b/runner/android_test_orchestrator/stubapp/src/AndroidManifest.xml
@@ -16,7 +16,9 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.orchestrator">
+    package="androidx.test.orchestrator"
+    android:versionCode="1"
+    android:versionName="${appVersion}">
 
   <queries>
       <package android:name="androidx.test.services" />
@@ -33,7 +35,7 @@
   <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
   <uses-sdk
-      android:minSdkVersion="14"
+      android:minSdkVersion="23"
       android:targetSdkVersion="30" />
 
   <application android:directBootAware="true">
diff --git a/runner/monitor/BUILD b/runner/monitor/BUILD
new file mode 100644
index 000000000..1e5e3749d
--- /dev/null
+++ b/runner/monitor/BUILD
@@ -0,0 +1,17 @@
+# Publicly visible alias to the monitor target
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# This needs to be a java_library instead of an alias, so java_* based rules can reference it
+java_library(
+    name = "monitor",
+    visibility = ["//visibility:public"],
+    exports = ["//runner/monitor/java/androidx/test:monitor"],
+)
diff --git a/runner/monitor/BUILD.bazel b/runner/monitor/BUILD.bazel
deleted file mode 100644
index debc02fc6..000000000
--- a/runner/monitor/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-# Publicly visible alias to the monitor target
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "monitor",
-    visibility = ["//visibility:public"],
-    exports = ["//runner/monitor/java/androidx/test:monitor"],
-)
diff --git a/runner/monitor/CHANGELOG.md b/runner/monitor/CHANGELOG.md
new file mode 100644
index 000000000..81697fb4a
--- /dev/null
+++ b/runner/monitor/CHANGELOG.md
@@ -0,0 +1,17 @@
+### monitor {version} {:#monitor-{version}}
+
+{{date}}
+
+`androidx.test:monitor:{version}` is released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/runner/monitor/java/androidx/test/AndroidManifest.xml b/runner/monitor/java/androidx/test/AndroidManifest.xml
index 0d0b4612c..fbebbbcf8 100644
--- a/runner/monitor/java/androidx/test/AndroidManifest.xml
+++ b/runner/monitor/java/androidx/test/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.monitor" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/runner/monitor/java/androidx/test/BUILD b/runner/monitor/java/androidx/test/BUILD
new file mode 100644
index 000000000..b85bd8fa0
--- /dev/null
+++ b/runner/monitor/java/androidx/test/BUILD
@@ -0,0 +1,136 @@
+# Description: Build rules for building androidx.test from source
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# nearly all users should reference the equivalent target in //runner/monitor
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        ":allowlist",
+    ],
+)
+
+package_group(
+    name = "allowlist",
+    packages = [
+        "//...",
+    ],
+)
+
+licenses(["notice"])
+
+kt_android_library(
+    name = "monitor",
+    srcs = glob(
+        [
+            "**/*.java",
+            "**/*.kt",
+        ],
+        exclude = [
+            "internal/runner/runtime/ExposedInstrumentationApi.java",
+            "internal/runner/hidden/ExposedInstrumentationApi.java",
+            "internal/platform/app/ActivityInvoker$$CC.java",
+            "internal/platform/app/ActivityInvokerDesugar.java",
+        ],
+    ),
+    tags = ["alt_dep=//runner/monitor"],
+    deps = [
+        ":compiletime_hidden_apis",
+        ":errorprone_neverlink",
+        ":runtime_hidden_apis",
+        "//opensource/androidx:annotation",
+        "@maven//:androidx_tracing_tracing",
+    ],
+)
+
+# avoid the runtime dependency on errorprone
+java_library(
+    name = "errorprone_neverlink",
+    neverlink = 1,
+    exports = [
+        "@maven//:com_google_errorprone_error_prone_annotations",
+    ],
+)
+
+android_library(
+    name = "runtime_hidden_apis",
+    srcs = [
+        "internal/runner/runtime/ExposedInstrumentationApi.java",
+    ],
+    deps = ["//opensource/androidx:annotation"],
+)
+
+android_library(
+    name = "compiletime_hidden_apis",
+    srcs = [
+        "internal/runner/hidden/ExposedInstrumentationApi.java",
+    ],
+    neverlink = 1,
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
+
+# group of targets to use to produce release binary + docs
+android_library(
+    name = "monitor_release_lib",
+    srcs = [
+        # only needed for external release backwards compatibility
+        "internal/platform/app/ActivityInvoker$$CC.java",
+        "internal/platform/app/ActivityInvokerDesugar.java",
+    ],
+    custom_package = "androidx.test.monitor",
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [":proguard_library.cfg"],
+    visibility = ["//visibility:private"],
+    exports = [
+        ":monitor",
+    ],
+    deps = [
+        ":monitor",
+        "//opensource/androidx:annotation",
+    ],
+)
+
+axt_android_aar(
+    name = "monitor_aar",
+    # Unfortunately this legacy artifact doesn't follow standard class naming conventions.
+    # so we'll be more explicit in the expected packages list to catch new classes that don't follow
+    # expected package patterns
+    expected_class_prefixes = [
+        "androidx.test.InstrumentationRegistry",
+        "androidx.test.annotation.Beta",
+        "androidx.test.internal",
+        "androidx.test.platform",
+        "androidx.test.runner",
+    ],
+    included_dep = ":monitor_release_lib",
+    jarjar_rule = ":jarjar.txt",
+)
+
+maven_artifact(
+    name = "monitor_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":monitor_aar",
+)
+
+dackka_test(
+    name = "monitor_doc",
+    runtime_dep = ":monitor_release_lib",
+    src_jar = ":libmonitor-src.jar",
+)
+
+api_checks(
+    name = "monitor_api",
+    runtime_dep = ":monitor_release_lib",
+    # ideally we would use monitor_aar-src.jar here, but metalava complains
+    # about ExposedInstrumentationApi's package
+    src_jar = ":libmonitor-src.jar",
+)
diff --git a/runner/monitor/java/androidx/test/BUILD.bazel b/runner/monitor/java/androidx/test/BUILD.bazel
deleted file mode 100644
index 2cc95f410..000000000
--- a/runner/monitor/java/androidx/test/BUILD.bazel
+++ /dev/null
@@ -1,78 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_VERSION", "MONITOR_VERSION")
-
-# Description: Build rules for building androidx.test from source
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-android_library(
-    name = "monitor",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = [
-            "internal/runner/runtime/ExposedInstrumentationApi.java",
-            "internal/runner/hidden/ExposedInstrumentationApi.java",
-        ],
-    ),
-    deps = [
-        ":compiletime_hidden_apis",
-        ":runtime_hidden_apis",
-        "//:androidx_annotation",
-    ],
-)
-
-android_library(
-    name = "runtime_hidden_apis",
-    srcs = [
-        "internal/runner/runtime/ExposedInstrumentationApi.java",
-    ],
-)
-
-android_library(
-    name = "compiletime_hidden_apis",
-    srcs = [
-        "internal/runner/hidden/ExposedInstrumentationApi.java",
-    ],
-    neverlink = 1,
-)
-
-# group of targets to use to produce release binary + docs
-android_library(
-    name = "monitor_release_lib",
-    exports = [
-        ":monitor",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates three targets
-# genrule output: monitor_release_no_deps.jar and monitor_release.aar
-# a java_library target librunner_release_no_deps
-axt_release_lib(
-    name = "monitor_release",
-    custom_package = "androidx.test.monitor",
-    jarjar_rules = "release_jarjar_rules.txt",
-    keep_spec = "androidx/test",
-    proguard_library = ":proguard_library.cfg",
-    # remove the generated R class
-    remove_spec = "androidx/test/monitor/R[$$\\.]",
-    deps = [
-        ":monitor_release_lib",
-    ],
-)
-
-maven_artifact(
-    name = "monitor_maven_artifact",
-    src = ":monitor_release.aar",
-    artifact_deps = [
-        "androidx.annotation:annotation:%s" % ANDROIDX_VERSION,
-    ],
-    artifact_id = "monitor",
-    group_id = "androidx.test",
-    last_updated = "20170622000000",
-    src_jar = ":libmonitor-src.jar",
-    version = "%s" % MONITOR_VERSION,
-)
diff --git a/runner/monitor/java/androidx/test/InstrumentationRegistry.java b/runner/monitor/java/androidx/test/InstrumentationRegistry.java
index e6b480fda..cbcbed7bc 100644
--- a/runner/monitor/java/androidx/test/InstrumentationRegistry.java
+++ b/runner/monitor/java/androidx/test/InstrumentationRegistry.java
@@ -19,84 +19,109 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.os.Bundle;
+import com.google.errorprone.annotations.InlineMe;
 
 /**
  * An exposed registry instance that holds a reference to the instrumentation running in the process
- * and its arguments. Also provides an easy way for callers to get a hold of instrumentation,
- * application context and instrumentation arguments Bundle.
+ * and the instrumentation arguments. Provides an easy way for callers to get access to the
+ * instrumentation, application context, and instrumentation arguments bundle.
  *
- * @deprecated use {@link androidx.test.core.app.ApplicationProvider} or {@link
- *     androidx.test.platform.app.InstrumentationRegistry} instead
+ * @deprecated Use {@link androidx.test.platform.app.InstrumentationRegistry} or <code>
+ *     <a href="/reference/androidx/test/core/app/ApplicationProvider">
+ *     androidx.test.core.app.ApplicationProvider</a></code> instead.
  */
 @Deprecated
 public final class InstrumentationRegistry {
 
   /**
-   * Returns the instrumentation currently running. Use this to get an {@link Instrumentation} into
-   * your test.
+   * Returns the instrumentation currently running. Use this method to get an <code>
+   * <a href="/reference/android/app/Instrumentation">Instrumentation</a></code> into your test.
    *
-   * @throws IllegalStateException if instrumentation hasn't been registered
-   * @deprecated use {@link androidx.test.platform.app.InstrumentationRegistry#getInstrumentation()}
+   * @return The current instrumentation.
+   * @throws IllegalStateException If instrumentation hasn't been registered.
+   * @deprecated Use {@link androidx.test.platform.app.InstrumentationRegistry#getInstrumentation()
+   *     androidx.test.platform.app.InstrumentationRegistry#getInstrumentation()}.
    */
+  @InlineMe(replacement = "androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()")
   @Deprecated
   public static Instrumentation getInstrumentation() {
     return androidx.test.platform.app.InstrumentationRegistry.getInstrumentation();
   }
 
   /**
-   * Returns a copy of instrumentation arguments Bundle. Use this to get a {@link Bundle} containing
-   * the command line arguments passed to {@link Instrumentation} into your test.
+   * Returns a copy of the instrumentation arguments bundle. Use this method to get a <code>
+   * <a href="/reference/android/os/Bundle">Bundle</a></code> containing the command-line arguments
+   * passed to <code><a href="/reference/android/app/Instrumentation">Instrumentation</a></code>
+   * into your test.
    *
-   * <p>This Bundle is not guaranteed to be present under all instrumentations.
+   * <p>The bundle is not guaranteed to be present under all instrumentations.
    *
-   * @return Bundle the arguments for this instrumentation.
-   * @throws IllegalStateException if no argument Bundle has been registered.
-   * @deprecated use {@link androidx.test.platform.app.InstrumentationRegistry#getArguments()}
+   * @return The arguments bundle for this instrumentation.
+   * @throws IllegalStateException If no argument bundle has been registered.
+   * @deprecated Use {@link androidx.test.platform.app.InstrumentationRegistry#getArguments()
+   *     androidx.test.platform.app.InstrumentationRegistry#getArguments()}.
    */
+  @InlineMe(replacement = "androidx.test.platform.app.InstrumentationRegistry.getArguments()")
   @Deprecated
   public static Bundle getArguments() {
     return androidx.test.platform.app.InstrumentationRegistry.getArguments();
   }
 
   /**
-   * Return the Context of this instrumentation's package. Use this to get a {@link Context}
-   * representing {@link Instrumentation#getContext()} into your test.
+   * Returns the context of this instrumentation's package. Use this method to get a <code>
+   * <a href="/reference/android/content/Context">Context</a></code> representing <code>
+   * <a href="/reference/android/app/Instrumentation#getContext()">Instrumentation#getContext()</a>
+   * </code> into your test.
    *
-   * @deprecated In most scenarios, {@link
-   *     androidx.test.core.app.ApplicationProvider#getApplicationContext()} should be used instead
-   *     of the instrumentation test context. If you do need access to the test context for to
-   *     access its resources, it is recommended to use {@link
-   *     android.content.pm.PackageManager#getResourcesForApplication(String)} instead.
+   * @return The instrumentation context.
+   * @deprecated In most scenarios, <code>
+   *     <a href="/reference/androidx/test/core/app/ApplicationProvider#getApplicationContext()">
+   *     androidx.test.core.app.ApplicationProvider#getApplicationContext()</a></code> should be
+   *     used instead of the instrumentation test context. If you do need access to the test context
+   *     to access its resources, use <code>
+   *     <a href="/reference/android/content/pm/PackageManager#getResourcesForApplication(java.lang.String)">
+   *     android.content.pm.PackageManager#getResourcesForApplication(String)</a></code> instead.
    */
   @Deprecated
   public static Context getContext() {
-    return getInstrumentation().getContext();
+    return androidx.test.platform.app.InstrumentationRegistry.getInstrumentation().getContext();
   }
 
   /**
-   * Return a Context for the target application being instrumented. Use this to get a {@link
-   * Context} representing {@link Instrumentation#getTargetContext()} into your test.
+   * Returns a context for the target application being instrumented. Use this method to get a
+   * <code><a href="/reference/android/content/Context">Context</a></code> representing <code>
+   * <a href="/reference/android/app/Instrumentation#getTargetContext()">
+   * Instrumentation#getTargetContext()</a></code> into your test.
    *
-   * @deprecated use {@link androidx.test.core.app.ApplicationProvider#getApplicationContext()}
-   *     instead.
+   * @return The target application context.
+   * @deprecated Use <code>
+   *     <a href="/reference/androidx/test/core/app/ApplicationProvider#getApplicationContext()">
+   *     androidx.test.core.app.ApplicationProvider#getApplicationContext()</a></code>.
    */
   @Deprecated
   public static Context getTargetContext() {
-    return getInstrumentation().getTargetContext();
+    return androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()
+        .getTargetContext();
   }
 
   /**
    * Records/exposes the instrumentation currently running and stores a copy of the instrumentation
-   * arguments Bundle in the registry.
+   * arguments bundle in the registry.
    *
-   * <p>This is a global registry - so be aware of the impact of calling this method!
+   * <p>This is a global registry, so be aware of the impact of calling this method!
    *
-   * @param instrumentation the instrumentation currently running.
-   * @param arguments the arguments for this application. Null deregisters any existing arguments.
-   * @deprecated use {@link
+   * @param instrumentation The instrumentation currently running.
+   * @param arguments The arguments for this application. Null deregisters any existing arguments.
+   * @deprecated Use {@link
    *     androidx.test.platform.app.InstrumentationRegistry#registerInstance(Instrumentation,
-   *     Bundle)}
+   *     Bundle)
+   *     androidx.test.platform.app.InstrumentationRegistry#registerInstance(Instrumentation,
+   *     Bundle)}.
    */
+  @InlineMe(
+      replacement =
+          "androidx.test.platform.app.InstrumentationRegistry.registerInstance(instrumentation,"
+              + " arguments)")
   @Deprecated
   public static void registerInstance(Instrumentation instrumentation, Bundle arguments) {
     androidx.test.platform.app.InstrumentationRegistry.registerInstance(instrumentation, arguments);
diff --git a/runner/monitor/java/androidx/test/annotation/Beta.java b/runner/monitor/java/androidx/test/annotation/Beta.java
index 40f5614c1..31f34f833 100644
--- a/runner/monitor/java/androidx/test/annotation/Beta.java
+++ b/runner/monitor/java/androidx/test/annotation/Beta.java
@@ -28,7 +28,7 @@
  * annotation implies nothing about the quality or performance of the API in question, only the fact
  * that it is not "API-frozen."
  *
- * @deprecated Create a "@RequiresOptIn" annotation specific to the API instead
+ * @deprecated unused.
  */
 @Retention(RetentionPolicy.CLASS)
 @Target({
diff --git a/runner/monitor/java/androidx/test/annotation/ExperimentalDeviceInteraction.java b/runner/monitor/java/androidx/test/annotation/ExperimentalDeviceInteraction.java
deleted file mode 100644
index 3665b80b0..000000000
--- a/runner/monitor/java/androidx/test/annotation/ExperimentalDeviceInteraction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.annotation;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-
-import androidx.annotation.RequiresOptIn;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Annotation denoting that the DeviceInteraction APIs are experimental and require opt-in. */
-@Retention(RetentionPolicy.CLASS)
-@Target({TYPE, METHOD, CONSTRUCTOR, FIELD, PACKAGE})
-@RequiresOptIn()
-public @interface ExperimentalDeviceInteraction {}
diff --git a/runner/monitor/java/androidx/test/annotation/ExperimentalScreenshot.java b/runner/monitor/java/androidx/test/annotation/ExperimentalScreenshot.java
deleted file mode 100644
index 88df5c0ee..000000000
--- a/runner/monitor/java/androidx/test/annotation/ExperimentalScreenshot.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.annotation;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-
-import androidx.annotation.RequiresOptIn;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation denoting that the image capturing APIs library are experimental and require opt-in.
- */
-@Retention(RetentionPolicy.CLASS)
-@Target({TYPE, METHOD, CONSTRUCTOR, FIELD, PACKAGE})
-@RequiresOptIn()
-public @interface ExperimentalScreenshot {}
diff --git a/runner/monitor/java/androidx/test/api/1.4.0.txt b/runner/monitor/java/androidx/test/api/1.4.0.txt
new file mode 100644
index 000000000..824520630
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.4.0.txt
@@ -0,0 +1,192 @@
+package androidx.test {
+
+  public final deprecated class InstrumentationRegistry {
+    method public static deprecated android.os.Bundle getArguments();
+    method public static deprecated android.content.Context getContext();
+    method public static deprecated android.app.Instrumentation getInstrumentation();
+    method public static deprecated android.content.Context getTargetContext();
+    method public static deprecated void registerInstance(android.app.Instrumentation, android.os.Bundle);
+  }
+
+}
+
+package androidx.test.annotation {
+
+  public abstract class Beta implements java.lang.annotation.Annotation {
+  }
+
+}
+
+
+package androidx.test.platform {
+
+  public abstract interface TestFrameworkException {
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  public final class InstrumentationRegistry {
+    method public static android.os.Bundle getArguments();
+    method public static android.app.Instrumentation getInstrumentation();
+    method public static void registerInstance(android.app.Instrumentation, android.os.Bundle);
+  }
+
+}
+
+package androidx.test.platform.ui {
+
+  public class InjectEventSecurityException extends java.lang.Exception implements androidx.test.platform.TestFrameworkException {
+    ctor public InjectEventSecurityException(java.lang.String);
+    ctor public InjectEventSecurityException(java.lang.Throwable);
+    ctor public InjectEventSecurityException(java.lang.String, java.lang.Throwable);
+  }
+
+  public abstract interface UiController {
+    method public abstract boolean injectKeyEvent(android.view.KeyEvent) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public abstract boolean injectMotionEvent(android.view.MotionEvent) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public abstract boolean injectString(java.lang.String) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public abstract void loopMainThreadForAtLeast(long);
+    method public abstract void loopMainThreadUntilIdle();
+  }
+
+}
+
+
+package androidx.test.runner {
+
+
+  public class MonitoringInstrumentation extends androidx.test.internal.runner.hidden.ExposedInstrumentationApi {
+    ctor public MonitoringInstrumentation();
+    method protected void dumpThreadStateToOutputs(java.lang.String);
+    method protected java.lang.String getThreadState();
+    method protected void installMultidex();
+    method protected void installOldMultiDex(java.lang.Class<?>) throws java.lang.IllegalAccessException, java.lang.reflect.InvocationTargetException, java.lang.NoSuchMethodException;
+    method public void interceptActivityUsing(androidx.test.runner.intercepting.InterceptingActivityFactory);
+    method protected deprecated boolean isPrimaryInstrProcess(java.lang.String);
+    method protected final boolean isPrimaryInstrProcess();
+    method protected void restoreUncaughtExceptionHandler();
+    method protected final void setJsBridgeClassName(java.lang.String);
+    method protected boolean shouldWaitForActivitiesToComplete();
+    method protected void specifyDexMakerCacheProperty();
+    method public void useDefaultInterceptingActivityFactory();
+    method protected void waitForActivitiesToComplete();
+  }
+
+  public class MonitoringInstrumentation.ActivityFinisher implements java.lang.Runnable {
+    ctor public ActivityFinisher();
+    method public void run();
+  }
+
+  public class UsageTrackerFacilitator implements androidx.test.internal.runner.tracker.UsageTracker {
+    ctor public UsageTrackerFacilitator(androidx.test.internal.runner.RunnerArgs);
+    ctor public UsageTrackerFacilitator(boolean);
+    method public void registerUsageTracker(androidx.test.internal.runner.tracker.UsageTracker);
+    method public void sendUsages();
+    method public boolean shouldTrackUsage();
+    method public void trackUsage(java.lang.String, java.lang.String);
+  }
+
+}
+
+package androidx.test.runner.intent {
+
+  public abstract interface IntentCallback {
+    method public abstract void onIntentSent(android.content.Intent);
+  }
+
+  public abstract interface IntentMonitor {
+    method public abstract void addIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public abstract void removeIntentCallback(androidx.test.runner.intent.IntentCallback);
+  }
+
+  public final class IntentMonitorRegistry {
+    method public static androidx.test.runner.intent.IntentMonitor getInstance();
+    method public static void registerInstance(androidx.test.runner.intent.IntentMonitor);
+  }
+
+  public abstract interface IntentStubber {
+    method public abstract android.app.Instrumentation.ActivityResult getActivityResultForIntent(android.content.Intent);
+  }
+
+  public final class IntentStubberRegistry {
+    method public static androidx.test.runner.intent.IntentStubber getInstance();
+    method public static boolean isLoaded();
+    method public static void load(androidx.test.runner.intent.IntentStubber);
+    method public static synchronized void reset();
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public abstract interface InterceptingActivityFactory {
+    method public abstract android.app.Activity create(java.lang.ClassLoader, java.lang.String, android.content.Intent);
+    method public abstract boolean shouldIntercept(java.lang.ClassLoader, java.lang.String, android.content.Intent);
+  }
+
+  public abstract class SingleActivityFactory<T extends android.app.Activity> implements androidx.test.runner.intercepting.InterceptingActivityFactory {
+    ctor public SingleActivityFactory(java.lang.Class<T>);
+    method public final android.app.Activity create(java.lang.ClassLoader, java.lang.String, android.content.Intent);
+    method protected abstract T create(android.content.Intent);
+    method public final java.lang.Class<T> getActivityClassToIntercept();
+    method public final boolean shouldIntercept(java.lang.ClassLoader, java.lang.String, android.content.Intent);
+  }
+
+}
+
+package androidx.test.runner.lifecycle {
+
+  public abstract interface ActivityLifecycleCallback {
+    method public abstract void onActivityLifecycleChanged(android.app.Activity, androidx.test.runner.lifecycle.Stage);
+  }
+
+  public abstract interface ActivityLifecycleMonitor {
+    method public abstract void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback);
+    method public abstract java.util.Collection<android.app.Activity> getActivitiesInStage(androidx.test.runner.lifecycle.Stage);
+    method public abstract androidx.test.runner.lifecycle.Stage getLifecycleStageOf(android.app.Activity);
+    method public abstract void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback);
+  }
+
+  public final class ActivityLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ActivityLifecycleMonitor getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ActivityLifecycleMonitor);
+  }
+
+  public abstract interface ApplicationLifecycleCallback {
+    method public abstract void onApplicationLifecycleChanged(android.app.Application, androidx.test.runner.lifecycle.ApplicationStage);
+  }
+
+  public abstract interface ApplicationLifecycleMonitor {
+    method public abstract void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback);
+    method public abstract void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback);
+  }
+
+  public final class ApplicationLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ApplicationLifecycleMonitor getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ApplicationLifecycleMonitor);
+  }
+
+  public final class ApplicationStage extends java.lang.Enum {
+    method public static androidx.test.runner.lifecycle.ApplicationStage valueOf(java.lang.String);
+    method public static final androidx.test.runner.lifecycle.ApplicationStage[] values();
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage PRE_ON_CREATE;
+  }
+
+  public final class Stage extends java.lang.Enum {
+    method public static androidx.test.runner.lifecycle.Stage valueOf(java.lang.String);
+    method public static final androidx.test.runner.lifecycle.Stage[] values();
+    enum_constant public static final androidx.test.runner.lifecycle.Stage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage DESTROYED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PAUSED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PRE_ON_CREATE;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESTARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESUMED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STOPPED;
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.5.0_internal.txt b/runner/monitor/java/androidx/test/api/1.5.0_internal.txt
new file mode 100644
index 000000000..72bfe2823
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.5.0_internal.txt
@@ -0,0 +1,195 @@
+// Signature format: 3.0
+package androidx.test.internal.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ServiceLoaderWrapper {
+    method public static <T> java.util.List<T!>! loadService(Class<T!>!);
+    method public static <T> T! loadSingleService(Class<T!>!, androidx.test.internal.platform.ServiceLoaderWrapper.Factory<T!>!);
+    method public static <T> T! loadSingleServiceOrNull(Class<T!>!);
+  }
+
+  public static interface ServiceLoaderWrapper.Factory<T> {
+    method public T! create();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ThreadChecker {
+    method public void checkMainThread();
+    method public void checkNotMainThread();
+  }
+
+}
+
+package androidx.test.internal.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker {
+    method public void finishActivity(android.app.Activity!);
+    method public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity>!);
+    method public void pauseActivity(android.app.Activity!);
+    method public void recreateActivity(android.app.Activity!);
+    method public void resumeActivity(android.app.Activity!);
+    method public void startActivity(android.content.Intent!, android.os.Bundle?);
+    method public void startActivity(android.content.Intent!);
+    method public void stopActivity(android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ActivityLifecycleTimeout {
+    ctor public ActivityLifecycleTimeout();
+    method public static long getMillis();
+  }
+
+}
+
+package androidx.test.internal.platform.content {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface PermissionGranter {
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package androidx.test.internal.platform.os {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ControlledLooper {
+    method public void drainMainThreadUntilIdle();
+    method public void simulateWindowFocus(android.view.View!);
+    field public static final androidx.test.internal.platform.os.ControlledLooper! NO_OP_CONTROLLED_LOOPER;
+  }
+
+}
+
+package androidx.test.internal.platform.reflect {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionException extends java.lang.Exception {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveField<T> {
+    ctor public ReflectiveField(String!, String!);
+    method public T! get(Object!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod<T> {
+    ctor public ReflectiveMethod(String!, String!, Class<?>!...);
+    method public T! invoke(Object!, java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException;
+    method public T! invokeStatic(java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+}
+
+package androidx.test.internal.platform.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestOutputEmitter {
+    method public static boolean addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public static boolean captureWindowHierarchy(String!);
+    method public static void dumpThreadStates(String!);
+    method public static boolean takeScreenshot(String!);
+  }
+
+}
+
+package androidx.test.internal.runner {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class InstrumentationConnection {
+    method public java.util.Set<android.os.Messenger!>! getClientsForType(String!);
+    method public static androidx.test.internal.runner.InstrumentationConnection! getInstance();
+    method public void init(android.app.Instrumentation!, androidx.test.runner.MonitoringInstrumentation.ActivityFinisher!);
+    method public void registerClient(String!, android.os.Messenger!);
+    method public void requestRemoteInstancesActivityCleanup();
+    method public void terminate();
+    method public void unregisterClient(String!, android.os.Messenger!);
+    field public static final String BROADCAST_FILTER = "androidx.test.runner.InstrumentationConnection.event";
+  }
+
+}
+
+package androidx.test.internal.runner.intent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class IntentMonitorImpl implements androidx.test.runner.intent.IntentMonitor {
+    ctor public IntentMonitorImpl();
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void signalIntent(android.content.Intent!);
+  }
+
+}
+
+package androidx.test.internal.runner.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ActivityLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ActivityLifecycleMonitor {
+    ctor public ActivityLifecycleMonitorImpl();
+    ctor public ActivityLifecycleMonitorImpl(boolean);
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public void signalLifecycleChange(androidx.test.runner.lifecycle.Stage!, android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ApplicationLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ApplicationLifecycleMonitor {
+    ctor public ApplicationLifecycleMonitorImpl();
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void signalLifecycleChange(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+}
+
+package androidx.test.internal.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...);
+    method public static void checkMainThread();
+    method public static void checkNotMainThread();
+    method public static <T> T! checkNotNull(T!);
+    method public static <T> T! checkNotNull(T!, Object!);
+    method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...);
+    method public static void checkState(boolean);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil {
+    ctor public LogUtil();
+    method public static void logDebug(String!, String!, java.lang.Object!...);
+    method public static void logDebugWithProcess(String!, String!, java.lang.Object!...);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ParcelableIBinder implements android.os.Parcelable {
+    ctor public ParcelableIBinder(android.os.IBinder!);
+    ctor protected ParcelableIBinder(android.os.Parcel!);
+    method public int describeContents();
+    method public android.os.IBinder! getIBinder();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.internal.util.ParcelableIBinder!>! CREATOR;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil {
+    ctor @Deprecated public ReflectionUtil();
+    method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+    method @Deprecated public static Object! callStaticMethod(Class<?>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception {
+  }
+
+  @Deprecated public static class ReflectionUtil.ReflectionParams {
+    ctor @Deprecated public ReflectionUtil.ReflectionParams(Class<?>!, Object!);
+    method @Deprecated public static Class<?>![]! getTypes(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+    method @Deprecated public static Object![]! getValues(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+  }
+
+}
+
+package androidx.test.platform.view.inspector {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class WindowInspectorCompat {
+    method public static java.util.List<android.view.View!>! getGlobalWindowViews() throws androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class WindowInspectorCompat.ViewRetrievalException extends java.lang.Exception {
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.5.0_public.txt b/runner/monitor/java/androidx/test/api/1.5.0_public.txt
new file mode 100644
index 000000000..c08f45b58
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.5.0_public.txt
@@ -0,0 +1,185 @@
+// Signature format: 3.0
+package androidx.test {
+
+  @Deprecated public final class InstrumentationRegistry {
+    method @Deprecated public static android.os.Bundle! getArguments();
+    method @Deprecated public static android.content.Context! getContext();
+    method @Deprecated public static android.app.Instrumentation! getInstrumentation();
+    method @Deprecated public static android.content.Context! getTargetContext();
+    method @Deprecated public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.annotation {
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Beta {
+  }
+
+}
+
+package androidx.test.platform {
+
+  public interface TestFrameworkException {
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  public final class InstrumentationRegistry {
+    method public static android.os.Bundle! getArguments();
+    method public static android.app.Instrumentation! getInstrumentation();
+    method public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.platform.graphics {
+
+  public class HardwareRendererCompat {
+    method public static boolean isDrawingEnabled();
+    method public static void setDrawingEnabled(boolean);
+  }
+
+}
+
+package androidx.test.platform.ui {
+
+  public class InjectEventSecurityException extends java.lang.Exception implements androidx.test.platform.TestFrameworkException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(Throwable!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+}
+
+package androidx.test.runner {
+
+  public class MonitoringInstrumentation extends androidx.test.internal.runner.hidden.ExposedInstrumentationApi {
+    ctor public MonitoringInstrumentation();
+    method protected void dumpThreadStateToOutputs(String!);
+    method public void execStartActivities(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent![]!, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, String!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!, android.os.UserHandle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Fragment!, android.content.Intent!, int, android.os.Bundle!);
+    method protected String! getThreadState();
+    method protected void installMultidex();
+    method protected void installOldMultiDex(Class<?>!) throws java.lang.IllegalAccessException, java.lang.reflect.InvocationTargetException, java.lang.NoSuchMethodException;
+    method public void interceptActivityUsing(androidx.test.runner.intercepting.InterceptingActivityFactory!);
+    method @Deprecated protected boolean isPrimaryInstrProcess(String?);
+    method protected final boolean isPrimaryInstrProcess();
+    method protected void restoreUncaughtExceptionHandler();
+    method protected final void setJsBridgeClassName(String!);
+    method protected boolean shouldWaitForActivitiesToComplete();
+    method protected void specifyDexMakerCacheProperty();
+    method protected Throwable! unwrapException(Throwable!);
+    method public void useDefaultInterceptingActivityFactory();
+    method protected void waitForActivitiesToComplete();
+  }
+
+  public class MonitoringInstrumentation.ActivityFinisher implements java.lang.Runnable {
+    ctor public MonitoringInstrumentation.ActivityFinisher();
+    method public void run();
+  }
+
+}
+
+package androidx.test.runner.intent {
+
+  public interface IntentCallback {
+    method public void onIntentSent(android.content.Intent!);
+  }
+
+  public interface IntentMonitor {
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback!);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback!);
+  }
+
+  public final class IntentMonitorRegistry {
+    method public static androidx.test.runner.intent.IntentMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.intent.IntentMonitor!);
+  }
+
+  public interface IntentStubber {
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+  }
+
+  public final class IntentStubberRegistry {
+    method public static androidx.test.runner.intent.IntentStubber! getInstance();
+    method public static boolean isLoaded();
+    method public static void load(androidx.test.runner.intent.IntentStubber!);
+    method public static void reset();
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public interface InterceptingActivityFactory {
+    method public android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method public boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.lifecycle {
+
+  public interface ActivityLifecycleCallback {
+    method public void onActivityLifecycleChanged(android.app.Activity!, androidx.test.runner.lifecycle.Stage!);
+  }
+
+  public interface ActivityLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+  }
+
+  public final class ActivityLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ActivityLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public interface ApplicationLifecycleCallback {
+    method public void onApplicationLifecycleChanged(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+  public interface ApplicationLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+  }
+
+  public final class ApplicationLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ApplicationLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ApplicationLifecycleMonitor!);
+  }
+
+  public enum ApplicationStage {
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage PRE_ON_CREATE;
+  }
+
+  public enum Stage {
+    enum_constant public static final androidx.test.runner.lifecycle.Stage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage DESTROYED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PAUSED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PRE_ON_CREATE;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESTARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESUMED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STOPPED;
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.6.0_internal.txt b/runner/monitor/java/androidx/test/api/1.6.0_internal.txt
new file mode 100644
index 000000000..aa3c57e03
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.6.0_internal.txt
@@ -0,0 +1,210 @@
+// Signature format: 3.0
+package androidx.test.internal.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ServiceLoaderWrapper {
+    method public static <T> java.util.List<T!>! loadService(Class<T!>!);
+    method public static <T> T! loadSingleService(Class<T!>!, androidx.test.internal.platform.ServiceLoaderWrapper.Factory<T!>!);
+    method public static <T> T! loadSingleServiceOrNull(Class<T!>!);
+  }
+
+  public static interface ServiceLoaderWrapper.Factory<T> {
+    method public T! create();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ThreadChecker {
+    method public void checkMainThread();
+    method public void checkNotMainThread();
+  }
+
+}
+
+package androidx.test.internal.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker {
+    method public void finishActivity(android.app.Activity!);
+    method public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity>!);
+    method public void pauseActivity(android.app.Activity!);
+    method public void recreateActivity(android.app.Activity!);
+    method public void resumeActivity(android.app.Activity!);
+    method public void startActivity(android.content.Intent!, android.os.Bundle?);
+    method public void startActivity(android.content.Intent!);
+    method public void startActivityForResult(android.content.Intent!, android.os.Bundle?);
+    method public void startActivityForResult(android.content.Intent!);
+    method public void stopActivity(android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ActivityLifecycleTimeout {
+    ctor public ActivityLifecycleTimeout();
+    method public static long getMillis();
+  }
+
+}
+
+package androidx.test.internal.platform.content {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface PermissionGranter {
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package androidx.test.internal.platform.os {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ControlledLooper {
+    method public void drainMainThreadUntilIdle();
+    method public void simulateWindowFocus(android.view.View!);
+    field public static final androidx.test.internal.platform.os.ControlledLooper! NO_OP_CONTROLLED_LOOPER;
+  }
+
+}
+
+package androidx.test.internal.platform.reflect {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionException extends java.lang.Exception {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveField<T> {
+    ctor public ReflectiveField(String!, String!);
+    method public T! get(Object!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod<T> {
+    ctor public ReflectiveMethod(String!, String!, Class<?>!...);
+    method public T! invoke(Object!, java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException;
+    method public T! invokeStatic(java.lang.Object!...) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+}
+
+package androidx.test.internal.platform.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestOutputEmitter {
+    method public static boolean addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public static boolean captureWindowHierarchy(String!);
+    method public static void dumpThreadStates(String!);
+    method public static boolean takeScreenshot(String!);
+  }
+
+}
+
+package androidx.test.internal.runner {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class InstrumentationConnection {
+    method public java.util.Set<android.os.Messenger!>! getClientsForType(String!);
+    method public static androidx.test.internal.runner.InstrumentationConnection! getInstance();
+    method public void init(android.app.Instrumentation!, androidx.test.runner.MonitoringInstrumentation.ActivityFinisher!);
+    method public void registerClient(String!, android.os.Messenger!);
+    method public void requestRemoteInstancesActivityCleanup();
+    method public void terminate();
+    method public void unregisterClient(String!, android.os.Messenger!);
+    field public static final String BROADCAST_FILTER = "androidx.test.runner.InstrumentationConnection.event";
+  }
+
+}
+
+package androidx.test.internal.runner.intent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class IntentMonitorImpl implements androidx.test.runner.intent.IntentMonitor {
+    ctor public IntentMonitorImpl();
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void signalIntent(android.content.Intent!);
+  }
+
+}
+
+package androidx.test.internal.runner.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ActivityLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ActivityLifecycleMonitor {
+    ctor public ActivityLifecycleMonitorImpl();
+    ctor public ActivityLifecycleMonitorImpl(boolean);
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public void signalLifecycleChange(androidx.test.runner.lifecycle.Stage!, android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ApplicationLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ApplicationLifecycleMonitor {
+    ctor public ApplicationLifecycleMonitorImpl();
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void signalLifecycleChange(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+}
+
+package androidx.test.internal.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...);
+    method public static void checkMainThread();
+    method public static void checkNotMainThread();
+    method public static <T> T! checkNotNull(T!);
+    method public static <T> T! checkNotNull(T!, Object!);
+    method public static <T> T! checkNotNull(T!, String!, java.lang.Object!...);
+    method public static void checkState(boolean);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil {
+    ctor public LogUtil();
+    method public static void logDebug(String!, String!, java.lang.Object!...);
+    method public static void logDebugWithProcess(String!, String!, java.lang.Object!...);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ParcelableIBinder implements android.os.Parcelable {
+    ctor public ParcelableIBinder(android.os.IBinder!);
+    ctor protected ParcelableIBinder(android.os.Parcel!);
+    method public int describeContents();
+    method public android.os.IBinder! getIBinder();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.internal.util.ParcelableIBinder!>! CREATOR;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil {
+    ctor @Deprecated public ReflectionUtil();
+    method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+    method @Deprecated public static Object! callStaticMethod(Class<?>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception {
+  }
+
+  @Deprecated public static class ReflectionUtil.ReflectionParams {
+    ctor @Deprecated public ReflectionUtil.ReflectionParams(Class<?>!, Object!);
+    method @Deprecated public static Class<?>![]! getTypes(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+    method @Deprecated public static Object![]! getValues(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+  }
+
+}
+
+package androidx.test.platform.tracing {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @androidx.test.annotation.ExperimentalTestApi public interface Tracer {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @androidx.test.annotation.ExperimentalTestApi public static interface Tracer.Span extends java.io.Closeable {
+    method public androidx.test.platform.tracing.Tracer.Span beginChildSpan(String);
+    method public void close();
+  }
+
+}
+
+package androidx.test.platform.view.inspector {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class WindowInspectorCompat {
+    method public static java.util.List<android.view.View!>! getGlobalWindowViews() throws androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class WindowInspectorCompat.ViewRetrievalException extends java.lang.Exception {
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.6.0_public.txt b/runner/monitor/java/androidx/test/api/1.6.0_public.txt
new file mode 100644
index 000000000..c08f45b58
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.6.0_public.txt
@@ -0,0 +1,185 @@
+// Signature format: 3.0
+package androidx.test {
+
+  @Deprecated public final class InstrumentationRegistry {
+    method @Deprecated public static android.os.Bundle! getArguments();
+    method @Deprecated public static android.content.Context! getContext();
+    method @Deprecated public static android.app.Instrumentation! getInstrumentation();
+    method @Deprecated public static android.content.Context! getTargetContext();
+    method @Deprecated public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.annotation {
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Beta {
+  }
+
+}
+
+package androidx.test.platform {
+
+  public interface TestFrameworkException {
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  public final class InstrumentationRegistry {
+    method public static android.os.Bundle! getArguments();
+    method public static android.app.Instrumentation! getInstrumentation();
+    method public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.platform.graphics {
+
+  public class HardwareRendererCompat {
+    method public static boolean isDrawingEnabled();
+    method public static void setDrawingEnabled(boolean);
+  }
+
+}
+
+package androidx.test.platform.ui {
+
+  public class InjectEventSecurityException extends java.lang.Exception implements androidx.test.platform.TestFrameworkException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(Throwable!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+}
+
+package androidx.test.runner {
+
+  public class MonitoringInstrumentation extends androidx.test.internal.runner.hidden.ExposedInstrumentationApi {
+    ctor public MonitoringInstrumentation();
+    method protected void dumpThreadStateToOutputs(String!);
+    method public void execStartActivities(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent![]!, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, String!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!, android.os.UserHandle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Fragment!, android.content.Intent!, int, android.os.Bundle!);
+    method protected String! getThreadState();
+    method protected void installMultidex();
+    method protected void installOldMultiDex(Class<?>!) throws java.lang.IllegalAccessException, java.lang.reflect.InvocationTargetException, java.lang.NoSuchMethodException;
+    method public void interceptActivityUsing(androidx.test.runner.intercepting.InterceptingActivityFactory!);
+    method @Deprecated protected boolean isPrimaryInstrProcess(String?);
+    method protected final boolean isPrimaryInstrProcess();
+    method protected void restoreUncaughtExceptionHandler();
+    method protected final void setJsBridgeClassName(String!);
+    method protected boolean shouldWaitForActivitiesToComplete();
+    method protected void specifyDexMakerCacheProperty();
+    method protected Throwable! unwrapException(Throwable!);
+    method public void useDefaultInterceptingActivityFactory();
+    method protected void waitForActivitiesToComplete();
+  }
+
+  public class MonitoringInstrumentation.ActivityFinisher implements java.lang.Runnable {
+    ctor public MonitoringInstrumentation.ActivityFinisher();
+    method public void run();
+  }
+
+}
+
+package androidx.test.runner.intent {
+
+  public interface IntentCallback {
+    method public void onIntentSent(android.content.Intent!);
+  }
+
+  public interface IntentMonitor {
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback!);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback!);
+  }
+
+  public final class IntentMonitorRegistry {
+    method public static androidx.test.runner.intent.IntentMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.intent.IntentMonitor!);
+  }
+
+  public interface IntentStubber {
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+  }
+
+  public final class IntentStubberRegistry {
+    method public static androidx.test.runner.intent.IntentStubber! getInstance();
+    method public static boolean isLoaded();
+    method public static void load(androidx.test.runner.intent.IntentStubber!);
+    method public static void reset();
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  public interface InterceptingActivityFactory {
+    method public android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method public boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.lifecycle {
+
+  public interface ActivityLifecycleCallback {
+    method public void onActivityLifecycleChanged(android.app.Activity!, androidx.test.runner.lifecycle.Stage!);
+  }
+
+  public interface ActivityLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+  }
+
+  public final class ActivityLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ActivityLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public interface ApplicationLifecycleCallback {
+    method public void onApplicationLifecycleChanged(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+  public interface ApplicationLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+  }
+
+  public final class ApplicationLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ApplicationLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ApplicationLifecycleMonitor!);
+  }
+
+  public enum ApplicationStage {
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage PRE_ON_CREATE;
+  }
+
+  public enum Stage {
+    enum_constant public static final androidx.test.runner.lifecycle.Stage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage DESTROYED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PAUSED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PRE_ON_CREATE;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESTARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESUMED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STOPPED;
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.7.0_internal.txt b/runner/monitor/java/androidx/test/api/1.7.0_internal.txt
new file mode 100644
index 000000000..567e7e574
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.7.0_internal.txt
@@ -0,0 +1,269 @@
+// Signature format: 3.0
+package androidx.test.internal.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ServiceLoaderWrapper {
+    method public static <T> java.util.List<T!>! loadService(Class<T!>!);
+    method public static <T> T! loadSingleService(Class<T!>!, androidx.test.internal.platform.ServiceLoaderWrapper.Factory<T!>!);
+    method public static <T> T! loadSingleServiceOrNull(Class<T!>!);
+  }
+
+  public static interface ServiceLoaderWrapper.Factory<T> {
+    method public T! create();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ThreadChecker {
+    method public void checkMainThread();
+    method public void checkNotMainThread();
+  }
+
+}
+
+package androidx.test.internal.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker {
+    method public void finishActivity(android.app.Activity!);
+    method public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity!>!);
+    method public void pauseActivity(android.app.Activity!);
+    method public void recreateActivity(android.app.Activity!);
+    method public void resumeActivity(android.app.Activity!);
+    method public void startActivity(android.content.Intent!);
+    method public void startActivity(android.content.Intent!, android.os.Bundle?);
+    method public void startActivityForResult(android.content.Intent!);
+    method public void startActivityForResult(android.content.Intent!, android.os.Bundle?);
+    method public void stopActivity(android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ActivityLifecycleTimeout {
+    ctor public ActivityLifecycleTimeout();
+    method public static long getMillis();
+  }
+
+}
+
+package androidx.test.internal.platform.content {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface PermissionGranter {
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package androidx.test.internal.platform.os {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ControlledLooper {
+    method public default boolean areDrawCallbacksSupported();
+    method public void drainMainThreadUntilIdle();
+    method public void simulateWindowFocus(android.view.View!);
+    field public static final androidx.test.internal.platform.os.ControlledLooper! NO_OP_CONTROLLED_LOOPER;
+  }
+
+}
+
+package androidx.test.internal.platform.reflect {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionException extends java.lang.Exception {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveField<T> {
+    ctor public ReflectiveField(Class<?>!, String!);
+    ctor public ReflectiveField(String!, String!);
+    method public T! get(Object!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod<T> {
+    ctor public ReflectiveMethod(Class<?>!, String!, Class<?>!...!);
+    ctor public ReflectiveMethod(String!, String!, Class<?>!...!);
+    method public T! invoke(Object!, java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
+    method public T! invokeStatic(java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+}
+
+package androidx.test.internal.platform.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestOutputEmitter {
+    method public static boolean addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public static boolean captureWindowHierarchy(String!);
+    method public static void dumpThreadStates(String!);
+    method public static boolean takeScreenshot(String!);
+  }
+
+}
+
+package androidx.test.internal.runner {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class InstrumentationConnection {
+    method public java.util.Set<android.os.Messenger!>! getClientsForType(String!);
+    method public static androidx.test.internal.runner.InstrumentationConnection! getInstance();
+    method public void init(android.app.Instrumentation!, androidx.test.runner.MonitoringInstrumentation.ActivityFinisher!);
+    method public void registerClient(String!, android.os.Messenger!);
+    method public void requestRemoteInstancesActivityCleanup();
+    method public void terminate();
+    method public void unregisterClient(String!, android.os.Messenger!);
+    field public static final String BROADCAST_FILTER = "androidx.test.runner.InstrumentationConnection.event";
+  }
+
+}
+
+package androidx.test.internal.runner.intent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class IntentMonitorImpl implements androidx.test.runner.intent.IntentMonitor {
+    ctor public IntentMonitorImpl();
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void signalIntent(android.content.Intent!);
+  }
+
+}
+
+package androidx.test.internal.runner.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ActivityLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ActivityLifecycleMonitor {
+    ctor public ActivityLifecycleMonitorImpl();
+    ctor public ActivityLifecycleMonitorImpl(boolean);
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public void signalLifecycleChange(androidx.test.runner.lifecycle.Stage!, android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ApplicationLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ApplicationLifecycleMonitor {
+    ctor public ApplicationLifecycleMonitorImpl();
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void signalLifecycleChange(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+}
+
+package androidx.test.internal.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...!);
+    method public static void checkMainThread();
+    method public static void checkNotMainThread();
+    method public static <T> T checkNotNull(T!);
+    method public static <T> T checkNotNull(T!, Object!);
+    method public static <T> T checkNotNull(T!, String!, java.lang.Object!...!);
+    method public static void checkState(boolean);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil {
+    ctor public LogUtil();
+    method public static androidx.test.internal.util.LogUtil.Supplier! lazyArg(androidx.test.internal.util.LogUtil.Supplier!);
+    method public static void logDebug(String!, String!, java.lang.Object!...!);
+    method public static void logDebugWithProcess(String!, String!, java.lang.Object!...!);
+  }
+
+  public static interface LogUtil.Supplier {
+    method public String! get();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ParcelableIBinder implements android.os.Parcelable {
+    ctor public ParcelableIBinder(android.os.IBinder!);
+    ctor protected ParcelableIBinder(android.os.Parcel!);
+    method public int describeContents();
+    method public android.os.IBinder! getIBinder();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.internal.util.ParcelableIBinder!>! CREATOR;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil {
+    ctor @Deprecated public ReflectionUtil();
+    method @Deprecated public static Object! callStaticMethod(Class<?>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+    method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception {
+  }
+
+  @Deprecated public static class ReflectionUtil.ReflectionParams {
+    ctor @Deprecated public ReflectionUtil.ReflectionParams(Class<?>!, Object!);
+    method @Deprecated public static Class<?>![]! getTypes(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+    method @Deprecated public static Object![]! getValues(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AppComponentFactoryRegistry {
+    method public static android.app.AppComponentFactory? getAppComponentFactory();
+    method public static android.app.Activity? instantiateActivity(ClassLoader cl, String className, android.content.Intent? intent = null);
+    method public static android.app.Application? instantiateApplication(ClassLoader cl, String className);
+    method public static void setAppComponentFactory(android.app.AppComponentFactory?);
+    property public static final android.app.AppComponentFactory? appComponentFactory;
+  }
+
+}
+
+package androidx.test.platform.concurrent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public enum DirectExecutor implements java.util.concurrent.Executor {
+    method public void execute(Runnable!);
+    enum_constant public static final androidx.test.platform.concurrent.DirectExecutor INSTANCE;
+  }
+
+}
+
+package androidx.test.platform.io {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FileTestStorage implements androidx.test.platform.io.PlatformTestStorage {
+    ctor public FileTestStorage();
+    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public String! getInputArg(String!);
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
+    method public android.net.Uri! getInputFileUri(String);
+    method public android.net.Uri! getOutputFileUri(String);
+    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
+    method public boolean isTestStorageFilePath(String);
+    method public java.io.InputStream! openInputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!, boolean) throws java.io.FileNotFoundException;
+  }
+
+  public interface PlatformTestStorage {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default java.io.InputStream! openInternalInputFile(String!) throws java.io.FileNotFoundException;
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default java.io.OutputStream! openInternalOutputFile(String!) throws java.io.FileNotFoundException;
+  }
+
+}
+
+package androidx.test.platform.tracing {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface Tracer {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+  }
+
+  public static interface Tracer.Span extends java.io.Closeable {
+    method public androidx.test.platform.tracing.Tracer.Span beginChildSpan(String);
+    method public void close();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Tracing {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+    method public static androidx.test.platform.tracing.Tracing getInstance();
+    method public void registerTracer(androidx.test.platform.tracing.Tracer);
+    method public void unregisterTracer(androidx.test.platform.tracing.Tracer!);
+  }
+
+}
+
+package androidx.test.platform.view.inspector {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class WindowInspectorCompat {
+    method public static java.util.List<android.view.View!>! getGlobalWindowViews() throws androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class WindowInspectorCompat.ViewRetrievalException extends java.lang.Exception {
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.7.0_public.txt b/runner/monitor/java/androidx/test/api/1.7.0_public.txt
new file mode 100644
index 000000000..8a6b0ea13
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.7.0_public.txt
@@ -0,0 +1,226 @@
+// Signature format: 3.0
+package androidx.test {
+
+  @Deprecated public final class InstrumentationRegistry {
+    method @Deprecated public static android.os.Bundle! getArguments();
+    method @Deprecated public static android.content.Context! getContext();
+    method @Deprecated public static android.app.Instrumentation! getInstrumentation();
+    method @Deprecated public static android.content.Context! getTargetContext();
+    method @Deprecated public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.annotation {
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Beta {
+  }
+
+}
+
+package androidx.test.platform {
+
+  public interface TestFrameworkException {
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  public final class InstrumentationRegistry {
+    method public static android.os.Bundle! getArguments();
+    method public static android.app.Instrumentation! getInstrumentation();
+    method public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.platform.device {
+
+  public interface DeviceController {
+    method public void setDeviceMode(int);
+    method public void setScreenOrientation(int);
+  }
+
+  public enum DeviceController.ScreenOrientation {
+    enum_constant public static final androidx.test.platform.device.DeviceController.ScreenOrientation LANDSCAPE;
+    enum_constant public static final androidx.test.platform.device.DeviceController.ScreenOrientation PORTRAIT;
+  }
+
+  public class UnsupportedDeviceOperationException extends java.lang.RuntimeException implements androidx.test.platform.TestFrameworkException {
+    ctor public UnsupportedDeviceOperationException(String!);
+    ctor public UnsupportedDeviceOperationException(String!, Throwable!);
+  }
+
+}
+
+package androidx.test.platform.graphics {
+
+  public class HardwareRendererCompat {
+    method public static boolean isDrawingEnabled();
+    method public static void setDrawingEnabled(boolean);
+  }
+
+}
+
+package androidx.test.platform.io {
+
+  public interface PlatformTestStorage {
+    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public String! getInputArg(String!);
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
+    method public android.net.Uri! getInputFileUri(String);
+    method public android.net.Uri! getOutputFileUri(String);
+    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
+    method public boolean isTestStorageFilePath(String);
+    method public java.io.InputStream! openInputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!, boolean) throws java.io.FileNotFoundException;
+  }
+
+  public final class PlatformTestStorageRegistry {
+    method public static androidx.test.platform.io.PlatformTestStorage! getInstance();
+    method public static void registerInstance(androidx.test.platform.io.PlatformTestStorage!);
+  }
+
+}
+
+package androidx.test.platform.ui {
+
+  public class InjectEventSecurityException extends java.lang.Exception implements androidx.test.platform.TestFrameworkException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+    ctor public InjectEventSecurityException(Throwable!);
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+}
+
+package androidx.test.runner {
+
+  public class MonitoringInstrumentation extends androidx.test.internal.runner.hidden.ExposedInstrumentationApi {
+    ctor public MonitoringInstrumentation();
+    method protected void dumpThreadStateToOutputs(String!);
+    method public void execStartActivities(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent![]!, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!, android.os.UserHandle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Fragment!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, String!, android.content.Intent!, int, android.os.Bundle!);
+    method protected String! getThreadState();
+    method protected void installMultidex();
+    method protected void installOldMultiDex(Class<?>!) throws java.lang.IllegalAccessException, java.lang.reflect.InvocationTargetException, java.lang.NoSuchMethodException;
+    method public void interceptActivityUsing(androidx.test.runner.intercepting.InterceptingActivityFactory!);
+    method protected final boolean isPrimaryInstrProcess();
+    method @Deprecated protected boolean isPrimaryInstrProcess(String?);
+    method protected void restoreUncaughtExceptionHandler();
+    method protected final void setJsBridgeClassName(String!);
+    method protected boolean shouldWaitForActivitiesToComplete();
+    method protected void specifyDexMakerCacheProperty();
+    method protected Throwable! unwrapException(Throwable!);
+    method public void useDefaultInterceptingActivityFactory();
+    method protected void waitForActivitiesToComplete();
+  }
+
+  public class MonitoringInstrumentation.ActivityFinisher implements java.lang.Runnable {
+    ctor public MonitoringInstrumentation.ActivityFinisher();
+    method public void run();
+  }
+
+}
+
+package androidx.test.runner.intent {
+
+  public interface IntentCallback {
+    method public void onIntentSent(android.content.Intent!);
+  }
+
+  public interface IntentMonitor {
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback!);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback!);
+  }
+
+  public final class IntentMonitorRegistry {
+    method public static androidx.test.runner.intent.IntentMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.intent.IntentMonitor!);
+  }
+
+  public interface IntentStubber {
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+  }
+
+  public final class IntentStubberRegistry {
+    method public static androidx.test.runner.intent.IntentStubber! getInstance();
+    method public static boolean isLoaded();
+    method public static void load(androidx.test.runner.intent.IntentStubber!);
+    method public static void reset();
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  @Deprecated public interface InterceptingActivityFactory {
+    method @Deprecated public android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method @Deprecated public boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.lifecycle {
+
+  public interface ActivityLifecycleCallback {
+    method public void onActivityLifecycleChanged(android.app.Activity!, androidx.test.runner.lifecycle.Stage!);
+  }
+
+  public interface ActivityLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+  }
+
+  public final class ActivityLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ActivityLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public interface ApplicationLifecycleCallback {
+    method public void onApplicationLifecycleChanged(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+  public interface ApplicationLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+  }
+
+  public final class ApplicationLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ApplicationLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ApplicationLifecycleMonitor!);
+  }
+
+  public enum ApplicationStage {
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage PRE_ON_CREATE;
+  }
+
+  public enum Stage {
+    enum_constant public static final androidx.test.runner.lifecycle.Stage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage DESTROYED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PAUSED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PRE_ON_CREATE;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESTARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESUMED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STOPPED;
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.8.0_internal.txt b/runner/monitor/java/androidx/test/api/1.8.0_internal.txt
new file mode 100644
index 000000000..315e53673
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.8.0_internal.txt
@@ -0,0 +1,273 @@
+// Signature format: 3.0
+package androidx.test.internal.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ServiceLoaderWrapper {
+    method public static <T> java.util.List<T!>! loadService(Class<T!>!);
+    method public static <T> T! loadSingleService(Class<T!>!, androidx.test.internal.platform.ServiceLoaderWrapper.Factory<T!>!);
+    method public static <T> T! loadSingleServiceOrNull(Class<T!>!);
+  }
+
+  public static interface ServiceLoaderWrapper.Factory<T> {
+    method public T! create();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Supersedes {
+    method public abstract Class<? extends java.lang.Object!> value();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ThreadChecker {
+    method public void checkMainThread();
+    method public void checkNotMainThread();
+  }
+
+}
+
+package androidx.test.internal.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker {
+    method public void finishActivity(android.app.Activity!);
+    method public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity!>!);
+    method public void pauseActivity(android.app.Activity!);
+    method public void recreateActivity(android.app.Activity!);
+    method public void resumeActivity(android.app.Activity!);
+    method public void startActivity(android.content.Intent!);
+    method public void startActivity(android.content.Intent!, android.os.Bundle?);
+    method public void startActivityForResult(android.content.Intent!);
+    method public void startActivityForResult(android.content.Intent!, android.os.Bundle?);
+    method public void stopActivity(android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ActivityLifecycleTimeout {
+    ctor public ActivityLifecycleTimeout();
+    method public static long getMillis();
+  }
+
+}
+
+package androidx.test.internal.platform.content {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface PermissionGranter {
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package androidx.test.internal.platform.os {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ControlledLooper {
+    method public default boolean areDrawCallbacksSupported();
+    method public void drainMainThreadUntilIdle();
+    method public void simulateWindowFocus(android.view.View!);
+    field public static final androidx.test.internal.platform.os.ControlledLooper! NO_OP_CONTROLLED_LOOPER;
+  }
+
+}
+
+package androidx.test.internal.platform.reflect {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionException extends java.lang.RuntimeException {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveField<T> {
+    ctor public ReflectiveField(Class<? extends java.lang.Object!>!, String!);
+    ctor public ReflectiveField(String!, String!);
+    method public T! get(Object!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod<T> {
+    ctor public ReflectiveMethod(Class<? extends java.lang.Object!>!, String!, Class<? extends java.lang.Object!>!...!);
+    ctor public ReflectiveMethod(String!, String!, Class<? extends java.lang.Object!>!...!);
+    method public T! invoke(Object!, java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
+    method public T! invokeStatic(java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+}
+
+package androidx.test.internal.platform.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestOutputEmitter {
+    method public static boolean addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public static boolean captureWindowHierarchy(String!);
+    method public static void dumpThreadStates(String!);
+    method public static boolean takeScreenshot(String!);
+  }
+
+}
+
+package androidx.test.internal.runner {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class InstrumentationConnection {
+    method public java.util.Set<android.os.Messenger!>! getClientsForType(String!);
+    method public static androidx.test.internal.runner.InstrumentationConnection! getInstance();
+    method public void init(android.app.Instrumentation!, androidx.test.runner.MonitoringInstrumentation.ActivityFinisher!);
+    method public void registerClient(String!, android.os.Messenger!);
+    method public void requestRemoteInstancesActivityCleanup();
+    method public void terminate();
+    method public void unregisterClient(String!, android.os.Messenger!);
+    field public static final String BROADCAST_FILTER = "androidx.test.runner.InstrumentationConnection.event";
+  }
+
+}
+
+package androidx.test.internal.runner.intent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class IntentMonitorImpl implements androidx.test.runner.intent.IntentMonitor {
+    ctor public IntentMonitorImpl();
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void signalIntent(android.content.Intent!);
+  }
+
+}
+
+package androidx.test.internal.runner.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ActivityLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ActivityLifecycleMonitor {
+    ctor public ActivityLifecycleMonitorImpl();
+    ctor public ActivityLifecycleMonitorImpl(boolean);
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public void signalLifecycleChange(androidx.test.runner.lifecycle.Stage!, android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ApplicationLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ApplicationLifecycleMonitor {
+    ctor public ApplicationLifecycleMonitorImpl();
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void signalLifecycleChange(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+}
+
+package androidx.test.internal.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...!);
+    method public static void checkMainThread();
+    method public static void checkNotMainThread();
+    method public static <T> T checkNotNull(T!);
+    method public static <T> T checkNotNull(T!, Object!);
+    method public static <T> T checkNotNull(T!, String!, java.lang.Object!...!);
+    method public static void checkState(boolean);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil {
+    ctor public LogUtil();
+    method public static androidx.test.internal.util.LogUtil.Supplier! lazyArg(androidx.test.internal.util.LogUtil.Supplier!);
+    method public static void logDebug(String!, String!, java.lang.Object!...!);
+    method public static void logDebugWithProcess(String!, String!, java.lang.Object!...!);
+  }
+
+  public static interface LogUtil.Supplier {
+    method public String! get();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ParcelableIBinder implements android.os.Parcelable {
+    ctor public ParcelableIBinder(android.os.IBinder!);
+    ctor protected ParcelableIBinder(android.os.Parcel!);
+    method public int describeContents();
+    method public android.os.IBinder! getIBinder();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.internal.util.ParcelableIBinder!>! CREATOR;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil {
+    ctor @Deprecated public ReflectionUtil();
+    method @Deprecated public static Object! callStaticMethod(Class<? extends java.lang.Object!>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+    method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception {
+  }
+
+  @Deprecated public static class ReflectionUtil.ReflectionParams {
+    ctor @Deprecated public ReflectionUtil.ReflectionParams(Class<? extends java.lang.Object!>!, Object!);
+    method @Deprecated public static Class<? extends java.lang.Object!>![]! getTypes(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+    method @Deprecated public static Object![]! getValues(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AppComponentFactoryRegistry {
+    method public static android.app.AppComponentFactory? getAppComponentFactory();
+    method public static android.app.Activity? instantiateActivity(ClassLoader cl, String className, android.content.Intent? intent = null);
+    method public static android.app.Application? instantiateApplication(ClassLoader cl, String className);
+    method public static void setAppComponentFactory(android.app.AppComponentFactory?);
+    property public static final android.app.AppComponentFactory? appComponentFactory;
+  }
+
+}
+
+package androidx.test.platform.concurrent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public enum DirectExecutor implements java.util.concurrent.Executor {
+    method public void execute(Runnable!);
+    enum_constant public static final androidx.test.platform.concurrent.DirectExecutor INSTANCE;
+  }
+
+}
+
+package androidx.test.platform.io {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FileTestStorage implements androidx.test.platform.io.PlatformTestStorage {
+    ctor public FileTestStorage();
+    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public String! getInputArg(String!);
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
+    method public android.net.Uri! getInputFileUri(String);
+    method public android.net.Uri! getOutputFileUri(String);
+    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
+    method public boolean isTestStorageFilePath(String);
+    method public java.io.InputStream! openInputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!, boolean) throws java.io.FileNotFoundException;
+  }
+
+  public interface PlatformTestStorage {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default java.io.InputStream! openInternalInputFile(String!) throws java.io.FileNotFoundException;
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default java.io.OutputStream! openInternalOutputFile(String!) throws java.io.FileNotFoundException;
+  }
+
+}
+
+package androidx.test.platform.tracing {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface Tracer {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+  }
+
+  public static interface Tracer.Span extends java.io.Closeable {
+    method public androidx.test.platform.tracing.Tracer.Span beginChildSpan(String);
+    method public void close();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Tracing {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+    method public static androidx.test.platform.tracing.Tracing getInstance();
+    method public void registerTracer(androidx.test.platform.tracing.Tracer);
+    method public void unregisterTracer(androidx.test.platform.tracing.Tracer!);
+  }
+
+}
+
+package androidx.test.platform.view.inspector {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class WindowInspectorCompat {
+    method public static java.util.List<android.view.View!>! getGlobalWindowViews() throws androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class WindowInspectorCompat.ViewRetrievalException extends java.lang.Exception {
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/1.8.0_public.txt b/runner/monitor/java/androidx/test/api/1.8.0_public.txt
new file mode 100644
index 000000000..8f1e351b1
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/1.8.0_public.txt
@@ -0,0 +1,226 @@
+// Signature format: 3.0
+package androidx.test {
+
+  @Deprecated public final class InstrumentationRegistry {
+    method @Deprecated public static android.os.Bundle! getArguments();
+    method @Deprecated public static android.content.Context! getContext();
+    method @Deprecated public static android.app.Instrumentation! getInstrumentation();
+    method @Deprecated public static android.content.Context! getTargetContext();
+    method @Deprecated public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.annotation {
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Beta {
+  }
+
+}
+
+package androidx.test.platform {
+
+  public interface TestFrameworkException {
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  public final class InstrumentationRegistry {
+    method public static android.os.Bundle! getArguments();
+    method public static android.app.Instrumentation! getInstrumentation();
+    method public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.platform.device {
+
+  public interface DeviceController {
+    method public void setDeviceMode(int);
+    method public void setScreenOrientation(int);
+  }
+
+  public enum DeviceController.ScreenOrientation {
+    enum_constant public static final androidx.test.platform.device.DeviceController.ScreenOrientation LANDSCAPE;
+    enum_constant public static final androidx.test.platform.device.DeviceController.ScreenOrientation PORTRAIT;
+  }
+
+  public class UnsupportedDeviceOperationException extends java.lang.RuntimeException implements androidx.test.platform.TestFrameworkException {
+    ctor public UnsupportedDeviceOperationException(String!);
+    ctor public UnsupportedDeviceOperationException(String!, Throwable!);
+  }
+
+}
+
+package androidx.test.platform.graphics {
+
+  public class HardwareRendererCompat {
+    method public static boolean isDrawingEnabled();
+    method public static void setDrawingEnabled(boolean);
+  }
+
+}
+
+package androidx.test.platform.io {
+
+  public interface PlatformTestStorage {
+    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public String! getInputArg(String!);
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
+    method public android.net.Uri! getInputFileUri(String);
+    method public android.net.Uri! getOutputFileUri(String);
+    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
+    method public boolean isTestStorageFilePath(String);
+    method public java.io.InputStream! openInputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!, boolean) throws java.io.FileNotFoundException;
+  }
+
+  public final class PlatformTestStorageRegistry {
+    method public static androidx.test.platform.io.PlatformTestStorage! getInstance();
+    method public static void registerInstance(androidx.test.platform.io.PlatformTestStorage!);
+  }
+
+}
+
+package androidx.test.platform.ui {
+
+  public class InjectEventSecurityException extends java.lang.Exception implements androidx.test.platform.TestFrameworkException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+    ctor public InjectEventSecurityException(Throwable!);
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+}
+
+package androidx.test.runner {
+
+  public class MonitoringInstrumentation extends androidx.test.internal.runner.hidden.ExposedInstrumentationApi {
+    ctor public MonitoringInstrumentation();
+    method protected void dumpThreadStateToOutputs(String!);
+    method public void execStartActivities(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent![]!, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!, android.os.UserHandle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Fragment!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, String!, android.content.Intent!, int, android.os.Bundle!);
+    method protected String! getThreadState();
+    method protected void installMultidex();
+    method protected void installOldMultiDex(Class<? extends java.lang.Object!>!) throws java.lang.IllegalAccessException, java.lang.reflect.InvocationTargetException, java.lang.NoSuchMethodException;
+    method public void interceptActivityUsing(androidx.test.runner.intercepting.InterceptingActivityFactory!);
+    method protected final boolean isPrimaryInstrProcess();
+    method @Deprecated protected boolean isPrimaryInstrProcess(String?);
+    method protected void restoreUncaughtExceptionHandler();
+    method protected final void setJsBridgeClassName(String!);
+    method protected boolean shouldWaitForActivitiesToComplete();
+    method protected void specifyDexMakerCacheProperty();
+    method protected Throwable! unwrapException(Throwable!);
+    method public void useDefaultInterceptingActivityFactory();
+    method protected void waitForActivitiesToComplete();
+  }
+
+  public class MonitoringInstrumentation.ActivityFinisher implements java.lang.Runnable {
+    ctor public MonitoringInstrumentation.ActivityFinisher();
+    method public void run();
+  }
+
+}
+
+package androidx.test.runner.intent {
+
+  public interface IntentCallback {
+    method public void onIntentSent(android.content.Intent!);
+  }
+
+  public interface IntentMonitor {
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback!);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback!);
+  }
+
+  public final class IntentMonitorRegistry {
+    method public static androidx.test.runner.intent.IntentMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.intent.IntentMonitor!);
+  }
+
+  public interface IntentStubber {
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+  }
+
+  public final class IntentStubberRegistry {
+    method public static androidx.test.runner.intent.IntentStubber! getInstance();
+    method public static boolean isLoaded();
+    method public static void load(androidx.test.runner.intent.IntentStubber!);
+    method public static void reset();
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  @Deprecated public interface InterceptingActivityFactory {
+    method @Deprecated public android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method @Deprecated public boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.lifecycle {
+
+  public interface ActivityLifecycleCallback {
+    method public void onActivityLifecycleChanged(android.app.Activity!, androidx.test.runner.lifecycle.Stage!);
+  }
+
+  public interface ActivityLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+  }
+
+  public final class ActivityLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ActivityLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public interface ApplicationLifecycleCallback {
+    method public void onApplicationLifecycleChanged(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+  public interface ApplicationLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+  }
+
+  public final class ApplicationLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ApplicationLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ApplicationLifecycleMonitor!);
+  }
+
+  public enum ApplicationStage {
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage PRE_ON_CREATE;
+  }
+
+  public enum Stage {
+    enum_constant public static final androidx.test.runner.lifecycle.Stage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage DESTROYED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PAUSED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PRE_ON_CREATE;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESTARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESUMED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STOPPED;
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/current_internal.txt b/runner/monitor/java/androidx/test/api/current_internal.txt
new file mode 100644
index 000000000..79a52c287
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/current_internal.txt
@@ -0,0 +1,274 @@
+// Signature format: 5.0
+package androidx.test.internal.platform {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ServiceLoaderWrapper {
+    method public static <T> java.util.List<T>! loadService(Class<T>!);
+    method public static <T> T loadSingleService(Class<T>!, androidx.test.internal.platform.ServiceLoaderWrapper.Factory<T>!);
+    method public static <T> T loadSingleServiceOrNull(Class<T>!);
+  }
+
+  public static interface ServiceLoaderWrapper.Factory<T> {
+    method public T create();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Supersedes {
+    method public abstract Class<? extends java.lang.Object!> value();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ThreadChecker {
+    method public void checkMainThread();
+    method public void checkNotMainThread();
+  }
+
+}
+
+package androidx.test.internal.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ActivityInvoker {
+    method public void finishActivity(android.app.Activity!);
+    method public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method public default android.content.Intent! getIntentForActivity(Class<? extends android.app.Activity!>!);
+    method public void pauseActivity(android.app.Activity!);
+    method public void recreateActivity(android.app.Activity!);
+    method public void resumeActivity(android.app.Activity!);
+    method public void startActivity(android.content.Intent!);
+    method public void startActivity(android.content.Intent!, android.os.Bundle?);
+    method public void startActivityForResult(android.content.Intent!);
+    method public void startActivityForResult(android.content.Intent!, android.os.Bundle?);
+    method public void stopActivity(android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ActivityLifecycleTimeout {
+    ctor public ActivityLifecycleTimeout();
+    method public static long getMillis();
+  }
+
+}
+
+package androidx.test.internal.platform.content {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface PermissionGranter {
+    method public void addPermissions(java.lang.String!...);
+    method public void requestPermissions();
+  }
+
+}
+
+package androidx.test.internal.platform.os {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface ControlledLooper {
+    method public default boolean areDrawCallbacksSupported();
+    method public void drainMainThreadUntilIdle();
+    method public void simulateWindowFocus(android.view.View!);
+    field public static final androidx.test.internal.platform.os.ControlledLooper! NO_OP_CONTROLLED_LOOPER;
+  }
+
+}
+
+package androidx.test.internal.platform.reflect {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionException extends java.lang.RuntimeException {
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveField<T> {
+    ctor public ReflectiveField(Class<? extends java.lang.Object!>!, String!);
+    ctor public ReflectiveField(String!, String!);
+    method public T get(Object!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectiveMethod<T> {
+    ctor public ReflectiveMethod(Class<? extends java.lang.Object!>!, String!, Class<? extends java.lang.Object!>!...!);
+    ctor public ReflectiveMethod(String!, String!, Class<? extends java.lang.Object!>!...!);
+    method public T invoke(Object!, java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
+    method public T invokeStatic(java.lang.Object!...!) throws androidx.test.internal.platform.reflect.ReflectionException;
+  }
+
+}
+
+package androidx.test.internal.platform.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class TestOutputEmitter {
+    method public static boolean addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public static boolean captureWindowHierarchy(String!);
+    method public static void dumpThreadStates(String!);
+    method public static boolean takeScreenshot(String!);
+  }
+
+}
+
+package androidx.test.internal.runner {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class InstrumentationConnection {
+    method public java.util.Set<android.os.Messenger!>! getClientsForType(String!);
+    method public static androidx.test.internal.runner.InstrumentationConnection! getInstance();
+    method public void init(android.app.Instrumentation!, androidx.test.runner.MonitoringInstrumentation.ActivityFinisher!);
+    method public void registerClient(String!, android.os.Messenger!);
+    method public void requestRemoteInstancesActivityCleanup();
+    method public void terminate();
+    method public void unregisterClient(String!, android.os.Messenger!);
+    field public static final String BROADCAST_FILTER = "androidx.test.runner.InstrumentationConnection.event";
+  }
+
+}
+
+package androidx.test.internal.runner.intent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class IntentMonitorImpl implements androidx.test.runner.intent.IntentMonitor {
+    ctor public IntentMonitorImpl();
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback);
+    method public void signalIntent(android.content.Intent!);
+  }
+
+}
+
+package androidx.test.internal.runner.lifecycle {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class ActivityLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ActivityLifecycleMonitor {
+    ctor public ActivityLifecycleMonitorImpl();
+    ctor public ActivityLifecycleMonitorImpl(boolean);
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public void signalLifecycleChange(androidx.test.runner.lifecycle.Stage!, android.app.Activity!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ApplicationLifecycleMonitorImpl implements androidx.test.runner.lifecycle.ApplicationLifecycleMonitor {
+    ctor public ApplicationLifecycleMonitorImpl();
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void signalLifecycleChange(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+}
+
+package androidx.test.internal.util {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Checks {
+    method public static void checkArgument(boolean);
+    method public static void checkArgument(boolean, Object!);
+    method public static void checkArgument(boolean, String!, java.lang.Object!...!);
+    method public static void checkMainThread();
+    method public static void checkNotMainThread();
+    method public static <T> T checkNotNull(T);
+    method public static <T> T checkNotNull(T, Object!);
+    method public static <T> T checkNotNull(T, String!, java.lang.Object!...!);
+    method public static void checkState(boolean);
+    method public static void checkState(boolean, Object!);
+    method public static void checkState(boolean, String!, java.lang.Object!...!);
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class LogUtil {
+    ctor public LogUtil();
+    method public static androidx.test.internal.util.LogUtil.Supplier! lazyArg(androidx.test.internal.util.LogUtil.Supplier!);
+    method public static void logDebug(String!, String!, java.lang.Object!...!);
+    method public static void logDebugWithProcess(String!, String!, java.lang.Object!...!);
+  }
+
+  public static interface LogUtil.Supplier {
+    method public String! get();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ParcelableIBinder implements android.os.Parcelable {
+    ctor public ParcelableIBinder(android.os.IBinder!);
+    ctor protected ParcelableIBinder(android.os.Parcel!);
+    method public int describeContents();
+    method public android.os.IBinder! getIBinder();
+    method public void writeToParcel(android.os.Parcel!, int);
+    field public static final android.os.Parcelable.Creator<androidx.test.internal.util.ParcelableIBinder!>! CREATOR;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class ReflectionUtil {
+    ctor @Deprecated public ReflectionUtil();
+    method @Deprecated public static Object! callStaticMethod(Class<? extends java.lang.Object!>!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+    method @Deprecated public static Object! callStaticMethod(String!, String!, androidx.test.internal.util.ReflectionUtil.ReflectionParams!...!) throws androidx.test.internal.util.ReflectionUtil.ReflectionException;
+  }
+
+  @Deprecated @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class ReflectionUtil.ReflectionException extends java.lang.Exception {
+  }
+
+  @Deprecated public static class ReflectionUtil.ReflectionParams {
+    ctor @Deprecated public ReflectionUtil.ReflectionParams(Class<? extends java.lang.Object!>!, Object!);
+    method @Deprecated public static Class<? extends java.lang.Object!>![]! getTypes(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+    method @Deprecated public static Object![]! getValues(androidx.test.internal.util.ReflectionUtil.ReflectionParams![]!);
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class AppComponentFactoryRegistry {
+    method @InaccessibleFromKotlin public static android.app.AppComponentFactory? getAppComponentFactory();
+    method public static android.app.Activity? instantiateActivity(ClassLoader cl, String className, optional android.content.Intent? intent);
+    method public static android.app.Application? instantiateApplication(ClassLoader cl, String className);
+    method @InaccessibleFromKotlin public static void setAppComponentFactory(android.app.AppComponentFactory?);
+    property public static android.app.AppComponentFactory? appComponentFactory;
+    field public static final androidx.test.platform.app.AppComponentFactoryRegistry INSTANCE;
+  }
+
+}
+
+package androidx.test.platform.concurrent {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public enum DirectExecutor implements java.util.concurrent.Executor {
+    method public void execute(Runnable!);
+    enum_constant public static final androidx.test.platform.concurrent.DirectExecutor INSTANCE;
+  }
+
+}
+
+package androidx.test.platform.io {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class FileTestStorage implements androidx.test.platform.io.PlatformTestStorage {
+    ctor public FileTestStorage();
+    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public String! getInputArg(String!);
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
+    method public android.net.Uri! getInputFileUri(String);
+    method public android.net.Uri! getOutputFileUri(String);
+    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
+    method public boolean isTestStorageFilePath(String);
+    method public java.io.InputStream! openInputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!, boolean) throws java.io.FileNotFoundException;
+  }
+
+  public interface PlatformTestStorage {
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default java.io.InputStream! openInternalInputFile(String!) throws java.io.FileNotFoundException;
+    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public default java.io.OutputStream! openInternalOutputFile(String!) throws java.io.FileNotFoundException;
+  }
+
+}
+
+package androidx.test.platform.tracing {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public interface Tracer {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+  }
+
+  public static interface Tracer.Span extends java.io.Closeable {
+    method public androidx.test.platform.tracing.Tracer.Span beginChildSpan(String);
+    method public void close();
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final class Tracing {
+    method public androidx.test.platform.tracing.Tracer.Span beginSpan(String);
+    method public static androidx.test.platform.tracing.Tracing getInstance();
+    method public void registerTracer(androidx.test.platform.tracing.Tracer);
+    method public void unregisterTracer(androidx.test.platform.tracing.Tracer!);
+  }
+
+}
+
+package androidx.test.platform.view.inspector {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class WindowInspectorCompat {
+    method public static java.util.List<android.view.View!>! getGlobalWindowViews() throws androidx.test.platform.view.inspector.WindowInspectorCompat.ViewRetrievalException;
+  }
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public static class WindowInspectorCompat.ViewRetrievalException extends java.lang.Exception {
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/api/current_public.txt b/runner/monitor/java/androidx/test/api/current_public.txt
new file mode 100644
index 000000000..0d496bbf7
--- /dev/null
+++ b/runner/monitor/java/androidx/test/api/current_public.txt
@@ -0,0 +1,226 @@
+// Signature format: 5.0
+package androidx.test {
+
+  @Deprecated public final class InstrumentationRegistry {
+    method @Deprecated public static android.os.Bundle! getArguments();
+    method @Deprecated public static android.content.Context! getContext();
+    method @Deprecated public static android.app.Instrumentation! getInstrumentation();
+    method @Deprecated public static android.content.Context! getTargetContext();
+    method @Deprecated public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.annotation {
+
+  @Deprecated @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.ANNOTATION_TYPE, java.lang.annotation.ElementType.CONSTRUCTOR, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface Beta {
+  }
+
+}
+
+package androidx.test.platform {
+
+  public interface TestFrameworkException {
+  }
+
+}
+
+package androidx.test.platform.app {
+
+  public final class InstrumentationRegistry {
+    method public static android.os.Bundle! getArguments();
+    method public static android.app.Instrumentation! getInstrumentation();
+    method public static void registerInstance(android.app.Instrumentation!, android.os.Bundle!);
+  }
+
+}
+
+package androidx.test.platform.device {
+
+  public interface DeviceController {
+    method public void setDeviceMode(int);
+    method public void setScreenOrientation(int);
+  }
+
+  public enum DeviceController.ScreenOrientation {
+    enum_constant public static final androidx.test.platform.device.DeviceController.ScreenOrientation LANDSCAPE;
+    enum_constant public static final androidx.test.platform.device.DeviceController.ScreenOrientation PORTRAIT;
+  }
+
+  public class UnsupportedDeviceOperationException extends java.lang.RuntimeException implements androidx.test.platform.TestFrameworkException {
+    ctor public UnsupportedDeviceOperationException(String!);
+    ctor public UnsupportedDeviceOperationException(String!, Throwable!);
+  }
+
+}
+
+package androidx.test.platform.graphics {
+
+  public class HardwareRendererCompat {
+    method public static boolean isDrawingEnabled();
+    method public static void setDrawingEnabled(boolean);
+  }
+
+}
+
+package androidx.test.platform.io {
+
+  public interface PlatformTestStorage {
+    method public void addOutputProperties(java.util.Map<java.lang.String!,java.io.Serializable!>!);
+    method public String! getInputArg(String!);
+    method public java.util.Map<java.lang.String!,java.lang.String!>! getInputArgs();
+    method public android.net.Uri! getInputFileUri(String);
+    method public android.net.Uri! getOutputFileUri(String);
+    method public java.util.Map<java.lang.String!,java.io.Serializable!>! getOutputProperties();
+    method public boolean isTestStorageFilePath(String);
+    method public java.io.InputStream! openInputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!) throws java.io.FileNotFoundException;
+    method public java.io.OutputStream! openOutputFile(String!, boolean) throws java.io.FileNotFoundException;
+  }
+
+  public final class PlatformTestStorageRegistry {
+    method public static androidx.test.platform.io.PlatformTestStorage! getInstance();
+    method public static void registerInstance(androidx.test.platform.io.PlatformTestStorage!);
+  }
+
+}
+
+package androidx.test.platform.ui {
+
+  public class InjectEventSecurityException extends java.lang.Exception implements androidx.test.platform.TestFrameworkException {
+    ctor public InjectEventSecurityException(String!);
+    ctor public InjectEventSecurityException(String!, Throwable!);
+    ctor public InjectEventSecurityException(Throwable!);
+  }
+
+  public interface UiController {
+    method public boolean injectKeyEvent(android.view.KeyEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectMotionEvent(android.view.MotionEvent!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public boolean injectString(String!) throws androidx.test.platform.ui.InjectEventSecurityException;
+    method public void loopMainThreadForAtLeast(long);
+    method public void loopMainThreadUntilIdle();
+  }
+
+}
+
+package androidx.test.runner {
+
+  public class MonitoringInstrumentation extends androidx.test.internal.runner.hidden.ExposedInstrumentationApi {
+    ctor public MonitoringInstrumentation();
+    method protected void dumpThreadStateToOutputs(String!);
+    method public void execStartActivities(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent![]!, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Activity!, android.content.Intent!, int, android.os.Bundle!, android.os.UserHandle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, android.app.Fragment!, android.content.Intent!, int, android.os.Bundle!);
+    method public android.app.Instrumentation.ActivityResult! execStartActivity(android.content.Context!, android.os.IBinder!, android.os.IBinder!, String!, android.content.Intent!, int, android.os.Bundle!);
+    method protected String! getThreadState();
+    method @Deprecated protected void installMultidex();
+    method @Deprecated protected void installOldMultiDex(Class<? extends java.lang.Object!>!) throws java.lang.IllegalAccessException, java.lang.reflect.InvocationTargetException, java.lang.NoSuchMethodException;
+    method public void interceptActivityUsing(androidx.test.runner.intercepting.InterceptingActivityFactory!);
+    method protected final boolean isPrimaryInstrProcess();
+    method @Deprecated protected boolean isPrimaryInstrProcess(String?);
+    method protected void restoreUncaughtExceptionHandler();
+    method protected final void setJsBridgeClassName(String!);
+    method protected boolean shouldWaitForActivitiesToComplete();
+    method protected void specifyDexMakerCacheProperty();
+    method protected Throwable! unwrapException(Throwable!);
+    method public void useDefaultInterceptingActivityFactory();
+    method protected void waitForActivitiesToComplete();
+  }
+
+  public class MonitoringInstrumentation.ActivityFinisher implements java.lang.Runnable {
+    ctor public MonitoringInstrumentation.ActivityFinisher();
+    method public void run();
+  }
+
+}
+
+package androidx.test.runner.intent {
+
+  public interface IntentCallback {
+    method public void onIntentSent(android.content.Intent!);
+  }
+
+  public interface IntentMonitor {
+    method public void addIntentCallback(androidx.test.runner.intent.IntentCallback!);
+    method public void removeIntentCallback(androidx.test.runner.intent.IntentCallback!);
+  }
+
+  public final class IntentMonitorRegistry {
+    method public static androidx.test.runner.intent.IntentMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.intent.IntentMonitor!);
+  }
+
+  public interface IntentStubber {
+    method public android.app.Instrumentation.ActivityResult! getActivityResultForIntent(android.content.Intent!);
+  }
+
+  public final class IntentStubberRegistry {
+    method public static androidx.test.runner.intent.IntentStubber! getInstance();
+    method public static boolean isLoaded();
+    method public static void load(androidx.test.runner.intent.IntentStubber!);
+    method public static void reset();
+  }
+
+}
+
+package androidx.test.runner.intercepting {
+
+  @Deprecated public interface InterceptingActivityFactory {
+    method @Deprecated public android.app.Activity! create(ClassLoader!, String!, android.content.Intent!);
+    method @Deprecated public boolean shouldIntercept(ClassLoader!, String!, android.content.Intent!);
+  }
+
+}
+
+package androidx.test.runner.lifecycle {
+
+  public interface ActivityLifecycleCallback {
+    method public void onActivityLifecycleChanged(android.app.Activity!, androidx.test.runner.lifecycle.Stage!);
+  }
+
+  public interface ActivityLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+    method public java.util.Collection<android.app.Activity!>! getActivitiesInStage(androidx.test.runner.lifecycle.Stage!);
+    method public androidx.test.runner.lifecycle.Stage! getLifecycleStageOf(android.app.Activity!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ActivityLifecycleCallback!);
+  }
+
+  public final class ActivityLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ActivityLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ActivityLifecycleMonitor!);
+  }
+
+  public interface ApplicationLifecycleCallback {
+    method public void onApplicationLifecycleChanged(android.app.Application!, androidx.test.runner.lifecycle.ApplicationStage!);
+  }
+
+  public interface ApplicationLifecycleMonitor {
+    method public void addLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+    method public void removeLifecycleCallback(androidx.test.runner.lifecycle.ApplicationLifecycleCallback!);
+  }
+
+  public final class ApplicationLifecycleMonitorRegistry {
+    method public static androidx.test.runner.lifecycle.ApplicationLifecycleMonitor! getInstance();
+    method public static void registerInstance(androidx.test.runner.lifecycle.ApplicationLifecycleMonitor!);
+  }
+
+  public enum ApplicationStage {
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.ApplicationStage PRE_ON_CREATE;
+  }
+
+  public enum Stage {
+    enum_constant public static final androidx.test.runner.lifecycle.Stage CREATED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage DESTROYED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PAUSED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage PRE_ON_CREATE;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESTARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage RESUMED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STARTED;
+    enum_constant public static final androidx.test.runner.lifecycle.Stage STOPPED;
+  }
+
+}
+
diff --git a/runner/monitor/java/androidx/test/internal/package.html b/runner/monitor/java/androidx/test/internal/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/monitor/java/androidx/test/internal/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/monitor/java/androidx/test/internal/platform/ServiceLoaderWrapper.java b/runner/monitor/java/androidx/test/internal/platform/ServiceLoaderWrapper.java
index 8b502f512..3551675bf 100644
--- a/runner/monitor/java/androidx/test/internal/platform/ServiceLoaderWrapper.java
+++ b/runner/monitor/java/androidx/test/internal/platform/ServiceLoaderWrapper.java
@@ -16,9 +16,12 @@
 package androidx.test.internal.platform;
 
 import android.os.StrictMode;
+import androidx.annotation.RestrictTo;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.ServiceLoader;
+import java.util.Set;
 
 /**
  * Wrapper class for {@link ServiceLoader} that disables StrictMode.
@@ -26,7 +29,10 @@
  * <p>Loading a service via ServiceLoader can result in disk I/O. Disk I/O on Android can be
  * restricted via StrictMode. This class disables disk access checking and then reenables StrictMode
  * when loading a service.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by core, espresso, rule
 public final class ServiceLoaderWrapper {
 
   private ServiceLoaderWrapper() {}
@@ -75,21 +81,52 @@ public static <T> T loadSingleService(Class<T> serviceClass, Factory<T> defaultI
 
   /**
    * A wrapper method around {@link #loadService(Class)} that returns one implementation of the
-   * service or {@code null} if no implementation is found.
+   * service or {@code null} if no implementation is found. If an implementation is marked with
+   * {@link Supersedes}, the implementation in Supersedes will be filtered out.
    *
    * @param serviceClass the service type class to load implementation for
-   * @return the implementing service or null if none is found.
+   * @return the implementing service or null if none is found. If an implementation is marked with
+   *     {@link Supersedes}, the implementation in Supersedes will be filtered out.
    * @throws IllegalStateException if more than one service implementations are found
    */
   public static <T> T loadSingleServiceOrNull(Class<T> serviceClass) {
-    List<T> impls = ServiceLoaderWrapper.loadService(serviceClass);
+    List<T> impls = filter(ServiceLoaderWrapper.loadService(serviceClass));
     if (impls.isEmpty()) {
       return null;
     } else if (impls.size() == 1) {
       return impls.get(0);
     } else {
+      String combinedImpls = null;
+      for (T impl : impls) {
+        combinedImpls = (combinedImpls != null) ? combinedImpls + ", " : ": ";
+        combinedImpls += impl.getClass().getName();
+      }
+
       throw new IllegalStateException(
-          "Found more than one implementation for " + serviceClass.getName());
+          "Found more than one implementation for " + serviceClass.getName() + combinedImpls);
+    }
+  }
+
+  @SuppressWarnings("unchecked")
+  private static <T> List<T> filter(List<T> services) {
+    Set<Class<?>> superseded = new HashSet<>();
+    for (T service : services) {
+      Class<? extends T> clazz = (Class<? extends T>) service.getClass();
+      Supersedes supersedes = clazz.getAnnotation(Supersedes.class);
+      if (supersedes != null) {
+        superseded.add(supersedes.value());
+      }
+    }
+    if (superseded.isEmpty()) {
+      return services;
+    } else {
+      List<T> filtered = new ArrayList<>();
+      for (T service : services) {
+        if (!superseded.contains(service.getClass())) {
+          filtered.add(service);
+        }
+      }
+      return filtered;
     }
   }
 }
diff --git a/runner/monitor/java/androidx/test/internal/platform/Supersedes.java b/runner/monitor/java/androidx/test/internal/platform/Supersedes.java
new file mode 100644
index 000000000..7c478a700
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/platform/Supersedes.java
@@ -0,0 +1,24 @@
+package androidx.test.internal.platform;
+
+import androidx.annotation.RestrictTo;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Indicates that the annotated type loaded by ServiceLoadWrapper is intended as a replacement for
+ * another type.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Supersedes {
+
+  /** The type that is superseded by the annotated type. */
+  Class<?> value();
+}
diff --git a/runner/monitor/java/androidx/test/internal/platform/ThreadChecker.java b/runner/monitor/java/androidx/test/internal/platform/ThreadChecker.java
index 4122611dd..7c6a27f9a 100644
--- a/runner/monitor/java/androidx/test/internal/platform/ThreadChecker.java
+++ b/runner/monitor/java/androidx/test/internal/platform/ThreadChecker.java
@@ -16,7 +16,14 @@
 
 package androidx.test.internal.platform;
 
-/** An API to check thread conditions. All classes that implement this API must be thread-safe. */
+import androidx.annotation.RestrictTo;
+
+/**
+ * An API to check thread conditions. All classes that implement this API must be thread-safe.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by robolectric
 public interface ThreadChecker {
   /**
    * Checks if the current thread is the main thread, otherwise throws.
diff --git a/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker$$CC.java b/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker$$CC.java
new file mode 100644
index 000000000..d0b1e0657
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker$$CC.java
@@ -0,0 +1,40 @@
+package androidx.test.internal.platform.app;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Handles default implementation for ActivityInvoker#getIntentForActivity
+ *
+ * <p>Previous releases of androidx.test:monitor shipped with java 7 bytecode, and used desugaring
+ * to convert Java8+ features like default interface method implementations to java7.
+ *
+ * <p>This meant previous releases of androidx.test:monitor had an effective inter-library
+ * dependency on a generated ActivityInvoker$$CC class. Thus retain this class so monitor is
+ * compatible with older androidx.test core versions.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public final class ActivityInvoker$$CC {
+
+  private ActivityInvoker$$CC() {}
+
+  public static Intent getIntentForActivity$$dflt$$(ActivityInvoker invoker,
+            Class<? extends Activity> activityClass) {
+    Intent intent =
+        Intent.makeMainActivity(
+            new ComponentName(getInstrumentation().getTargetContext(), activityClass));
+    if (getInstrumentation().getTargetContext().getPackageManager().resolveActivity(intent, 0)
+        != null) {
+      return intent;
+    }
+    return Intent.makeMainActivity(
+        new ComponentName(getInstrumentation().getContext(), activityClass));
+  }
+}
diff --git a/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker.java b/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker.java
index 301bcf92f..7f895b298 100644
--- a/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker.java
+++ b/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvoker.java
@@ -24,6 +24,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 /**
  * Invokes lifecycle event changes on an {@link Activity}. All methods may work synchronously or
@@ -31,7 +32,9 @@
  *
  * @see <a href="https://developer.android.com/topic/libraries/architecture/lifecycle#lc">Android
  *     Component LifeCycles</a>
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by core
 public interface ActivityInvoker {
   /**
    * Finds an intent to start an Activity of the given class. It looks up target context first and
@@ -49,14 +52,20 @@ default Intent getIntentForActivity(Class<? extends Activity> activityClass) {
         new ComponentName(getInstrumentation().getContext(), activityClass));
   }
 
+  /** Starts an activity using the given intent. */
+  void startActivity(Intent intent, @Nullable Bundle activityOptions);
+
+  /** Convenience method to retain backwards compatibility */
+  void startActivity(Intent intent);
+
   /**
    * Starts an activity using the given intent. After the activity finishes you can retrieve its
    * result code and data via {@link #getActivityResult()}.
    */
-  void startActivity(Intent intent, @Nullable Bundle activityOptions);
+  void startActivityForResult(Intent intent, @Nullable Bundle activityOptions);
 
   /** Convenience method to retain backwards compatibility */
-  void startActivity(Intent intent);
+  void startActivityForResult(Intent intent);
 
   /**
    * Returns activity result that is started by {@link #startActivity}. Unlike other methods this
@@ -65,6 +74,9 @@ default Intent getIntentForActivity(Class<? extends Activity> activityClass) {
    * <p>Note: this method doesn't call {@link Activity#finish()} of the activity that is started by
    * {@link #startActivity}. If you call this method without calling that, it will end up with
    * runtime error and make the test to fail.
+   *
+   * @throws IllegalStateException when you call this method with an Activity that was not started
+   *     by {@link #startActivityForResult}
    */
   ActivityResult getActivityResult();
 
diff --git a/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvokerDesugar.java b/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvokerDesugar.java
new file mode 100644
index 000000000..9d98eb07e
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/platform/app/ActivityInvokerDesugar.java
@@ -0,0 +1,42 @@
+package androidx.test.internal.platform.app;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Handles default implementation for ActivityInvoker#getIntentForActivity
+ *
+ * <p>See the {@link ActivityInvoker$$CC} javadoc for prior history.
+ *
+ * <p>Starting in androidx.test:monitor:1.6.X, a new version of the desugar tooling was used that
+ * generated a ActivityInvoker$-CC class. Class names with hyphens are rejected by javac, so we
+ * cannot directly declare a ActivityInvoker$-CC class here. So instead we use a placeholder name,
+ * and use jarjar to rename the class after the javac step.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public final class ActivityInvokerDesugar {
+
+  private ActivityInvokerDesugar() {}
+
+  // the method name must exactly match the name generated by desugar
+  @SuppressWarnings("MethodName")
+  public static Intent $default$getIntentForActivity(
+      ActivityInvoker invoker, Class<? extends Activity> activityClass) {
+    Intent intent =
+        Intent.makeMainActivity(
+            new ComponentName(getInstrumentation().getTargetContext(), activityClass));
+    if (getInstrumentation().getTargetContext().getPackageManager().resolveActivity(intent, 0)
+        != null) {
+      return intent;
+    }
+    return Intent.makeMainActivity(
+        new ComponentName(getInstrumentation().getContext(), activityClass));
+  }
+}
diff --git a/runner/monitor/java/androidx/test/internal/platform/app/ActivityLifecycleTimeout.java b/runner/monitor/java/androidx/test/internal/platform/app/ActivityLifecycleTimeout.java
index e0e4821ea..e9a003b8e 100644
--- a/runner/monitor/java/androidx/test/internal/platform/app/ActivityLifecycleTimeout.java
+++ b/runner/monitor/java/androidx/test/internal/platform/app/ActivityLifecycleTimeout.java
@@ -1,8 +1,14 @@
 package androidx.test.internal.platform.app;
 
+import androidx.annotation.RestrictTo;
 import androidx.test.internal.platform.util.InstrumentationParameterUtil;
 
-/** Timeout for Activity's lifecycle state transitions. */
+/**
+ * Timeout for Activity's lifecycle state transitions.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by core/runner
 public class ActivityLifecycleTimeout {
 
   /** The instrumentation argument key for the activity lifecycle change timeout. */
diff --git a/runner/monitor/java/androidx/test/internal/platform/content/PermissionGranter.java b/runner/monitor/java/androidx/test/internal/platform/content/PermissionGranter.java
index 5f69387f8..13baa3137 100644
--- a/runner/monitor/java/androidx/test/internal/platform/content/PermissionGranter.java
+++ b/runner/monitor/java/androidx/test/internal/platform/content/PermissionGranter.java
@@ -17,13 +17,17 @@
 package androidx.test.internal.platform.content;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
 /**
  * Requests a runtime permission.
  *
  * <p>Note: This class should not be used directly, but through {@link
  * androidx.test.rule.GrantPermissionRule}.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by rule
 public interface PermissionGranter {
 
   /**
diff --git a/runner/monitor/java/androidx/test/internal/platform/os/ControlledLooper.java b/runner/monitor/java/androidx/test/internal/platform/os/ControlledLooper.java
index 03f0661db..16c15d969 100644
--- a/runner/monitor/java/androidx/test/internal/platform/os/ControlledLooper.java
+++ b/runner/monitor/java/androidx/test/internal/platform/os/ControlledLooper.java
@@ -16,13 +16,17 @@
 package androidx.test.internal.platform.os;
 
 import android.view.View;
+import androidx.annotation.RestrictTo;
 
 /**
  * An API for advancing the looper when its in a paused or controlled state.
  *
  * <p>Implementations should be loaded via {@link
  * androidx.test.internal.platform.ServiceLoaderWrapper}
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by core and espresso
 public interface ControlledLooper {
 
   /**
@@ -35,6 +39,11 @@ public interface ControlledLooper {
   /** Generate window focus event for given view. */
   void simulateWindowFocus(View decorView);
 
+  /** Returns true if registerFrameCommitCallback() and addOnDrawListener callbacks are supported */
+  default boolean areDrawCallbacksSupported() {
+    return false;
+  }
+
   public static final ControlledLooper NO_OP_CONTROLLED_LOOPER =
       new ControlledLooper() {
         @Override
@@ -42,5 +51,10 @@ public void drainMainThreadUntilIdle() {}
 
         @Override
         public void simulateWindowFocus(View decorView) {}
+
+        @Override
+        public boolean areDrawCallbacksSupported() {
+          return true;
+        }
       };
 }
diff --git a/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectionException.java b/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectionException.java
new file mode 100644
index 000000000..8a55f54e0
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectionException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.platform.reflect;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Thrown when there was a failure making a reflective call.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public class ReflectionException extends RuntimeException {
+
+  ReflectionException(Exception cause) {
+    super("Reflection access failed", cause);
+  }
+}
diff --git a/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectiveField.java b/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectiveField.java
new file mode 100644
index 000000000..9304ba798
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectiveField.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.platform.reflect;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.lang.reflect.Field;
+
+/**
+ * Helper class for making more performant reflection field access.
+ *
+ * <p>Lazy initializes and caches Method object ro attempt to reduce reflection overhead.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public class ReflectiveField<T> {
+  private final String className;
+  private final String fieldName;
+  private final Class<?> clazz;
+
+  // lazy init
+  private boolean initialized = false;
+  private Field field;
+
+  /**
+   * Creates a ReflectiveField.
+   *
+   * @param className the fully qualified class name that defines the field
+   * @param fieldName the field name
+   */
+  public ReflectiveField(String className, String fieldName) {
+    this.clazz = null;
+    this.className = className;
+    this.fieldName = fieldName;
+  }
+
+  public ReflectiveField(Class<?> clazz, String fieldName) {
+    this.clazz = clazz;
+    this.className = null;
+    this.fieldName = fieldName;
+  }
+
+  /**
+   * Retrieves the field's value, initializing if necessary.
+   *
+   * @param object the object that holds the field's value
+   * @return the field's value
+   * @throws ReflectionException if field could not be accessed
+   */
+  public T get(Object object) throws ReflectionException {
+    try {
+      initIfNecessary();
+      return (T) field.get(object);
+    } catch (ClassNotFoundException e) {
+      throw new ReflectionException(e);
+    } catch (NoSuchFieldException e) {
+      throw new ReflectionException(e);
+    } catch (IllegalAccessException e) {
+      throw new ReflectionException(e);
+    }
+  }
+
+  private synchronized void initIfNecessary() throws ClassNotFoundException, NoSuchFieldException {
+    if (initialized) {
+      return;
+    }
+    field = getClazz().getDeclaredField(fieldName);
+    field.setAccessible(true);
+    initialized = true;
+  }
+
+  private Class<?> getClazz() throws ClassNotFoundException {
+    if (clazz == null) {
+      return Class.forName(className);
+    } else {
+      return clazz;
+    }
+  }
+}
diff --git a/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectiveMethod.java b/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectiveMethod.java
new file mode 100644
index 000000000..301774617
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/platform/reflect/ReflectiveMethod.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.internal.platform.reflect;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+/**
+ * Helper class for making more performant reflection method invocations.
+ *
+ * <p>Lazy initializes and caches Method object to attempt to reduce reflection overhead.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public class ReflectiveMethod<T> {
+  private final String className;
+  private final String methodName;
+  private final Class<?>[] paramTypes;
+  private final Class<?> clazz;
+
+  // lazy init
+  private boolean initialized = false;
+  private Method method;
+
+  /**
+   * Creates a ReflectiveMethod.
+   *
+   * @param className the fully qualified class name that defines the method
+   * @param methodName the method name to call
+   * @param paramTypes the list of types of the method parameters, in order.
+   */
+  public ReflectiveMethod(String className, String methodName, Class<?>... paramTypes) {
+    this.className = className;
+    this.clazz = null;
+    this.paramTypes = paramTypes;
+    this.methodName = methodName;
+  }
+
+  public ReflectiveMethod(Class<?> clazz, String methodName, Class<?>... paramTypes) {
+    this.className = null;
+    this.clazz = clazz;
+    this.paramTypes = paramTypes;
+    this.methodName = methodName;
+  }
+
+  /**
+   * Invoke the instance method.
+   *
+   * <p>See {@link java.lang.reflect.Method#invoke(Object, Object...)}
+   *
+   * @param object the object the underlying method is invoked from
+   * @param paramValues the arguments used for the method call
+   * @return the return value of the method
+   * @throws ReflectionException if call could not be completed
+   */
+  public T invoke(Object object, Object... paramValues) throws ReflectionException {
+    try {
+      initIfNecessary();
+      return (T) method.invoke(object, paramValues);
+    } catch (ClassNotFoundException e) {
+      throw new ReflectionException(e);
+    } catch (InvocationTargetException e) {
+      throw new ReflectionException(e);
+    } catch (NoSuchMethodException e) {
+      throw new ReflectionException(e);
+    } catch (IllegalAccessException e) {
+      throw new ReflectionException(e);
+    }
+  }
+
+  /**
+   * Invoke th static method.
+   *
+   * <p>See {@link java.lang.reflect.Method#invoke(Object, Object...)}
+   *
+   * @param paramValues the arguments used for the method call
+   * @return the return value of the method
+   * @throws ReflectionException if call could not be completed
+   */
+  public T invokeStatic(Object... paramValues) throws ReflectionException {
+    return invoke(null, paramValues);
+  }
+
+  private synchronized void initIfNecessary() throws ClassNotFoundException, NoSuchMethodException {
+    if (initialized) {
+      return;
+    }
+    method = getClazz().getDeclaredMethod(methodName, paramTypes);
+    method.setAccessible(true);
+    initialized = true;
+  }
+
+  @NonNull
+  private Class<?> getClazz() throws ClassNotFoundException {
+    if (clazz == null) {
+      return Class.forName(className);
+    } else {
+      return clazz;
+    }
+  }
+}
diff --git a/runner/monitor/java/androidx/test/internal/platform/util/InstrumentationParameterUtil.java b/runner/monitor/java/androidx/test/internal/platform/util/InstrumentationParameterUtil.java
index c403888a8..67af0e0ef 100644
--- a/runner/monitor/java/androidx/test/internal/platform/util/InstrumentationParameterUtil.java
+++ b/runner/monitor/java/androidx/test/internal/platform/util/InstrumentationParameterUtil.java
@@ -4,7 +4,11 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import java.util.concurrent.TimeUnit;
 
-/** Provides utility functions to retrieve and parse data from instrumentation parameter. */
+/**
+ * Provides utility functions to retrieve and parse data from instrumentation parameter.
+ *
+ * @hide
+ */
 public class InstrumentationParameterUtil {
 
   /**
diff --git a/runner/monitor/java/androidx/test/internal/platform/util/TestOutputEmitter.java b/runner/monitor/java/androidx/test/internal/platform/util/TestOutputEmitter.java
index 46422a4b7..653a1af74 100644
--- a/runner/monitor/java/androidx/test/internal/platform/util/TestOutputEmitter.java
+++ b/runner/monitor/java/androidx/test/internal/platform/util/TestOutputEmitter.java
@@ -15,11 +15,17 @@
  */
 package androidx.test.internal.platform.util;
 
+import androidx.annotation.RestrictTo;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
 import java.io.Serializable;
 import java.util.Map;
 
-/** A utility for outputting execution data files back to the test environment/CI solution. */
+/**
+ * A utility for outputting execution data files back to the test environment/CI solution.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by espresso and robolectric
 public class TestOutputEmitter {
 
   // create a handler for TestOutputEmitter calls. By default calls are no-ops
diff --git a/runner/monitor/java/androidx/test/internal/platform/util/TestOutputHandler.java b/runner/monitor/java/androidx/test/internal/platform/util/TestOutputHandler.java
index 7576c10d1..7da1f073e 100644
--- a/runner/monitor/java/androidx/test/internal/platform/util/TestOutputHandler.java
+++ b/runner/monitor/java/androidx/test/internal/platform/util/TestOutputHandler.java
@@ -22,6 +22,8 @@
  * An extension definition for outputting debugging information to the test execution environment.
  *
  * <p>Implementations should be provided via {@link ServiceLoader}
+ *
+ * @hide
  */
 public interface TestOutputHandler {
 
diff --git a/runner/monitor/java/androidx/test/internal/runner/InstrumentationConnection.java b/runner/monitor/java/androidx/test/internal/runner/InstrumentationConnection.java
index 1b2afe509..672f75c44 100644
--- a/runner/monitor/java/androidx/test/internal/runner/InstrumentationConnection.java
+++ b/runner/monitor/java/androidx/test/internal/runner/InstrumentationConnection.java
@@ -35,10 +35,10 @@
 import android.os.Messenger;
 import android.os.Parcelable;
 import android.os.RemoteException;
-import androidx.annotation.NonNull;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import androidx.test.internal.util.ParcelableIBinder;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.MonitoringInstrumentation;
@@ -71,9 +71,9 @@
  * InstrumentationConnection to release any resources. Failure to do so will lead to memory leaks
  * and unexpected behavior.
  *
- * <p><b>This API is currently in beta.</b>
+ * @hide
  */
-@Beta
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by espresso remote
 public class InstrumentationConnection {
   private static final String TAG = "InstrConnection";
 
diff --git a/runner/monitor/java/androidx/test/internal/runner/hidden/ExposedInstrumentationApi.java b/runner/monitor/java/androidx/test/internal/runner/hidden/ExposedInstrumentationApi.java
index 6c0755cc3..85b79269b 100644
--- a/runner/monitor/java/androidx/test/internal/runner/hidden/ExposedInstrumentationApi.java
+++ b/runner/monitor/java/androidx/test/internal/runner/hidden/ExposedInstrumentationApi.java
@@ -24,6 +24,8 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.UserHandle;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 
 /**
  * Exposes select hidden android apis to the compiler and to enable recording and stubbing of
@@ -32,12 +34,15 @@
  * the device).
  *
  * <p>This class will actually never be included in our .aar!
+ *
+ * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 public class ExposedInstrumentationApi extends Instrumentation {
 
   /**
-   * This API was removed in Android API 15 (ICE_CREAM_SANDWICH_MR1). We need to keep it around in
-   * case the code is compiled against API 15.
+   * This API was removed in Android API 15 (ICE_CREAM_SANDWICH_MR1). We need to keep it around for
+   * API backwards compatibility in extending classes.
    */
   public ActivityResult execStartActivity(
       Context who,
diff --git a/runner/monitor/java/androidx/test/internal/runner/hidden/package.html b/runner/monitor/java/androidx/test/internal/runner/hidden/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/monitor/java/androidx/test/internal/runner/hidden/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/monitor/java/androidx/test/internal/runner/intent/IntentMonitorImpl.java b/runner/monitor/java/androidx/test/internal/runner/intent/IntentMonitorImpl.java
index 6311ceb3d..f793bc693 100644
--- a/runner/monitor/java/androidx/test/internal/runner/intent/IntentMonitorImpl.java
+++ b/runner/monitor/java/androidx/test/internal/runner/intent/IntentMonitorImpl.java
@@ -18,23 +18,25 @@
 
 import android.app.Activity;
 import android.content.Intent;
-import androidx.annotation.NonNull;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.runner.intent.IntentCallback;
 import androidx.test.runner.intent.IntentMonitor;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
 /**
  * Monitors all outgoing {@link Intent}s and signals intent to all registered Callbacks.
  *
- * <p>This intent monitor will be notified by {@link
- * androidx.test.runner.MonitoringInstrumentation} when a new activity was started using
- * {@link Activity#startActivity(Intent)}.
+ * <p>This intent monitor will be notified by {@link androidx.test.runner.MonitoringInstrumentation}
+ * when a new activity was started using {@link Activity#startActivity(Intent)}.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by robolectric
 public final class IntentMonitorImpl implements IntentMonitor {
 
   private static final String TAG = "IntentMonitorImpl";
@@ -42,8 +44,7 @@ public final class IntentMonitorImpl implements IntentMonitor {
   // Accessed from any thread. Wrapping callbacks in WeakReference because we don't fully
   // trust the users to remove the callbacks (and we don't want to build up a set of dangling
   // ones as the instrumentation runs).
-  List<WeakReference<IntentCallback>> callbacks =
-      Collections.synchronizedList(new ArrayList<WeakReference<IntentCallback>>());
+  private final List<WeakReference<IntentCallback>> callbacks = new ArrayList<>();
 
   /**
    * Registers a intent callback which is notified if an outgoing intent was detected by {@link
@@ -55,17 +56,19 @@ public void addIntentCallback(@NonNull IntentCallback callback) {
       throw new NullPointerException("callback cannot be null!");
     }
     boolean needsAdd = true;
-    Iterator<WeakReference<IntentCallback>> refIter = callbacks.iterator();
-    while (refIter.hasNext()) {
-      IntentCallback storedCallback = refIter.next().get();
-      if (null == storedCallback) {
-        refIter.remove();
-      } else if (storedCallback == callback) {
-        needsAdd = false;
+    synchronized (callbacks) {
+      Iterator<WeakReference<IntentCallback>> refIter = callbacks.iterator();
+      while (refIter.hasNext()) {
+        IntentCallback storedCallback = refIter.next().get();
+        if (null == storedCallback) {
+          refIter.remove();
+        } else if (storedCallback == callback) {
+          needsAdd = false;
+        }
+      }
+      if (needsAdd) {
+        callbacks.add(new WeakReference<IntentCallback>(callback));
       }
-    }
-    if (needsAdd) {
-      callbacks.add(new WeakReference<IntentCallback>(callback));
     }
   }
 
@@ -75,13 +78,15 @@ public void removeIntentCallback(@NonNull IntentCallback callback) {
     if (null == callback) {
       throw new NullPointerException("callback cannot be null!");
     }
-    Iterator<WeakReference<IntentCallback>> refIter = callbacks.iterator();
-    while (refIter.hasNext()) {
-      IntentCallback storedCallback = refIter.next().get();
-      if (null == storedCallback) {
-        refIter.remove();
-      } else if (storedCallback == callback) {
-        refIter.remove();
+    synchronized (callbacks) {
+      Iterator<WeakReference<IntentCallback>> refIter = callbacks.iterator();
+      while (refIter.hasNext()) {
+        IntentCallback storedCallback = refIter.next().get();
+        if (null == storedCallback) {
+          refIter.remove();
+        } else if (storedCallback == callback) {
+          refIter.remove();
+        }
       }
     }
   }
@@ -94,21 +99,23 @@ public void removeIntentCallback(@NonNull IntentCallback callback) {
    * @param intent the intent to signal
    */
   public void signalIntent(Intent intent) {
-    Iterator<WeakReference<IntentCallback>> refIter = callbacks.iterator();
-    while (refIter.hasNext()) {
-      IntentCallback callback = refIter.next().get();
-      if (null == callback) {
-        refIter.remove();
-      } else {
-        try {
-          // invoke callback with a copy of the intent (in case the object is mutable).
-          callback.onIntentSent(new Intent(intent));
-        } catch (RuntimeException e) {
-          Log.e(
-              TAG,
-              String.format(
-                  "Callback threw exception! (callback: %s intent: %s)", callback, intent),
-              e);
+    synchronized (callbacks) {
+      Iterator<WeakReference<IntentCallback>> refIter = callbacks.iterator();
+      while (refIter.hasNext()) {
+        IntentCallback callback = refIter.next().get();
+        if (null == callback) {
+          refIter.remove();
+        } else {
+          try {
+            // invoke callback with a copy of the intent (in case the object is mutable).
+            callback.onIntentSent(new Intent(intent));
+          } catch (RuntimeException e) {
+            Log.e(
+                TAG,
+                String.format(
+                    "Callback threw exception! (callback: %s intent: %s)", callback, intent),
+                e);
+          }
         }
       }
     }
diff --git a/runner/monitor/java/androidx/test/internal/runner/intercepting/DefaultInterceptingActivityFactory.java b/runner/monitor/java/androidx/test/internal/runner/intercepting/DefaultInterceptingActivityFactory.java
index 91b3357c8..275b15ce5 100644
--- a/runner/monitor/java/androidx/test/internal/runner/intercepting/DefaultInterceptingActivityFactory.java
+++ b/runner/monitor/java/androidx/test/internal/runner/intercepting/DefaultInterceptingActivityFactory.java
@@ -24,6 +24,8 @@
 /**
  * Default implementation of {@link InterceptingActivityFactory} which does not intercept activity
  * creation in {@link MonitoringInstrumentation#newActivity(ClassLoader, String, Intent)}
+ *
+ * @hide
  */
 public final class DefaultInterceptingActivityFactory implements InterceptingActivityFactory {
 
diff --git a/runner/monitor/java/androidx/test/internal/runner/intercepting/package-info.java b/runner/monitor/java/androidx/test/internal/runner/intercepting/package-info.java
new file mode 100644
index 000000000..b6deb7292
--- /dev/null
+++ b/runner/monitor/java/androidx/test/internal/runner/intercepting/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.internal.runner.intercepting;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/runner/monitor/java/androidx/test/internal/runner/lifecycle/ActivityLifecycleMonitorImpl.java b/runner/monitor/java/androidx/test/internal/runner/lifecycle/ActivityLifecycleMonitorImpl.java
index 53f08a1fa..a7ad493b0 100644
--- a/runner/monitor/java/androidx/test/internal/runner/lifecycle/ActivityLifecycleMonitorImpl.java
+++ b/runner/monitor/java/androidx/test/internal/runner/lifecycle/ActivityLifecycleMonitorImpl.java
@@ -21,6 +21,7 @@
 import android.app.Activity;
 import android.os.Looper;
 import android.util.Log;
+import androidx.annotation.RestrictTo;
 import androidx.test.runner.lifecycle.ActivityLifecycleCallback;
 import androidx.test.runner.lifecycle.ActivityLifecycleMonitor;
 import androidx.test.runner.lifecycle.Stage;
@@ -30,7 +31,12 @@
 import java.util.Iterator;
 import java.util.List;
 
-/** The lifecycle monitor implementation. */
+/**
+ * The lifecycle monitor implementation.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by robolectric
 public final class ActivityLifecycleMonitorImpl implements ActivityLifecycleMonitor {
   private static final String TAG = "LifecycleMonitor";
   private final boolean declawThreadCheck;
diff --git a/runner/monitor/java/androidx/test/internal/runner/lifecycle/ApplicationLifecycleMonitorImpl.java b/runner/monitor/java/androidx/test/internal/runner/lifecycle/ApplicationLifecycleMonitorImpl.java
index 823db77ca..a3c9569d1 100644
--- a/runner/monitor/java/androidx/test/internal/runner/lifecycle/ApplicationLifecycleMonitorImpl.java
+++ b/runner/monitor/java/androidx/test/internal/runner/lifecycle/ApplicationLifecycleMonitorImpl.java
@@ -20,6 +20,7 @@
 
 import android.app.Application;
 import android.util.Log;
+import androidx.annotation.RestrictTo;
 import androidx.test.runner.lifecycle.ApplicationLifecycleCallback;
 import androidx.test.runner.lifecycle.ApplicationLifecycleMonitor;
 import androidx.test.runner.lifecycle.ApplicationStage;
@@ -28,7 +29,12 @@
 import java.util.Iterator;
 import java.util.List;
 
-/** Implementation of a ApplicationLifecycleMonitor */
+/**
+ * Implementation of a ApplicationLifecycleMonitor
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by robolectric
 public class ApplicationLifecycleMonitorImpl implements ApplicationLifecycleMonitor {
 
   private static final String TAG = "ApplicationLifecycleMonitorImpl";
@@ -85,9 +91,7 @@ public void signalLifecycleChange(Application app, ApplicationStage stage) {
           refIter.remove();
         } else {
           try {
-            Log.d(TAG, "running callback: " + callback);
             callback.onApplicationLifecycleChanged(app, stage);
-            Log.d(TAG, "callback completes: " + callback);
           } catch (RuntimeException re) {
             Log.e(
                 TAG,
diff --git a/runner/monitor/java/androidx/test/internal/runner/runtime/ExposedInstrumentationApi.java b/runner/monitor/java/androidx/test/internal/runner/runtime/ExposedInstrumentationApi.java
index e11542bc9..91e6ca6bf 100644
--- a/runner/monitor/java/androidx/test/internal/runner/runtime/ExposedInstrumentationApi.java
+++ b/runner/monitor/java/androidx/test/internal/runner/runtime/ExposedInstrumentationApi.java
@@ -17,10 +17,15 @@
 package androidx.test.internal.runner.hidden;
 
 import android.app.Instrumentation;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 
 /**
  * This is the ExposedInstrumentationApi class which gets packaged into the aar. The
  * execStartActivity methods will be available through {@link Instrumentation} at runtime and exist
  * in the android.jar on the device.
+ *
+ * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 public abstract class ExposedInstrumentationApi extends Instrumentation {}
diff --git a/runner/monitor/java/androidx/test/internal/util/Checks.java b/runner/monitor/java/androidx/test/internal/util/Checks.java
index c7dbfd02a..c03948a37 100644
--- a/runner/monitor/java/androidx/test/internal/util/Checks.java
+++ b/runner/monitor/java/androidx/test/internal/util/Checks.java
@@ -17,18 +17,25 @@
 package androidx.test.internal.util;
 
 import android.os.Looper;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
 import androidx.test.internal.platform.ThreadChecker;
-import java.util.List;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
 
 /**
  * Utility methods for checking null references, method arguments, and thread state to simplify
  * other library code.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by runner and rules
 public final class Checks {
 
   private Checks() {}
 
+  @CanIgnoreReturnValue
+  @NonNull
   public static <T> T checkNotNull(T reference) {
     if (reference == null) {
       throw new NullPointerException();
@@ -36,6 +43,8 @@ public static <T> T checkNotNull(T reference) {
     return reference;
   }
 
+  @CanIgnoreReturnValue
+  @NonNull
   public static <T> T checkNotNull(T reference, Object errorMessage) {
     if (reference == null) {
       throw new NullPointerException(String.valueOf(errorMessage));
@@ -43,6 +52,8 @@ public static <T> T checkNotNull(T reference, Object errorMessage) {
     return reference;
   }
 
+  @CanIgnoreReturnValue
+  @NonNull
   public static <T> T checkNotNull(
       T reference, String errorMessageTemplate, Object... errorMessageArgs) {
     if (reference == null) {
@@ -114,7 +125,7 @@ public static void checkState(
    * @throws IllegalStateException if current thread is not the main thread.
    */
   public static void checkMainThread() {
-    THREAD_CHECKER.checkMainThread();
+    ThreadCheckerSingleton.INSTANCE.checkMainThread();
   }
 
   /**
@@ -123,38 +134,36 @@ public static void checkMainThread() {
    * @throws IllegalStateException if current thread is the main thread.
    */
   public static void checkNotMainThread() {
-    THREAD_CHECKER.checkNotMainThread();
+    ThreadCheckerSingleton.INSTANCE.checkNotMainThread();
   }
 
-  private static final ThreadChecker THREAD_CHECKER;
-
-  static {
-    List<ThreadChecker> impls = ServiceLoaderWrapper.loadService(ThreadChecker.class);
-    if (impls.isEmpty()) {
-      THREAD_CHECKER =
-          new ThreadChecker() {
-            @Override
-            public void checkMainThread() {
-              checkState(
-                  Thread.currentThread().equals(Looper.getMainLooper().getThread()),
-                  "Method cannot be called off the main application thread (on: %s)",
-                  Thread.currentThread().getName());
-            }
-
-            @Override
-            public void checkNotMainThread() {
-              checkState(
-                  !Thread.currentThread().equals(Looper.getMainLooper().getThread()),
-                  "Method cannot be called on the main application thread (on: %s)",
-                  Thread.currentThread().getName());
-            }
-          };
-    } else if (impls.size() == 1) {
-      THREAD_CHECKER = impls.get(0);
-    } else {
-      throw new IllegalStateException(
-          String.format("Found more than one %s implementations.", ThreadChecker.class.getName()));
-    }
+  /**
+   * Lazy load the ThreadChecker singleton using initialization-on-demand holder idiom
+   * https://en.wikipedia.org/wiki/Initialization-on-demand_holder_idiom
+   */
+  private static class ThreadCheckerSingleton {
+
+    private static final ThreadChecker INSTANCE =
+        ServiceLoaderWrapper.loadSingleService(
+            ThreadChecker.class,
+            () ->
+                new ThreadChecker() {
+                  @Override
+                  public void checkMainThread() {
+                    checkState(
+                        Thread.currentThread().equals(Looper.getMainLooper().getThread()),
+                        "Method cannot be called off the main application thread (on: %s)",
+                        Thread.currentThread().getName());
+                  }
+
+                  @Override
+                  public void checkNotMainThread() {
+                    checkState(
+                        !Thread.currentThread().equals(Looper.getMainLooper().getThread()),
+                        "Method cannot be called on the main application thread (on: %s)",
+                        Thread.currentThread().getName());
+                  }
+                });
   }
 
   private static String format(String template, Object... args) {
diff --git a/runner/monitor/java/androidx/test/internal/util/LogUtil.java b/runner/monitor/java/androidx/test/internal/util/LogUtil.java
index 110c3e390..e29d9e4b9 100644
--- a/runner/monitor/java/androidx/test/internal/util/LogUtil.java
+++ b/runner/monitor/java/androidx/test/internal/util/LogUtil.java
@@ -17,28 +17,45 @@
 package androidx.test.internal.util;
 
 import android.util.Log;
+import androidx.annotation.RestrictTo;
 
-/** Util methods related to logging, using the android.util.Log class. */
+/**
+ * Util methods related to logging, using the android.util.Log class.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by espresso
 public final class LogUtil {
   private static volatile String myProcName = null;
 
   /**
-   * Calls {@link Log#d(String, String)} if {@link Log#isLoggable(String, int)} returns {@code true}
-   * for the given tag. Additionally, provides the ability to use a formatted message using the
-   * specified format string and arguments.
+   * Wrapper for {@link Log#d(String, String)} that supports lazy logging and string formatting.
+   *
+   * <p>Will call log iff {@link Log#isLoggable(String, int)} returns {@code true} for the given
+   * tag. Additionally, provides the ability to use a formatted message using the specified format
+   * string and arguments. Also provides ability to lazyily construct an argument.
    *
    * @param tag Used to identify the source of a log message. It usually identifies the class or
    *     activity where the log call occurs.
    * @param message The message you would like logged.
-   * @param args Arguments referenced by the format specifiers in the format string.
+   * @param args Arguments referenced by the format specifiers in the format string. {@link
+   *     #lazyArg(Supplier)} can be used to offload any expensive operations
    */
   public static void logDebug(String tag, String message, Object... args) {
     logDebug(tag, () -> message, args);
   }
 
-  private static void logDebug(String tag, Supplier<String> msgSupplier, Object... args) {
+  private static void logDebug(String tag, Supplier msgSupplier, Object... args) {
     if (isLoggable(tag, Log.DEBUG)) {
-      Log.d(tag, String.format(msgSupplier.get(), args));
+      Object[] convertedArgs = new Object[args.length];
+      for (int i = 0; i < args.length; i++) {
+        if (args[i] instanceof Supplier) {
+          convertedArgs[i] = ((Supplier) args[i]).get();
+        } else {
+          convertedArgs[i] = args[i];
+        }
+      }
+      Log.d(tag, String.format(msgSupplier.get(), convertedArgs));
     }
   }
 
@@ -83,7 +100,19 @@ private static boolean isLoggable(String tag, final int level) {
     return Log.isLoggable(tag, level);
   }
 
-  interface Supplier<T> {
-    T get();
+  /**
+   * Helper method for providing a lazily constructed logging argument.
+   *
+   * <p>Useful for expensive calculations.
+   *
+   * <p>Usage: {@code logDebug("MyTag", "Big expensive array %s", lazyArg(() ->
+   * Arrays.toString(bigData));}
+   */
+  public static Supplier lazyArg(Supplier supplier) {
+    return supplier;
+  }
+
+  public interface Supplier {
+    String get();
   }
 }
diff --git a/runner/monitor/java/androidx/test/internal/util/ParcelableIBinder.java b/runner/monitor/java/androidx/test/internal/util/ParcelableIBinder.java
index b0a84ec1d..5fbac61e6 100644
--- a/runner/monitor/java/androidx/test/internal/util/ParcelableIBinder.java
+++ b/runner/monitor/java/androidx/test/internal/util/ParcelableIBinder.java
@@ -22,13 +22,17 @@
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.RestrictTo;
 
 /**
  * Helper class to help create parcelable IBinder.
  *
  * <p>Required to maintain backwards comparability back to API level 8. Since {@code
  * Bundle.putBinder(...)} was only introduced in API level 18.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by espresso remote
 public class ParcelableIBinder implements Parcelable {
 
   private final IBinder iBinder;
diff --git a/runner/monitor/java/androidx/test/internal/util/ProcSummary.java b/runner/monitor/java/androidx/test/internal/util/ProcSummary.java
index d5b87c5b3..377da01db 100644
--- a/runner/monitor/java/androidx/test/internal/util/ProcSummary.java
+++ b/runner/monitor/java/androidx/test/internal/util/ProcSummary.java
@@ -23,7 +23,11 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-/** Represents summarized process information. */
+/**
+ * Represents summarized process information.
+ *
+ * @hide
+ */
 public final class ProcSummary {
   public final String name;
   public final String pid;
diff --git a/runner/monitor/java/androidx/test/internal/util/ReflectionUtil.java b/runner/monitor/java/androidx/test/internal/util/ReflectionUtil.java
index 9b856c2f8..14c00e299 100644
--- a/runner/monitor/java/androidx/test/internal/util/ReflectionUtil.java
+++ b/runner/monitor/java/androidx/test/internal/util/ReflectionUtil.java
@@ -16,14 +16,20 @@
 package androidx.test.internal.util;
 
 import android.util.Log;
+import androidx.annotation.RestrictTo;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-/** Utility methods for invoking calls via reflection. */
+/**
+ * Utility methods for invoking calls via reflection.
+ *
+ * @deprecated use {@link androidx.test.platform.reflect.ReflectiveMethod} instead.
+ * @hide
+ */
+@Deprecated
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by runner 1.4.0
 public class ReflectionUtil {
-
   private static final String TAG = "ReflectionUtil";
-
   /** Data class for reflective method call parameters. */
   public static class ReflectionParams {
     final Class<?> type;
@@ -50,14 +56,17 @@ public static Object[] getValues(ReflectionParams[] params) {
       return values;
     }
   }
-
-  /** Thrown when there was a failure making a reflective call. */
+  /**
+   * Thrown when there was a failure making a reflective call.
+   *
+   * @hide
+   */
+  @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // used by runner 1.4.0
   public static class ReflectionException extends Exception {
     ReflectionException(Exception cause) {
       super("Reflective call failed", cause);
     }
   }
-
   /**
    * Reflectively call the specified static method.
    *
@@ -75,7 +84,6 @@ public static Object callStaticMethod(
       throw new ReflectionException(e);
     }
   }
-
   /**
    * Reflectively call the specified static method.
    *
@@ -94,7 +102,11 @@ public static Object callStaticMethod(
       Method m = clazz.getDeclaredMethod(methodName, types);
       m.setAccessible(true);
       return m.invoke(null, values);
-    } catch (InvocationTargetException | IllegalAccessException | NoSuchMethodException e) {
+    } catch (InvocationTargetException e) {
+      throw new ReflectionException(e);
+    } catch (IllegalAccessException e) {
+      throw new ReflectionException(e);
+    } catch (NoSuchMethodException e) {
       throw new ReflectionException(e);
     }
   }
diff --git a/runner/monitor/java/androidx/test/jarjar.txt b/runner/monitor/java/androidx/test/jarjar.txt
new file mode 100644
index 000000000..6ebfe8a76
--- /dev/null
+++ b/runner/monitor/java/androidx/test/jarjar.txt
@@ -0,0 +1 @@
+rule androidx.test.internal.platform.app.ActivityInvokerDesugar androidx.test.internal.platform.app.ActivityInvoker$-CC
diff --git a/runner/monitor/java/androidx/test/platform/app/AppComponentFactoryRegistry.kt b/runner/monitor/java/androidx/test/platform/app/AppComponentFactoryRegistry.kt
new file mode 100644
index 000000000..2f56e895d
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/app/AppComponentFactoryRegistry.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.app
+
+import android.app.Activity
+import android.app.AppComponentFactory
+import android.app.Application
+import android.app.Instrumentation
+import android.content.Intent
+import android.os.Build
+import android.os.Build.VERSION
+import android.os.Build.VERSION_CODES
+import androidx.annotation.ChecksSdkIntAtLeast
+import androidx.annotation.RestrictTo
+
+/**
+ * An exposed registry instance that holds a reference to an application [AppComponentFactory] which
+ * will be used by a test [Instrumentation].
+ *
+ * [AppComponentFactoryRegistry] is a low level APIs, and is used internally by Android testing
+ * frameworks. It is **NOT** designed for direct use by third party clients.
+ *
+ * TODO(b/275323224): In order to avoid breaking open source, support for
+ *  `RoboMonitoringInstrumentation` will be done later, once `AppComponentFactoryRegistry` is
+ *  available in a published `androidx.test:monitor` release.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+object AppComponentFactoryRegistry {
+
+  /**
+   * [AppComponentFactory] to be used by the current test [Instrumentation].
+   *
+   * @throws [IllegalArgumentException] if set from an Android version smaller than 28.
+   */
+  @JvmStatic
+  @Volatile
+  var appComponentFactory: AppComponentFactory? = null
+    set(value) {
+      check(isVersionCodeAtLeastP()) {
+        "AppComponentFactoryRegistry is not supported on 'VERSION.SDK_INT < VERSION_CODES.P'"
+      }
+      field = value
+    }
+
+  /**
+   * Returns an instance of an [Application] given a [className] using the registered
+   * [AppComponentFactory] as factory to instantiate it.
+   *
+   * It may return null if:
+   * - an instance of [AppComponentFactory] has not been registered with [appComponentFactory].
+   * - the registered [AppComponentFactory] can not create an instance of the requested [className].
+   * - the current Android [Build.VERSION.SDK_INT] is smaller than [Build.VERSION_CODES.P].
+   *
+   * This function is a shorthand for getting an instance of the registered factory or null.
+   *
+   * @see [AppComponentFactory.instantiateApplication]
+   */
+  @JvmStatic
+  fun instantiateApplication(
+    cl: ClassLoader,
+    className: String,
+  ): Application? =
+    if (isVersionCodeAtLeastP()) {
+      appComponentFactory?.instantiateApplication(cl, className)
+    } else {
+      null
+    }
+
+  /**
+   * Returns an instance of an [Activity] given a [className] using the registered
+   * [AppComponentFactory] as factory to instantiate it.
+   *
+   * It may return null if:
+   * - an instance of [AppComponentFactory] has not been registered with [appComponentFactory].
+   * - the registered [AppComponentFactory] can not create an instance of the requested [className].
+   * - the current Android [Build.VERSION.SDK_INT] is smaller than [Build.VERSION_CODES.P].
+   *
+   * This function is a shorthand for getting an instance of the registered factory or null.
+   *
+   * @see [AppComponentFactory.instantiateApplication]
+   */
+  @JvmStatic
+  fun instantiateActivity(
+    cl: ClassLoader,
+    className: String,
+    intent: Intent? = null,
+  ): Activity? =
+    if (isVersionCodeAtLeastP()) {
+      appComponentFactory?.instantiateActivity(cl, className, intent)
+    } else {
+      null
+    }
+
+  @ChecksSdkIntAtLeast(api = VERSION_CODES.P)
+  private fun isVersionCodeAtLeastP(): Boolean = VERSION.SDK_INT >= VERSION_CODES.P
+}
diff --git a/runner/monitor/java/androidx/test/platform/concurrent/DirectExecutor.java b/runner/monitor/java/androidx/test/platform/concurrent/DirectExecutor.java
new file mode 100644
index 000000000..2cf8fcd88
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/concurrent/DirectExecutor.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.concurrent;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import java.util.concurrent.Executor;
+
+/**
+ * An {@link Executor} that runs each task in the thread that invokes {@link Executor#execute
+ * execute}.
+ *
+ * <p>Fork of androidx.concurrent.futures.DirectExecutor.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
+public enum DirectExecutor implements Executor {
+  INSTANCE;
+
+  @Override
+  public void execute(Runnable command) {
+    command.run();
+  }
+
+  @Override
+  public String toString() {
+    return "DirectExecutor";
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/device/DeviceController.java b/runner/monitor/java/androidx/test/platform/device/DeviceController.java
new file mode 100644
index 000000000..e27e85231
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/device/DeviceController.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.device;
+
+
+/**
+ * Provides base-level device operations that can be used to build user actions such as folding a
+ * device, changing screen orientation etc.
+ *
+ * <p>This is a low level API, typically used by higher level test frameworks. It is generally not
+ * recommended for direct use by most tests. Please use high-level Espresso device APIs to interact
+ * with the device.
+ */
+public interface DeviceController {
+  /**
+   * Sets the connected device to the provided mode. unsupported device mode.
+   *
+   * @param deviceMode the mode to put the device in
+   * @throws UnsupportedDeviceOperationException if used on an unsupported device.
+   */
+  void setDeviceMode(int deviceMode);
+
+  /**
+   * Sets the connected device to the provided screen orientation.
+   *
+   * @param screenOrientation the orientation to put the device in
+   * @throws UnsupportedDeviceOperationException if used on an unsupported device.
+   */
+  void setScreenOrientation(int screenOrientation);
+
+  /** Enum for screen orientations a device can be set to. */
+  enum ScreenOrientation {
+    PORTRAIT,
+    LANDSCAPE
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/device/UnsupportedDeviceOperationException.java b/runner/monitor/java/androidx/test/platform/device/UnsupportedDeviceOperationException.java
new file mode 100644
index 000000000..bd96579ce
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/device/UnsupportedDeviceOperationException.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.device;
+
+import androidx.test.platform.TestFrameworkException;
+
+/**
+ * An exception which indicates that the device selected does not support an operation called on it.
+ */
+public class UnsupportedDeviceOperationException extends RuntimeException
+    implements TestFrameworkException {
+  public UnsupportedDeviceOperationException(String description) {
+    super(description);
+  }
+
+  public UnsupportedDeviceOperationException(String description, Throwable cause) {
+    super(description, cause);
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/graphics/HardwareRendererCompat.java b/runner/monitor/java/androidx/test/platform/graphics/HardwareRendererCompat.java
index 860f5357a..9d2694c1f 100644
--- a/runner/monitor/java/androidx/test/platform/graphics/HardwareRendererCompat.java
+++ b/runner/monitor/java/androidx/test/platform/graphics/HardwareRendererCompat.java
@@ -18,23 +18,25 @@
 import android.graphics.HardwareRenderer;
 import android.os.Build.VERSION;
 import android.util.Log;
-import androidx.test.annotation.ExperimentalScreenshot;
-import androidx.test.internal.util.ReflectionUtil;
-import androidx.test.internal.util.ReflectionUtil.ReflectionException;
-import androidx.test.internal.util.ReflectionUtil.ReflectionParams;
+import androidx.test.internal.platform.reflect.ReflectionException;
+import androidx.test.internal.platform.reflect.ReflectiveMethod;
 
 /**
  * Helper class that provides {@link HardwareRenderer#isDrawingEnabled()} and {@link
  * android.graphics.HardwareRenderer#setDrawingEnabled(boolean)} functionality on emulator platforms
  * that backported this functionality from a future android API.
- *
- * <p>This API is currently experimental and subject to change or removal.
  */
-@ExperimentalScreenshot
 public class HardwareRendererCompat {
 
   private static final String TAG = "HardwareRendererCompat";
 
+  private static final ReflectiveMethod<Boolean> isDrawingEnabledReflectiveCall =
+      new ReflectiveMethod<>("android.graphics.HardwareRenderer", "isDrawingEnabled");
+
+  private static final ReflectiveMethod<Void> setDrawingEnabledReflectiveCall =
+      new ReflectiveMethod<>(
+          "android.graphics.HardwareRenderer", "setDrawingEnabled", boolean.class);
+
   private HardwareRendererCompat() {}
 
   /**
@@ -49,10 +51,12 @@ public static boolean isDrawingEnabled() {
       return true;
     }
     try {
-      return (boolean) ReflectionUtil.callStaticMethod(HardwareRenderer.class, "isDrawingEnabled");
+      return isDrawingEnabledReflectiveCall.invokeStatic();
     } catch (ReflectionException e) {
-      Log.i(
-          TAG, "Failed to reflectively call HardwareRenderer#isDrawingEnabled, returning true", e);
+      Log.d(
+          TAG,
+          "Failed to reflectively call HardwareRenderer#isDrawingEnabled. It probably doesn't exist"
+              + " on this platform. Returning true.");
       return true;
     }
   }
@@ -67,26 +71,15 @@ public static void setDrawingEnabled(boolean renderingEnabled) {
       // unsupported on these apis
       return;
     }
+
     try {
-      ReflectionUtil.callStaticMethod(
-          HardwareRenderer.class,
-          "setDrawingEnabled",
-          new ReflectionParams(boolean.class, renderingEnabled));
+      setDrawingEnabledReflectiveCall.invokeStatic(renderingEnabled);
     } catch (ReflectionException e) {
-      Log.i(TAG, "Failed to reflectively call HardwareRenderer#setDrawingEnabled, ignoring", e);
+      Log.i(
+          TAG,
+          "Failed to reflectively call HardwareRenderer#setDrawingEnabled.  It probably doesn't"
+              + " exist on this platform. Ignoring.");
     }
   }
 
-  /**
-   * Convenience method to set setDrawingEnabled(true) if and only if it is currently disabled.
-   *
-   * @return the previous isDrawingEnabled() state
-   */
-  public static boolean enableDrawingIfNecessary() {
-    boolean isDrawingEnabled = isDrawingEnabled();
-    if (!isDrawingEnabled) {
-      HardwareRendererCompat.setDrawingEnabled(true);
-    }
-    return isDrawingEnabled;
-  }
 }
diff --git a/runner/monitor/java/androidx/test/platform/io/FileTestStorage.java b/runner/monitor/java/androidx/test/platform/io/FileTestStorage.java
index 277b21355..675353d80 100644
--- a/runner/monitor/java/androidx/test/platform/io/FileTestStorage.java
+++ b/runner/monitor/java/androidx/test/platform/io/FileTestStorage.java
@@ -15,70 +15,96 @@
  */
 package androidx.test.platform.io;
 
+import android.net.Uri;
+import android.os.Bundle;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.test.platform.app.InstrumentationRegistry;
+import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-/** A class that reads/writes the runner data using the raw file system. */
+/**
+ * An implementation of {@link PlatformTestStorage} that reads and writes test data to the test
+ * process's local storage.
+ *
+ * <p>Typically the test runner infrastructure will configure where test data is stored and
+ * retrieved from by passing 'additionalTestOutputDir' and 'testInputDir' instrumentation arguments.
+ * If these arguments are not provided, the implementation will choose an appropriate location based
+ * on android API level that minimizes the need for any extra permissions. See TestDirCalculator.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
 public final class FileTestStorage implements PlatformTestStorage {
 
   private static final String TAG = FileTestStorage.class.getSimpleName();
+  private final TestDirCalculator testDirCalculator;
+
+  public FileTestStorage() {
+    testDirCalculator = new TestDirCalculator();
+  }
 
   /**
    * Provides an InputStream to a test file dependency.
    *
-   * @param pathname path to the test file dependency. Should not be null. This is an absolute file
-   *     path on the device, and it's the infrastructure/client's responsibility to make sure the
-   *     file path is readable.
+   * @param pathname relative path to the test file dependency. Should not be null.
    */
   @Override
-  public InputStream openInputFile(String pathname) throws IOException {
-    return new FileInputStream(pathname);
+  public InputStream openInputFile(String pathname) throws FileNotFoundException {
+    File inputFile = new File(testDirCalculator.getInputDir(), pathname);
+    return new FileInputStream(inputFile);
   }
 
   /**
    * Provides an OutputStream to a test output file.
    *
-   * @param pathname path to the test file dependency. Should not be null. This is an absolute file
-   *     path on the device, and it's the infrastructure/client's responsibility to make sure the
-   *     file path is writable.
+   * @param pathname path to the test file dependency. Should not be null. Can be either a relative
+   *     or absolute path. If relative, the implementation will make a best effort attempt to a
+   *     writable output dir based on API level.
    */
   @Override
-  public OutputStream openOutputFile(String pathname) throws IOException {
-    return new FileOutputStream(pathname);
+  public OutputStream openOutputFile(String pathname) throws FileNotFoundException {
+    return openOutputFile(pathname, false);
   }
 
   @Override
-  public OutputStream openOutputFile(String pathname, boolean append) throws IOException {
-    return new FileOutputStream(pathname, append);
+  public OutputStream openOutputFile(String pathname, boolean append) throws FileNotFoundException {
+    File outputFile = new File(testDirCalculator.getOutputDir(), pathname);
+    Log.d("FileTestStorage", "openOutputFile from " + outputFile.getAbsolutePath());
+    if (!outputFile.getParentFile().exists()) {
+      if (!outputFile.getParentFile().mkdirs()) {
+        throw new FileNotFoundException(
+            "Failed to create output dir " + outputFile.getParentFile().getAbsolutePath());
+      }
+    }
+    return new FileOutputStream(outputFile, append);
   }
 
-  /**
-   * Test input arguments is not supported when raw file I/O is used.
-   *
-   * <p><code>null</code> is always returned.
-   */
+  /** Implementation of input arguments that reads from InstrumentationRegistry.getArguments */
   @Override
   public String getInputArg(String argName) {
-    Log.w(TAG, "Test input args is not supported.");
-    return null;
+    return InstrumentationRegistry.getArguments().getString(argName);
   }
 
-  /**
-   * Test input arguments is not supported when raw file I/O is used.
-   *
-   * <p>An empty map is always returned.
-   */
+  /** Implementation of input arguments that reads from InstrumentationRegistry.getArguments */
   @Override
   public Map<String, String> getInputArgs() {
-    Log.w(TAG, "Test input args is not supported.");
-    return new HashMap<>();
+    Map<String, String> argMap = new HashMap<>();
+    Bundle bundle = InstrumentationRegistry.getArguments();
+    for (String key : bundle.keySet()) {
+      argMap.put(key, bundle.getString(key));
+    }
+    return argMap;
   }
 
   /** Test output properties is not supported when raw file I/O is used. */
@@ -95,7 +121,7 @@ public void addOutputProperties(Map<String, Serializable> properties) {
   @Override
   public Map<String, Serializable> getOutputProperties() {
     Log.w(TAG, "Output properties is not supported.");
-    return new HashMap<>();
+    return Collections.emptyMap();
   }
 
   /**
@@ -106,19 +132,37 @@ public Map<String, Serializable> getOutputProperties() {
    *     file path is readable.
    */
   @Override
-  public InputStream openInternalInputFile(String pathname) throws IOException {
-    return new FileInputStream(pathname);
+  public InputStream openInternalInputFile(String pathname) throws FileNotFoundException {
+    return openInputFile(pathname);
   }
 
   /**
    * Provides an OutputStream to an internal file used by the testing infrastructure.
    *
-   * @param pathname path to the internal output file. Should not be null. This is an absolute file
-   *     path on the device, and it's the infrastructure/client's responsibility to make sure the
-   *     file path is writable.
+   * @param pathname path to the test file dependency. Should not be null. Can be either a relative
+   *     or absolute path. If relative, the implementation will read the input file from the test
+   *     apk's asset directory
    */
   @Override
-  public OutputStream openInternalOutputFile(String pathname) throws IOException {
-    return new FileOutputStream(pathname);
+  public OutputStream openInternalOutputFile(String pathname) throws FileNotFoundException {
+    return openOutputFile(pathname);
+  }
+
+  @Override
+  public Uri getInputFileUri(@NonNull String pathname) {
+    File inputFile = new File(testDirCalculator.getInputDir(), pathname);
+    return Uri.fromFile(inputFile);
+  }
+
+  @Override
+  public Uri getOutputFileUri(@NonNull String pathname) {
+    File outputFile = new File(testDirCalculator.getOutputDir(), pathname);
+    return Uri.fromFile(outputFile);
+  }
+
+  @Override
+  public boolean isTestStorageFilePath(@NonNull String pathname) {
+    String outputDir = testDirCalculator.getOutputDir().getAbsolutePath();
+    return pathname.startsWith(outputDir);
   }
 }
diff --git a/runner/monitor/java/androidx/test/platform/io/PlatformTestStorage.java b/runner/monitor/java/androidx/test/platform/io/PlatformTestStorage.java
index fabd9f8fa..7ccd46086 100644
--- a/runner/monitor/java/androidx/test/platform/io/PlatformTestStorage.java
+++ b/runner/monitor/java/androidx/test/platform/io/PlatformTestStorage.java
@@ -15,66 +15,106 @@
  */
 package androidx.test.platform.io;
 
-import java.io.IOException;
+import android.net.Uri;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.test.platform.app.InstrumentationRegistry;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Serializable;
 import java.util.Map;
 
 /**
- * An interface represents on-device I/O operations in an Android test.
+ * An interface representing on-device I/O operations in an Android test.
  *
- * <p>This is a low level API, typically used by higher level test frameworks. It is generally not
- * recommended for direct use by most tests.
+ * <p>This API allows users to retrieve test data specified in the build configuration, and write
+ * output test data that can be automatically collected by the test runner infrastructure, if the
+ * environment supports it.
  *
- * <p>Use a concrete implementation class of this interface if you need to read/write files in your
- * tests. For example, in an Android Instrumentation test, use {@code
- * androidx.test.services.storage.TestStorage} when the test services is installed on the device.
+ * <p>Typically users will retrieve the appropriate implementation via {@link
+ * PlatformTestStorageRegistry#getInstance()}.
+ *
+ * <p>Implementers would need to also implement the appropriate test runner support for pushing and
+ * pulling the test data to and from the device from the build environment.
  */
 public interface PlatformTestStorage {
+
   /**
    * Provides an InputStream to a test file dependency.
    *
-   * @param pathname path to the test file dependency. Should not be null.
-   * @return an InputStream to the given test file.
+   * <p>In bazel/blaze environments, this corresponds to files passed in the 'data' attribute of the
+   * android_instrumentation_test or android_local_test build rule.
+   *
+   * <p>This API is currently not supported in gradle environments.
+   *
+   * @param pathname the path to the test file dependency, relative to the root where the storage
+   *     implementation stores input files. Should not be null.
+   * @return a potentially unbuffered InputStream to the given test file. Users will typically want
+   *     to buffer the input in memory when reading from this stream.
+   * @throws FileNotFoundException if pathname does not exist
    */
-  InputStream openInputFile(String pathname) throws IOException;
+  InputStream openInputFile(String pathname) throws FileNotFoundException;
 
   /**
    * Returns the value of a given argument name.
    *
+   * <p>In bazel/blaze environments, this corresponds to flags passed in the 'args' attribute of the
+   * android_instrumentation_test or android_local_test build rule.
+   *
+   * <p>This API is currently unsupported in gradle environments. It is recommended to use {@link
+   * InstrumentationRegistry#getArguments()} as an alternative.
+   *
    * @param argName the argument name. Should not be null.
    */
   String getInputArg(String argName);
 
   /**
    * Returns the name/value map of all test arguments or an empty map if no arguments are defined.
+   *
+   * @see {@link #getInputArg(String)}
    */
   Map<String, String> getInputArgs();
 
   /**
-   * Provides an OutputStream to a test output file.
+   * Provides an OutputStream to a test output file. Will overwrite any data written to the same
+   * pathname in the same test run.
    *
-   * @param pathname path to the test output file. Should not be null.
-   * @return an OutputStream to the given output file.
+   * <p>Supported test runners will pull the files from the device once the test completes.
+   *
+   * <p>In gradle android instrumentation test environments, the files will typically be stored in
+   * path_to_your_project/module_name/build/outputs/managed_device_android_test_additional_output
+   * <br>
+   *
+   * @param pathname relative path to the test output file. Should not be null.
+   * @return a potentially unbuffered OutputStream to the given output file. Users will typically
+   *     want to buffer the output in memory when writing to this stream.
+   * @throws FileNotFoundException if pathname does not exist
    */
-  OutputStream openOutputFile(String pathname) throws IOException;
+  OutputStream openOutputFile(String pathname) throws FileNotFoundException;
 
   /**
    * Provides an OutputStream to a test output file.
    *
+   * <p>This API is identical to {@link #openOutputFile(String)} with the additional feature of
+   * allowing appending or overwriting test data.
+   *
    * @param pathname path to the test output file. Should not be null.
    * @param append if true, then the lines will be added to the end of the file rather than
    *     overwriting.
    * @return an OutputStream to the given output file.
+   * @throws FileNotFoundException if pathname does not exist
    */
-  OutputStream openOutputFile(String pathname, boolean append) throws IOException;
+  OutputStream openOutputFile(String pathname, boolean append) throws FileNotFoundException;
 
   /**
    * Adds the given properties.
    *
    * <p>Adding a property with the same name would append new values and overwrite the old values if
    * keys already exist.
+   *
+   * <p>This API is unsupported in gradle environments. <br>
    */
   void addOutputProperties(Map<String, Serializable> properties);
 
@@ -89,16 +129,65 @@ public interface PlatformTestStorage {
    *
    * @param pathname path to the internal file. Should not be null.
    * @return an InputStream to the given test file.
+   * @throws FileNotFoundException if pathname does not exist
    * @hide
    */
-  InputStream openInternalInputFile(String pathname) throws IOException;
+  @RestrictTo(Scope.LIBRARY_GROUP)
+  default InputStream openInternalInputFile(String pathname) throws FileNotFoundException {
+    return openInputFile(pathname);
+  }
 
   /**
    * Provides an OutputStream to an internal file used by the testing infrastructure.
    *
    * @param pathname path to the internal file. Should not be null.
    * @return an OutputStream to the given output file.
+   * @throws FileNotFoundException if pathname does not exist
    * @hide
    */
-  OutputStream openInternalOutputFile(String pathname) throws IOException;
+  @RestrictTo(Scope.LIBRARY_GROUP)
+  default OutputStream openInternalOutputFile(String pathname) throws FileNotFoundException {
+    return openOutputFile(pathname);
+  }
+
+  /**
+   * Provides a Uri to a test file dependency.
+   *
+   * <p>In most of the cases, you would use {@link #openInputFile(String)} for opening up an
+   * InputStream to the input file content immediately. Only use this method if you would like to
+   * store the file Uri and use it for I/O operations later.
+   *
+   * @param pathname path to the test file dependency. Should not be null. This is a relative path
+   *     to where the storage implementation stores the input files. For example, if the storage
+   *     service stores the input files under "/sdcard/test_input_files", with a pathname
+   *     "/path/to/my_input.txt", the file will end up at
+   *     "/sdcard/test_input_files/path/to/my_input.txt" on device.
+   * @return a content Uri to the test file dependency.
+   *     <p>Note: temporary API - will be renamed to getInputFileUri in future
+   */
+  Uri getInputFileUri(@NonNull String pathname);
+
+  /**
+   * Provides a Uri to a test output file.
+   *
+   * <p>In most of the cases, you would use {@link #openOutputFile(String)} for opening up an
+   * OutputStream to the output file content immediately. Only use this method if you would like to
+   * store the file Uri and use it for I/O operations later.
+   *
+   * @param pathname path to the test output file. Should not be null. This is a relative path to
+   *     where the storage implementation stores the output files. For example, if the storage
+   *     service stores the output files under "/sdcard/test_output_files", with a pathname
+   *     "/path/to/my_output.txt", the file will end up at
+   *     "/sdcard/test_output_files/path/to/my_output.txt" on device.
+   */
+  Uri getOutputFileUri(@NonNull String pathname);
+
+  /**
+   * Returns true if {@code pathname} corresponds to a file or directory that is in a directory
+   * where the storage implementation stores files.
+   *
+   * @param pathname path to a file or directory. Should not be null. This is an absolute path to a
+   *     file that may be a part of the storage service.
+   */
+  boolean isTestStorageFilePath(@NonNull String pathname);
 }
diff --git a/runner/monitor/java/androidx/test/platform/io/PlatformTestStorageRegistry.java b/runner/monitor/java/androidx/test/platform/io/PlatformTestStorageRegistry.java
index 11126f20b..9ba337c0a 100644
--- a/runner/monitor/java/androidx/test/platform/io/PlatformTestStorageRegistry.java
+++ b/runner/monitor/java/androidx/test/platform/io/PlatformTestStorageRegistry.java
@@ -18,19 +18,12 @@
 import static androidx.test.internal.util.Checks.checkNotNull;
 
 import androidx.test.internal.platform.ServiceLoaderWrapper;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * An exposed registry instance that holds a reference to an {@code PlatformTestStorage} instance.
+ * A registry instance that holds a reference to an {@code PlatformTestStorage} instance.
  *
- * <p>{@code PlatformTestStorage} and {@code PlatformTestStorageRegistry} are low level APIs,
- * typically used by higher level test frameworks. It is generally not recommended for direct use by
- * most tests.
+ * <p>Users should use this to retrieve the appropriate {@link PlatformTestStorage} for the current
+ * execution environment.
  */
 public final class PlatformTestStorageRegistry {
   private static PlatformTestStorage testStorageInstance;
@@ -39,8 +32,7 @@ public final class PlatformTestStorageRegistry {
     // By default, uses the instance loaded by the service loader if available; otherwise, uses a
     // default no_op implementation.
     testStorageInstance =
-        ServiceLoaderWrapper.loadSingleService(
-            PlatformTestStorage.class, NoOpPlatformTestStorage::new);
+        ServiceLoaderWrapper.loadSingleService(PlatformTestStorage.class, FileTestStorage::new);
   }
 
   private PlatformTestStorageRegistry() {}
@@ -49,6 +41,9 @@ private PlatformTestStorageRegistry() {}
    * Registers a new {@code PlatformTestStorage} instance. This will override any previously set
    * instance.
    *
+   * <p>Users should not typically call this directly - it is intended for use by the test
+   * infrastructure.
+   *
    * @param instance the instance to be registered. Cannot be null.
    */
   public static synchronized void registerInstance(PlatformTestStorage instance) {
@@ -58,70 +53,22 @@ public static synchronized void registerInstance(PlatformTestStorage instance) {
   /**
    * Returns the registered {@code PlatformTestStorage} instance.
    *
+   * <p>By default, a {@link FileTestStorage} implementation is used. The default implementation is
+   * currently recommended for users using android gradle plugins version 8.0 or greater which
+   * supports writing output files (only). Gradle users using versions 8.0 or greater can optionally
+   * also opt in the test services {@link TestStorage} implementation by adding the following
+   * configuration to their build.gradle file: <br>
+   * <code>
+   * defaultConfig { testInstrumentationRunnerArguments useTestStorageService: "true" }
+   * dependencies { androidTestUtil "androidx.test.services:test-services:$servicesVersion" }
+   * </code> <br>
+   *
    * <p>This method returns the instance last registered by the {@link
    * #registerInstance(PlatformTestStorage)} method, or the default instance if none is ever
-   * registered.
+   * registered. Advanced users can provide {@link java.util.ServiceLoader} metadata to provide an
+   * alternate implementation to load.
    */
   public static synchronized PlatformTestStorage getInstance() {
     return testStorageInstance;
   }
-
-  /** A test storage that does nothing. All the I/O operations in this class are ignored. */
-  static class NoOpPlatformTestStorage implements PlatformTestStorage {
-
-    @Override
-    public InputStream openInputFile(String pathname) {
-      return new NullInputStream();
-    }
-
-    @Override
-    public String getInputArg(String argName) {
-      return null;
-    }
-
-    @Override
-    public Map<String, String> getInputArgs() {
-      return new HashMap<>();
-    }
-
-    @Override
-    public OutputStream openOutputFile(String pathname) {
-      return new NullOutputStream();
-    }
-
-    @Override
-    public OutputStream openOutputFile(String pathname, boolean append) {
-      return new NullOutputStream();
-    }
-
-    @Override
-    public void addOutputProperties(Map<String, Serializable> properties) {}
-
-    @Override
-    public Map<String, Serializable> getOutputProperties() {
-      return new HashMap<>();
-    }
-
-    @Override
-    public InputStream openInternalInputFile(String pathname) throws IOException {
-      return new NullInputStream();
-    }
-
-    @Override
-    public OutputStream openInternalOutputFile(String pathname) throws IOException {
-      return new NullOutputStream();
-    }
-
-    static class NullInputStream extends InputStream {
-      @Override
-      public int read() {
-        return -1;
-      }
-    }
-
-    static class NullOutputStream extends OutputStream {
-      @Override
-      public void write(int b) {}
-    }
-  }
 }
diff --git a/runner/monitor/java/androidx/test/platform/io/TestDirCalculator.kt b/runner/monitor/java/androidx/test/platform/io/TestDirCalculator.kt
new file mode 100644
index 000000000..1c1a82824
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/io/TestDirCalculator.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.io
+
+import android.os.Build
+import android.os.Environment
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import androidx.test.platform.app.InstrumentationRegistry
+import java.io.File
+
+/** @hide */
+// this should be just an internal class, but lint complains about accessing a kotlin internal class
+// from java
+@RestrictTo(Scope.LIBRARY)
+class TestDirCalculator {
+  val outputDir: File by lazy { calculateOutputDir() }
+  val inputDir: File by lazy { calculateInputDir() }
+
+  private fun calculateOutputDir(): File {
+    val additionalOutputTestDir =
+      InstrumentationRegistry.getArguments().getString("additionalTestOutputDir")
+    if (additionalOutputTestDir != null) {
+      return File(additionalOutputTestDir)
+    }
+
+    val rootdir = File(calculateDefaultRootDir(), "additionalTestOutputDir")
+
+    return rootdir
+  }
+
+  private fun calculateInputDir(): File {
+    val testInputDir = InstrumentationRegistry.getArguments().getString("testInputDir")
+    if (testInputDir != null) {
+      return File(testInputDir)
+    }
+
+    return File(calculateDefaultRootDir(), "testInputDir")
+  }
+
+  private fun calculateDefaultRootDir(): File {
+    val context = InstrumentationRegistry.getInstrumentation().targetContext
+    if (Build.VERSION.SDK_INT >= 29) {
+      // On Android Q+ first attempt to use the media directory because that is
+      // writable without any extra storage permissions
+      // https://developer.android.com/about/versions/11/privacy/storage
+      @Suppress("DEPRECATION")
+      for (mediaDir in context.externalMediaDirs) {
+        if (Environment.getExternalStorageState(mediaDir) == Environment.MEDIA_MOUNTED)
+          return mediaDir
+      }
+    }
+    // on older platforms or if media dir wasn't mounted try using the app's external cache dir
+    if (context.externalCacheDir != null) {
+      return context.externalCacheDir!!
+    }
+    // finally, fallback to cacheDir
+    return context.cacheDir
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/tracing/AndroidXTracer.java b/runner/monitor/java/androidx/test/platform/tracing/AndroidXTracer.java
new file mode 100644
index 000000000..fffe30ea7
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/tracing/AndroidXTracer.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.tracing;
+
+import static androidx.tracing.Trace.beginSection;
+import static androidx.tracing.Trace.endSection;
+import static androidx.tracing.Trace.forceEnableAppTracing;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.tracing.Trace;
+import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import java.util.ArrayDeque;
+
+/**
+ * AndroidX Tracing wrapper implementation of the Tracer API.
+ *
+ * <p>Registering this tracer does not guarantee trace collection as the underlying Android tracing
+ * feature has its own enabling logic. The Android tracing API depends on the runtime SDK API: <br>
+ * - Below API 18 (JB MR2), AndroidX Tracing is a no-op as the underlying feature did not exist.<br>
+ * - API 18 up to 28: Tracing is enabled by a call to {@link Trace#forceEnableAppTracing()}.<br>
+ * - API 29 or 30: Tracing can also be enabled via a manifest flag. <br>
+ * - API 31 and above: Tracing is enabled by default, unless it's disabled.
+ *
+ * <p>See details below in the AndroidX Tracing {@link Trace} documentation.
+ *
+ * <p>For API 18+, an instance of this wrapper is automatically created and registered in {@link
+ * Tracing}.
+ *
+ * @see <a
+ *     href="https://developer.android.com/reference/androidx/tracing/Trace">androidx.tracing.Trace</a>
+ */
+class AndroidXTracer implements Tracer {
+  private static final String TAG = AndroidXTracer.class.getSimpleName();
+
+  /** android.os.Trace.beginSection() has a limit on name length. */
+  private static final int MAX_SECTION_NAME_LEN = 127;
+
+  /** Enables tracing to systrace for devices with API 18-28. */
+  @CanIgnoreReturnValue
+  public AndroidXTracer enableTracing() {
+    try {
+      forceEnableAppTracing();
+    } catch (RuntimeException e) {
+      // The AndroidX call can fail if reflection is not allowed.
+      // We want to log the error yet we should not break any test in this case.
+      Log.e(TAG, "enableTracing failed", e);
+    } catch (NoSuchMethodError e) {
+      // This can occur if an androidx.tracing < 1.1.0 is put on classpath instead.
+      // See http://issuetracker.google.com/349628366).
+      // We want to log the error yet we should not break any test in this case.
+      Log.e(
+          TAG,
+          "enableTracing failed. "
+              + "You may need to upgrade your androidx.tracing:tracing version",
+          e);
+    }
+    return this;
+  }
+
+  @NonNull
+  @Override
+  public Span beginSpan(@NonNull String name) {
+    beginSection(sanitizeSpanName(name));
+    return new AndroidXTracerSpan();
+  }
+
+  private static class AndroidXTracerSpan implements Span {
+    private final ArrayDeque<AndroidXTracerSpan> nestedSpans = new ArrayDeque<>();
+
+    @NonNull
+    @Override
+    public Span beginChildSpan(@NonNull String name) {
+      beginSection(sanitizeSpanName(name));
+
+      AndroidXTracerSpan span = new AndroidXTracerSpan();
+      nestedSpans.add(span);
+      return span;
+    }
+
+    @Override
+    public void close() {
+      AndroidXTracerSpan span;
+      while ((span = nestedSpans.pollLast()) != null) {
+        span.close();
+      }
+
+      endSection();
+    }
+  }
+
+  /**
+   * android.os.Trace.beginSection() has a hard limit on the name length and throws if the name is
+   * too long. We shorten here with a warning if needed.
+   */
+  @NonNull
+  private static String sanitizeSpanName(@NonNull String name) {
+    if (name.length() > MAX_SECTION_NAME_LEN) {
+      Log.w(TAG, "Span name exceeds limits: " + name);
+      name = name.substring(0, MAX_SECTION_NAME_LEN);
+    }
+    return name;
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/tracing/Tracer.java b/runner/monitor/java/androidx/test/platform/tracing/Tracer.java
new file mode 100644
index 000000000..6bb70c9fa
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/tracing/Tracer.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.tracing;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import com.google.errorprone.annotations.MustBeClosed;
+import java.io.Closeable;
+
+/**
+ * {@link Tracer} provides an API implemented by wrappers around common tracing libraries, such as
+ * AndroidX Tracing. Tracer wrappers should be registered with {@link Tracing#registerTracer}.
+ *
+ * <p>A trace tracks the progression of various actions during testing. Each action is wrapped in a
+ * "span". A span starts when the {@link #beginSpan(String)} method is called and ends when the
+ * {@link Span#close()} method is called.
+ *
+ * <p>Traces are recursive. Within a specific span, nested spans are created by invoking {@link
+ * Span#beginChildSpan(String)} and end when a corresponding {@link Span#close()} method is called.
+ * Nested spans must be entirely constrained within their parent span.
+ *
+ * <p>The {@link Span} interface implements {@link Closeable} to encourage its use in a try-resource
+ * block and ensure that the {@link Span#close()} method is always properly called. Example of
+ * usage:
+ *
+ * <pre>
+ *   class MyCustomTracingLibraryTracer implements Tracer {}
+ *   Tracer tracer = new MyCustomTracingLibraryTracer();
+ *   Tracing.getInstance().registerTracer(tracer);
+ *   try(Span span = Tracing.getInstance().beginSpan("Some Action")) {
+ *     ...action to be traced...
+ *   }
+ * </pre>
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public interface Tracer {
+
+  /**
+   * Starts a new time span to track progression of some action.
+   *
+   * <p>The implementation must return a {@link Span} object which the caller must use later to
+   * close and end the span.
+   *
+   * @param name A name describing the action performed.
+   * @return A new span object that the caller must invoke later to close the span.
+   */
+  @NonNull
+  @MustBeClosed
+  Span beginSpan(@NonNull String name);
+
+  /**
+   * Span is a helper object denoting an ongoing time span and providing a way for the caller to
+   * close and end the span to record the end of the action being traced.
+   *
+   * <p>The Span interface implements {@link Closeable} to encourage its use in a try-resource block
+   * and ensure that the {@link #close()} method is always properly called.
+   */
+  interface Span extends Closeable {
+    /**
+     * Starts a new time span nested in a parent span, to track progression of some inner action.
+     *
+     * <p>The implementation must return a {@link Span} object which the caller must use later to
+     * close and end the span.
+     *
+     * <p>Multiple child spans can be created for the same parent span. It is expected that the
+     * child spans do not overlap.
+     *
+     * @param name A name describing the inner action performed.
+     * @return A new span object that the caller must invoke later to close the span.
+     */
+    @NonNull
+    @MustBeClosed
+    Span beginChildSpan(@NonNull String name);
+
+    /**
+     * Closes and ends this span.
+     *
+     * <p>Callers must not interact any further with this span.
+     */
+    @Override
+    void close();
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/tracing/Tracing.java b/runner/monitor/java/androidx/test/platform/tracing/Tracing.java
new file mode 100644
index 000000000..53ef89db2
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/tracing/Tracing.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.tracing;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.test.platform.tracing.Tracer.Span;
+import com.google.errorprone.annotations.MustBeClosed;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link Tracing} is a singleton to interact with registered {@link Tracer} implementations.
+ *
+ * <p>Support for actual tracing libraries is done by implementing wrappers following the {@link
+ * Tracer} interface. The actual {@link Tracer} implementations must be registered using {@link
+ * Tracing#registerTracer(Tracer)}.
+ *
+ * <p>The {@link Tracing} singleton is also an entry point used to create the root span for any
+ * tests by invoking the {@link #beginSpan(String)} method. The returned {@link Span} object must be
+ * properly closed by invoking the {@link Span#close()} method or wrapping them in a try-resource
+ * block.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public final class Tracing {
+  private static final String TAG = Tracing.class.getSimpleName();
+  private static final Tracing singleton = new Tracing();
+  private final List<Tracer> tracers = Collections.synchronizedList(new ArrayList<>());
+
+  private Tracing() {
+    registerTracer(new AndroidXTracer().enableTracing());
+  }
+
+  /**
+   * Static getter for external access to the singleton. <br>
+   * Preferred method for internal Espresso is getting this singleton via dagger injection.
+   */
+  @NonNull
+  public static Tracing getInstance() {
+    return singleton;
+  }
+
+  /**
+   * Registers a new tracer.
+   *
+   * <p>Once a tracer is registered, it starts being invoked for new root {@link #beginSpan(String)}
+   * calls. Existing in-flight spans do not invoke the new tracer.
+   *
+   * @param tracer A non-null Tracer object. A previously registered instance is ignored.
+   */
+  public void registerTracer(@NonNull Tracer tracer) {
+    checkNotNull(tracer, "Tracer cannot be null.");
+    if (tracers.contains(tracer)) {
+      Log.w(TAG, "Tracer already present: " + tracer.getClass());
+    } else {
+      Log.i(TAG, "Tracer added: " + tracer.getClass());
+      tracers.add(tracer);
+    }
+  }
+
+  /**
+   * Unregisters a tracer.
+   *
+   * <p>Once a tracer is unregistered, it will stop being invoked for any new root {@link
+   * #beginSpan(String)} calls made or any new {@link Span#beginChildSpan(String)}. However the
+   * tracer is still be called for any in-flight spans being closed.
+   *
+   * @param tracer A Tracer object. A null reference or non-registered instance is ignored.
+   */
+  public void unregisterTracer(Tracer tracer) {
+    tracers.remove(tracer);
+    Log.i(TAG, "Tracer removed: " + (tracer == null ? null : tracer.getClass()));
+  }
+
+  /**
+   * Returns a new Span as a managed resource in a try{} block. {@link Span#close()} is
+   * automatically called when the resource is released.
+   *
+   * @param name A non-null name describing this span.
+   */
+  @NonNull
+  @MustBeClosed
+  public Span beginSpan(@NonNull String name) {
+    checkNotNull(name);
+    Map<Tracer, Span> spans;
+    synchronized (tracers) {
+      spans = new HashMap<>(tracers.size());
+      for (Tracer tracer : tracers) {
+        spans.put(tracer, createUnmanagedSpan(tracer, name));
+      }
+    }
+    return new TracerSpan(spans);
+  }
+
+  /**
+   * TracerSpan is an internal implementation class of a parent span.
+   *
+   * <p>Each Tracer creates its own Span instance wrapping a specific trace event; TracerSpan keeps
+   * track of which Tracer creates which Span. <br>
+   * When creating child spans, only tracers involved in the original parent span are called if they
+   * are still registered.
+   */
+  class TracerSpan implements Span {
+    private final Map<Tracer, Span> spans;
+
+    private TracerSpan(@NonNull Map<Tracer, Span> spans) {
+      this.spans = spans;
+    }
+
+    /**
+     * Creates a child span for any tracer that participated in the parent span if that tracer is
+     * still registered.
+     */
+    @NonNull
+    @Override
+    public Span beginChildSpan(@NonNull String name) {
+      checkNotNull(name);
+      Map<Tracer, Span> childSpans;
+      synchronized (tracers) {
+        childSpans = new HashMap<>(tracers.size());
+        for (Tracer tracer : tracers) {
+          Span parentSpan = spans.get(tracer);
+          if (parentSpan != null) {
+            childSpans.put(tracer, createUnmanagedChildSpan(parentSpan, name));
+          }
+        }
+      }
+
+      return new TracerSpan(childSpans);
+    }
+
+    /** All spans are closed, even if the tracer has been unregistered in between. */
+    @Override
+    public void close() {
+      for (Span span : spans.values()) {
+        span.close();
+      }
+    }
+  }
+
+  /**
+   * Internal method to create a Span that does not enforce try-resource usage. Caller <em>must</em>
+   * manually call {@link Span#close()} later on the resource.
+   */
+  @SuppressWarnings("MustBeClosedChecker")
+  private static Span createUnmanagedSpan(Tracer tracer, String name) {
+    return tracer.beginSpan(name);
+  }
+
+  /**
+   * Internal method to create a Span that does not enforce try-resource usage. Caller <em>must</em>
+   * manually call {@link Span#close()} later on the resource.
+   */
+  @SuppressWarnings("MustBeClosedChecker")
+  private static Span createUnmanagedChildSpan(Span parentSpan, String name) {
+    return parentSpan.beginChildSpan(name);
+  }
+}
diff --git a/runner/monitor/java/androidx/test/platform/view/inspector/WindowInspectorCompat.java b/runner/monitor/java/androidx/test/platform/view/inspector/WindowInspectorCompat.java
new file mode 100644
index 000000000..3f39146b4
--- /dev/null
+++ b/runner/monitor/java/androidx/test/platform/view/inspector/WindowInspectorCompat.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.view.inspector;
+
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.view.View;
+import android.view.inspector.WindowInspector;
+import androidx.annotation.RestrictTo;
+import androidx.test.internal.platform.reflect.ReflectionException;
+import androidx.test.internal.platform.reflect.ReflectiveField;
+import androidx.test.internal.platform.reflect.ReflectiveMethod;
+import androidx.test.internal.util.Checks;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Compat class that supports {@link android.viee.inspector.WindowInspector} functionality on older
+ * Android SDKs.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP) // currently used by core, consider making public
+public class WindowInspectorCompat {
+
+  // type WindowManagerGlobal
+  private static final ReflectiveMethod<Object> getWindowManagerGlobalReflectiveCall =
+      new ReflectiveMethod<>("android.view.WindowManagerGlobal", "getInstance");
+
+  private static final ReflectiveField<List<View>> windowViewsReflectiveField =
+      new ReflectiveField<>("android.view.WindowManagerGlobal", "mViews");
+
+  /**
+   * Thrown when there is a failure retrieving window views.
+   *
+   * <p>This should only occur if the device does not support the view retrieval mechanism used on
+   * used on APIs < 29, before WindowInspector existed.
+   *
+   * @hide
+   */
+  @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+  public static class ViewRetrievalException extends Exception {
+
+    ViewRetrievalException(Throwable cause) {
+      super("failed to retrieve window views", cause);
+    }
+  }
+
+  private WindowInspectorCompat() {}
+
+  /**
+   * Retrieves the list of window views attached to the current process.
+   *
+   * <p>On APIs 29 and above, this will call through to {@link
+   * WindowInspector#getGlobalWindowViews()}. On older APIs, this will make a best effort attempt to
+   * retrieve the window views.
+   *
+   * <p>Must be called from UI thread.
+   *
+   * @return the list of window Views
+   * @throws IllegalStateException if called from a non-UI thread. ViewRetrievalException if views
+   *     could not be retrieved.
+   */
+  public static List<View> getGlobalWindowViews() throws ViewRetrievalException {
+    Checks.checkMainThread();
+
+    if (VERSION.SDK_INT >= VERSION_CODES.Q) {
+      return WindowInspector.getGlobalWindowViews();
+    } else {
+      try {
+        return getViews(getWindowManager());
+      } catch (ReflectionException e) {
+        throw new ViewRetrievalException(e.getCause());
+      }
+    }
+  }
+
+  private static Object getWindowManager() throws ReflectionException {
+    return getWindowManagerGlobalReflectiveCall.invokeStatic();
+  }
+
+  private static List<View> getViews(Object windowManagerGlobal) throws ReflectionException {
+    return new ArrayList<>(windowViewsReflectiveField.get(windowManagerGlobal));
+  }
+}
diff --git a/runner/monitor/java/androidx/test/proguard_library.cfg b/runner/monitor/java/androidx/test/proguard_library.cfg
index 96829bb9c..514448532 100644
--- a/runner/monitor/java/androidx/test/proguard_library.cfg
+++ b/runner/monitor/java/androidx/test/proguard_library.cfg
@@ -8,3 +8,6 @@
 
 # for 'can't find referenced method 'android.app.Instrumentation$ActivityResult execStartActivity' etc
 -dontwarn androidx.test.runner.MonitoringInstrumentation
+
+# for class com.google.errorprone.annotations.InlineMe is not in the runtime classpath
+-dontwarn com.google.errorprone.annotations.InlineMe
\ No newline at end of file
diff --git a/runner/monitor/java/androidx/test/release_jarjar_rules.txt b/runner/monitor/java/androidx/test/release_jarjar_rules.txt
deleted file mode 100644
index 5ff0bcde2..000000000
--- a/runner/monitor/java/androidx/test/release_jarjar_rules.txt
+++ /dev/null
@@ -1 +0,0 @@
-rule com.google.android.aidl.** androidx.test.runner.internal.deps.aidl.@1
\ No newline at end of file
diff --git a/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java b/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java
index 10d001faa..c7814fee0 100644
--- a/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java
+++ b/runner/monitor/java/androidx/test/runner/MonitoringInstrumentation.java
@@ -27,15 +27,15 @@
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.os.Build.VERSION;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.MessageQueue.IdleHandler;
+import android.os.PersistableBundle;
 import android.os.UserHandle;
-import androidx.annotation.Nullable;
 import android.util.Log;
+import androidx.annotation.Nullable;
 import androidx.test.internal.platform.app.ActivityLifecycleTimeout;
 import androidx.test.internal.runner.InstrumentationConnection;
 import androidx.test.internal.runner.hidden.ExposedInstrumentationApi;
@@ -45,6 +45,7 @@
 import androidx.test.internal.runner.lifecycle.ApplicationLifecycleMonitorImpl;
 import androidx.test.internal.util.Checks;
 import androidx.test.internal.util.ProcSummary;
+import androidx.test.platform.app.AppComponentFactoryRegistry;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.intent.IntentMonitorRegistry;
 import androidx.test.runner.intent.IntentStubberRegistry;
@@ -53,6 +54,7 @@
 import androidx.test.runner.lifecycle.ApplicationLifecycleMonitorRegistry;
 import androidx.test.runner.lifecycle.ApplicationStage;
 import androidx.test.runner.lifecycle.Stage;
+import androidx.tracing.Trace;
 import java.io.File;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.lang.reflect.InvocationTargetException;
@@ -140,16 +142,18 @@ public boolean queueIdle() {
    * Does initialization before creating the application.
    *
    * <p>Note, {@link #newApplication(ClassLoader, String, Context)} is called before {@link
-   * #onCreate(Bundle)} on API > 15. For API <= 15, {@link #onCreate(Bundle)} is called first.
+   * #onCreate(Bundle)}.
    */
   @Override
   public Application newApplication(ClassLoader cl, String className, Context context)
       throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-    Log.i(TAG, "newApplication called!");
-    if (VERSION.SDK_INT >= 16) {
-      // On API <= 15, initialization should have been called in #onCreate().
-      installMultidexAndExceptionHandler();
+    installExceptionHandler();
+
+    Application application = AppComponentFactoryRegistry.instantiateApplication(cl, className);
+    if (application != null) {
+      return application;
     }
+
     return super.newApplication(cl, className, context);
   }
 
@@ -161,12 +165,6 @@ public Application newApplication(ClassLoader cl, String className, Context cont
    */
   @Override
   public void onCreate(Bundle arguments) {
-    Log.i(TAG, "Instrumentation started!");
-    if (VERSION.SDK_INT <= 15) {
-      // On API level <= 15, #onCreate is called earlier than #newApplication. We should install
-      // Multidex and register the uncaught exception handler here.
-      installMultidexAndExceptionHandler();
-    }
     InstrumentationRegistry.registerInstance(this, arguments);
     androidx.test.InstrumentationRegistry.registerInstance(this, arguments);
     ActivityLifecycleMonitorRegistry.registerInstance(lifecycleMonitor);
@@ -198,55 +196,18 @@ public Thread newThread(Runnable runnable) {
     useDefaultInterceptingActivityFactory();
   }
 
-  protected void installMultidex() {
-    // Typically multidex is installed by inserting call at Application#attachBaseContext
-    // However instrumentation#onCreate is called before Application#attachBaseContext. Thus
-    // need to install it here, if its on classpath.
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-      try {
-        Class<?> multidex = getMultiDexClass();
-        try {
-          Method installInstrumentation =
-              multidex.getDeclaredMethod("installInstrumentation", Context.class, Context.class);
-          installInstrumentation.invoke(null, getContext(), getTargetContext());
-        } catch (NoSuchMethodException nsme) {
-          Log.w(
-              TAG,
-              "Could not find MultiDex.installInstrumentation. Calling MultiDex.install instead."
-                  + " Is an old version of the multidex library being used? If test app is using"
-                  + " multidex, classes might not be found");
-          installOldMultiDex(multidex);
-        }
-      } catch (ClassNotFoundException ignored) {
-        Log.i(TAG, "No multidex.");
-      } catch (NoSuchMethodException nsme) {
-        Log.i(TAG, "No multidex.", nsme);
-      } catch (InvocationTargetException ite) {
-        throw new RuntimeException("multidex is available at runtime, but calling it failed.", ite);
-      } catch (IllegalAccessException iae) {
-        throw new RuntimeException("multidex is available at runtime, but calling it failed.", iae);
-      }
-    }
-  }
-
-  private static Class<?> getMultiDexClass() throws ClassNotFoundException {
-    try {
-      return Class.forName("androidx.multidex.MultiDex");
-    } catch (ClassNotFoundException e) {
-      // check for support multidex
-      return Class.forName("androidx.multidex.MultiDex");
-    }
-  }
+  /**
+   * @deprecated no-op: multidex is not necessary on SDKS >= 23
+   */
+  @Deprecated
+  protected void installMultidex() {}
 
   /**
-   * Perform application MultiDex installation only when instrumentation installation is not
-   * available. Called when MultiDex class is available but MultiDex.installInstrumentation is not.
+   * @deprecated no-op: multidex is not necessary on SDKS >= 23
    */
+  @Deprecated
   protected void installOldMultiDex(Class<?> multidexClass)
-      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
-    Method install = multidexClass.getDeclaredMethod("install", Context.class);
-    install.invoke(null, getTargetContext());
-  }
+      throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {}
 
   protected void specifyDexMakerCacheProperty() {
     // DexMaker uses heuristics to figure out where to store its temporary dex files
@@ -293,10 +254,7 @@ private void setupDexmakerClassloader() {
     isDexmakerClassLoaderInitialized.set(Boolean.TRUE);
   }
 
-  private void installMultidexAndExceptionHandler() {
-    // Multidex must be installed early otherwise we could call into code that has
-    // landed in a different dex split.
-    installMultidex();
+  private void installExceptionHandler() {
     // App could crash even before #onCreate(Bundle) method is called, e.g. during installing
     // content providers.
     // Registers a custom uncaught exception handler to shuttle back the exception to the
@@ -315,16 +273,7 @@ public void uncaughtException(Thread t, Throwable e) {
                 String.format(
                     "Handling an uncaught exception thrown on the thread %s.", t.getName()),
                 e);
-            if (VERSION.SDK_INT == 18
-                && e instanceof SecurityException
-                && e.getMessage().equals("Calling from not trusted UID!")) {
-              Log.d(
-                  TAG,
-                  "Catching and ignoring SecurityException: Calling from not trusted UID!, as"
-                      + " this is an android platform bug on API 18 - b/10930931.");
-            } else {
-              onException(t, e);
-            }
+            onException(t, e);
             if (null != oldDefaultExceptionHandler) {
               Log.w(
                   TAG,
@@ -408,15 +357,16 @@ public void finish(int resultCode, Bundle results) {
       finished = true;
     }
 
+    Trace.beginSection("MonitoringInstrumentation#finish");
     if (shouldWaitForActivitiesToComplete()) {
       handlerForMainLooper.post(new ActivityFinisher());
-      long startTime = System.currentTimeMillis();
       waitForActivitiesToComplete();
-      long endTime = System.currentTimeMillis();
-      Log.i(TAG, String.format("waitForActivitiesToComplete() took: %sms", endTime - startTime));
     }
     ActivityLifecycleMonitorRegistry.registerInstance(null);
     restoreUncaughtExceptionHandler();
+    Trace.endSection();
+
+    // super.finish kills the current process, so this needs to be called last
     super.finish(resultCode, results);
   }
 
@@ -633,6 +583,12 @@ public ActivityResult execStartActivity(
       int requestCode,
       Bundle options,
       UserHandle user) {
+    intentMonitor.signalIntent(intent);
+    ActivityResult ar = stubResultFor(intent);
+    if (ar != null) {
+      Log.i(TAG, String.format("Stubbing intent %s", intent));
+      return ar;
+    }
     return super.execStartActivity(
         who, contextThread, token, target, intent, requestCode, options, user);
   }
@@ -646,7 +602,7 @@ public void execStartActivities(
       Activity target,
       Intent[] intents,
       Bundle options) {
-    // This method is used in HONEYCOMB and higher to create a synthetic back stack for the
+    // This method is used to create a synthetic back stack for the
     // launched activity. The intent at the end of the array is the top most, user visible
     // activity, and the intents beneath it are launched when the user presses back.
     Log.d(TAG, "execStartActivities(context, ibinder, ibinder, activity, intent[], bundle)");
@@ -703,8 +659,16 @@ private ActivityResult stubResultFor(Intent intent) {
         try {
           return task.get();
         } catch (ExecutionException e) {
-          throw new RuntimeException(
-              String.format("Could not retrieve stub result for intent %s", intent), e);
+          String msg = String.format("Could not retrieve stub result for intent %s", intent);
+          // try to preserve original exception
+          if (e.getCause() instanceof RuntimeException) {
+            Log.w(TAG, msg, e);
+            throw (RuntimeException) e.getCause();
+          } else if (e.getCause() != null) {
+            throw new RuntimeException(msg, e.getCause());
+          } else {
+            throw new RuntimeException(msg, e);
+          }
         } catch (InterruptedException e) {
           Thread.currentThread().interrupt();
           throw new RuntimeException(e);
@@ -770,6 +734,14 @@ public void callActivityOnCreate(Activity activity, Bundle bundle) {
     lifecycleMonitor.signalLifecycleChange(Stage.CREATED, activity);
   }
 
+  @Override
+  public void callActivityOnCreate(
+      Activity activity, Bundle bundle, PersistableBundle persistentState) {
+    lifecycleMonitor.signalLifecycleChange(Stage.PRE_ON_CREATE, activity);
+    super.callActivityOnCreate(activity, bundle, persistentState);
+    lifecycleMonitor.signalLifecycleChange(Stage.CREATED, activity);
+  }
+
   // NOTE: we need to keep a count of activities between the start
   // and stop lifecycle internal to our instrumentation. Exiting the test
   // process with activities in this state can cause crashes/flakiness
@@ -851,9 +823,16 @@ public Activity newActivity(
   @Override
   public Activity newActivity(ClassLoader cl, String className, Intent intent)
       throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-    return interceptingActivityFactory.shouldIntercept(cl, className, intent)
-        ? interceptingActivityFactory.create(cl, className, intent)
-        : super.newActivity(cl, className, intent);
+    if (interceptingActivityFactory.shouldIntercept(cl, className, intent)) {
+      return interceptingActivityFactory.create(cl, className, intent);
+    }
+
+    Activity activity = AppComponentFactoryRegistry.instantiateActivity(cl, className, intent);
+    if (activity != null) {
+      return activity;
+    }
+
+    return super.newActivity(cl, className, intent);
   }
 
   /**
@@ -896,11 +875,16 @@ public void run() {
               Method install = jsBridge.getDeclaredMethod("installBridge");
               install.invoke(null);
               isJsBridgeLoaded.set(true);
-            } catch (ClassNotFoundException | NoSuchMethodException ignored) {
-              Log.i(TAG, "No JSBridge.");
-            } catch (InvocationTargetException | IllegalAccessException ite) {
+            } catch (ClassNotFoundException ignored) {
+              // ignore
+            } catch (NoSuchMethodException ignored) {
+              // ignore
+            } catch (InvocationTargetException ite) {
               throw new RuntimeException(
                   "JSbridge is available at runtime, but calling it failed.", ite);
+            } catch (IllegalAccessException iae) {
+              throw new RuntimeException(
+                  "JSbridge is available at runtime, but calling it failed.", iae);
             }
           }
         });
@@ -919,10 +903,6 @@ public void run() {
         activities.addAll(lifecycleMonitor.getActivitiesInStage(s));
       }
 
-      if (activities.size() > 0) {
-        Log.i(TAG, "Activities that are still in CREATED to STOPPED: " + activities.size());
-      }
-
       for (Activity activity : activities) {
         if (!activity.isFinishing()) {
           try {
diff --git a/runner/monitor/java/androidx/test/runner/intercepting/InterceptingActivityFactory.java b/runner/monitor/java/androidx/test/runner/intercepting/InterceptingActivityFactory.java
index 54ec71347..ce5b9295d 100644
--- a/runner/monitor/java/androidx/test/runner/intercepting/InterceptingActivityFactory.java
+++ b/runner/monitor/java/androidx/test/runner/intercepting/InterceptingActivityFactory.java
@@ -21,11 +21,14 @@
 
 /**
  * Implement this interface to provide custom implementation of Activity under test. It is used by
- * {@link androidx.test.runner.MonitoringInstrumentation#newActivity(ClassLoader, String,
- * Intent)} to create instance of the activity under test. Please see {@link
+ * {@link androidx.test.runner.MonitoringInstrumentation#newActivity(ClassLoader, String, Intent)}
+ * to create instance of the activity under test. Please see {@link
  * androidx.test.runner.MonitoringInstrumentation#interceptActivityUsing(InterceptingActivityFactory)}
  * for more details.
+ *
+ * @deprecated use {@link androidx.test.ext.junit.rules.AppComponentFactoryRule} instead.
  */
+@Deprecated
 public interface InterceptingActivityFactory {
 
   /**
diff --git a/runner/monitor/javatests/androidx/test/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/AndroidManifest.xml
deleted file mode 100644
index ee8db20d3..000000000
--- a/runner/monitor/javatests/androidx/test/AndroidManifest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest
-    package="androidx.test.monitor.tests"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="28"/>
-
-    <application android:label="AndroidJUnitRunner">
-        <uses-library android:name="android.test.runner"/>
-    </application>
-
-    <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="androidx.test.monitor.tests">
-    </instrumentation>
-
-</manifest>
-
diff --git a/runner/monitor/javatests/androidx/test/BUILD b/runner/monitor/javatests/androidx/test/BUILD
new file mode 100644
index 000000000..b25dd5a76
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/BUILD
@@ -0,0 +1,28 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+axt_android_library_test(
+    name = "InstrumentationRegistryTest",
+    srcs = ["InstrumentationRegistryTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/BUILD.bazel b/runner/monitor/javatests/androidx/test/BUILD.bazel
deleted file mode 100644
index 0f3102a4c..000000000
--- a/runner/monitor/javatests/androidx/test/BUILD.bazel
+++ /dev/null
@@ -1,59 +0,0 @@
-# Description: Monitor
-
-load(
-    "//build_extensions:android_library_instrumentation_tests.bzl",
-    "android_library_instrumentation_tests",
-)
-load(
-    "//build_extensions:android_library_local_tests.bzl",
-    "android_library_local_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library_local_tests(
-    name = "monitor_robolectric_tests",
-    srcs = ["internal/util/LogUtilsTest.java"],
-    deps = [
-        "//runner/monitor",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_robolectric_shadows_framework",
-    ],
-)
-
-android_library_instrumentation_tests(
-    name = "monitor_tests",
-    srcs = glob(
-        ["**/*.java"],
-        exclude = [
-            "internal/util/LogUtilsTest.java",
-        ],
-    ),
-    target_devices = devices(),
-    deps = [
-        "//:androidx_annotation",
-        "//core",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/monitor",
-        "//runner/monitor/javatests/androidx/test/internal/platform:fixtures",
-        "//runner/rules",
-        "//services/storage",
-        "@maven//:com_google_truth_truth",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/runner/monitor/javatests/androidx/test/internal/platform/BUILD b/runner/monitor/javatests/androidx/test/internal/platform/BUILD
new file mode 100644
index 000000000..b002dd2b7
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/platform/BUILD
@@ -0,0 +1,49 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load("//build_extensions:java_service_map.bzl", "java_service_map")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+android_library(
+    name = "fixtures",
+    srcs = [
+        "ServiceFixture.java",
+        "ServiceFixtureImpl.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+    ],
+)
+
+java_service_map(
+    name = "fixture_map",
+    providers = {
+        "androidx.test.internal.platform.ServiceFixture": [
+            "androidx.test.internal.platform.ServiceFixtureImpl",
+        ],
+    },
+)
+
+axt_android_library_test(
+    name = "ServiceLoaderWrapperTest",
+    srcs = ["ServiceLoaderWrapperTest.java"],
+    tags = [
+        # "blaze coverage" fails with StrictMode violations.
+        "nozapfhahn",
+    ],
+    deps = [
+        ":fixture_map",  # buildcleaner: keep
+        ":fixtures",  # buildcleaner: keep
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/internal/platform/BUILD.bazel b/runner/monitor/javatests/androidx/test/internal/platform/BUILD.bazel
deleted file mode 100644
index 428cceba1..000000000
--- a/runner/monitor/javatests/androidx/test/internal/platform/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-android_library(
-    name = "fixtures",
-    srcs = [
-        "ServiceFixture.java",
-        "ServiceFixtureImpl.java",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-    ],
-)
diff --git a/runner/monitor/javatests/androidx/test/internal/platform/reflect/BUILD b/runner/monitor/javatests/androidx/test/internal/platform/reflect/BUILD
new file mode 100644
index 000000000..405aadef5
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/platform/reflect/BUILD
@@ -0,0 +1,35 @@
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+axt_android_library_test(
+    name = "ReflectiveFieldTest",
+    srcs = ["ReflectiveFieldTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ReflectiveMethodTest",
+    srcs = ["ReflectiveMethodTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/internal/platform/reflect/ReflectiveFieldTest.java b/runner/monitor/javatests/androidx/test/internal/platform/reflect/ReflectiveFieldTest.java
new file mode 100644
index 000000000..0863df746
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/platform/reflect/ReflectiveFieldTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.internal.platform.reflect;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit tests for {@link ReflectiveField}. */
+@RunWith(AndroidJUnit4.class)
+public class ReflectiveFieldTest {
+
+  private static class Fixture {
+    private final int someField = 42;
+  }
+
+  @Test
+  public void get() throws ReflectionException {
+    Fixture f = new Fixture();
+    int value = new ReflectiveField<Integer>(f.getClass().getName(), "someField").get(f);
+    assertThat(value).isEqualTo(42);
+  }
+
+  @Test
+  public void get_withClass() throws ReflectionException {
+    Fixture f = new Fixture();
+    int value = new ReflectiveField<Integer>(f.getClass(), "someField").get(f);
+    assertThat(value).isEqualTo(42);
+  }
+
+  @Test
+  public void get_nonExistent() {
+    assertThrows(
+        ReflectionException.class,
+        () ->
+            new ReflectiveField<Integer>(Fixture.class.getName(), "someMissingField")
+                .get(new Fixture()));
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/internal/platform/reflect/ReflectiveMethodTest.java b/runner/monitor/javatests/androidx/test/internal/platform/reflect/ReflectiveMethodTest.java
new file mode 100644
index 000000000..e66283c1e
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/platform/reflect/ReflectiveMethodTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.internal.platform.reflect;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Unit tests for {@link ReflectiveMethod}. */
+@RunWith(AndroidJUnit4.class)
+public class ReflectiveMethodTest {
+
+  private static class Fixture {
+    private int someMethod() {
+      return 42;
+    }
+
+    private static int someStaticMethod() {
+      return 43;
+    }
+
+    private int someMethod(int i) {
+      return i + 42;
+    }
+
+    private static int someStaticMethod(int i) {
+      return i + 43;
+    }
+  }
+
+  @Test
+  public void invoke() throws ReflectionException {
+    Fixture f = new Fixture();
+    int value = new ReflectiveMethod<Integer>(f.getClass().getName(), "someMethod").invoke(f);
+    assertThat(value).isEqualTo(42);
+  }
+
+  @Test
+  public void invoke_withClass() throws ReflectionException {
+    Fixture f = new Fixture();
+    int value = new ReflectiveMethod<Integer>(f.getClass(), "someMethod").invoke(f);
+    assertThat(value).isEqualTo(42);
+  }
+
+  @Test
+  public void invokeStatic() throws ReflectionException {
+    int value =
+        new ReflectiveMethod<Integer>(Fixture.class.getName(), "someStaticMethod").invokeStatic();
+    assertThat(value).isEqualTo(43);
+  }
+
+  @Test
+  public void invoke_params() throws ReflectionException {
+    Fixture f = new Fixture();
+    int value =
+        new ReflectiveMethod<Integer>(f.getClass().getName(), "someMethod", int.class).invoke(f, 5);
+    assertThat(value).isEqualTo(47);
+  }
+
+  @Test
+  public void invokeStatic_params() throws ReflectionException {
+    int value =
+        new ReflectiveMethod<Integer>(Fixture.class.getName(), "someStaticMethod", int.class)
+            .invokeStatic(5);
+    assertThat(value).isEqualTo(48);
+  }
+
+  @Test
+  public void invokeStatic_nonExistent() {
+    assertThrows(
+        ReflectionException.class,
+        () ->
+            new ReflectiveMethod<Integer>(
+                    Fixture.class.getName(), "someMethod", int.class, boolean.class)
+                .invokeStatic());
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/internal/platform/util/BUILD b/runner/monitor/javatests/androidx/test/internal/platform/util/BUILD
new file mode 100644
index 000000000..62b69d35a
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/platform/util/BUILD
@@ -0,0 +1,22 @@
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+axt_android_library_test(
+    name = "InstrumentationParameterUtilTest",
+    srcs = ["InstrumentationParameterUtilTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/internal/runner/BUILD b/runner/monitor/javatests/androidx/test/internal/runner/BUILD
new file mode 100644
index 000000000..959cea579
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/runner/BUILD
@@ -0,0 +1,26 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "InstrumentationConnectionTest",
+    srcs = ["InstrumentationConnectionTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/internal/util/BUILD b/runner/monitor/javatests/androidx/test/internal/util/BUILD
new file mode 100644
index 000000000..89df3bd7d
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/internal/util/BUILD
@@ -0,0 +1,22 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "LogUtilsTest",
+    srcs = ["LogUtilsTest.java"],
+    deps = [
+        "//runner/monitor",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/app/AppComponentFactoryRegistryTest.kt b/runner/monitor/javatests/androidx/test/platform/app/AppComponentFactoryRegistryTest.kt
new file mode 100644
index 000000000..4528f8f4c
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/app/AppComponentFactoryRegistryTest.kt
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.app
+
+import android.app.Activity
+import android.app.AppComponentFactory
+import android.app.Application
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.annotation.Config
+
+@RunWith(AndroidJUnit4::class)
+@SmallTest
+class AppComponentFactoryRegistryTest {
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldReturnNullIfAppComponentHasNotBeenSet() {
+    assertThat(AppComponentFactoryRegistry.appComponentFactory).isNull()
+  }
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldSetFactoryIfVersionCodeIsGreaterOrEqualThan28() {
+    with(AppComponentFactoryRegistry) {
+      appComponentFactory = AppComponentFactory()
+      assertThat(appComponentFactory).isNotNull()
+    }
+  }
+
+  @Test(expected = IllegalStateException::class)
+  @Config(maxSdk = 27)
+  fun shouldThrowIfVersionCodeIsSmallerThan28WhenAppComponentIsSet() {
+    with(AppComponentFactoryRegistry) {
+      appComponentFactory = AppComponentFactory()
+    }
+  }
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldNotInstantiateActivityIfFactoryNotSet() {
+    with(AppComponentFactoryRegistry) {
+      val activity = instantiateActivity(
+        cl = javaClass.classLoader,
+        className = TestActivity::class.java.name,
+        intent = null,
+      )
+      assertThat(activity).isNull()
+    }
+  }
+
+  @Test
+  @Config(maxSdk = 27)
+  fun shouldNotInstantiateActivityIfFactorySetButVersionCodeSmallerThan28() {
+    with(AppComponentFactoryRegistry) {
+      appComponentFactory = AppComponentFactory()
+
+      val activity =
+        instantiateActivity(
+          cl = javaClass.classLoader,
+          className = TestActivity::class.java.name,
+          intent = null,
+        )
+
+      assertThat(activity).isNull()
+    }
+  }
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldInstantiateActivityIfFactoryIsSetAndVersionCodeIsGraterOrEqualThan28() {
+    with(AppComponentFactoryRegistry) {
+      appComponentFactory = AppComponentFactory()
+
+      val activity =
+        instantiateActivity(
+          cl = javaClass.classLoader,
+          className = TestActivity::class.java.name,
+          intent = null,
+        )
+
+      assertThat(activity).isInstanceOf(TestActivity::class.java)
+    }
+  }
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldNotInstantiateApplicationIfFactoryNotSet() {
+    with(AppComponentFactoryRegistry) {
+      val activity =
+        instantiateApplication(
+          cl = javaClass.classLoader,
+          className = TestApplication::class.java.name,
+        )
+
+      assertThat(activity).isNull()
+    }
+  }
+
+  @Test
+  @Config(maxSdk = 27)
+  fun shouldNotInstantiateApplicationIfFactorySetButVersionCodeSmallerThan28() {
+    with(AppComponentFactoryRegistry) {
+      appComponentFactory = AppComponentFactory()
+
+      val activity =
+        instantiateApplication(
+          cl = javaClass.classLoader,
+          className = TestApplication::class.java.name,
+        )
+
+      assertThat(activity).isNull()
+    }
+  }
+
+  @Test
+  @Config(minSdk = 28)
+  fun shouldInstantiateApplicationIfFactoryIsSetAndVersionCodeIsGraterOrEqualThan28() {
+    with(AppComponentFactoryRegistry) {
+      appComponentFactory = AppComponentFactory()
+
+      val activity =
+        instantiateApplication(
+          cl = javaClass.classLoader,
+          className = TestApplication::class.java.name,
+        )
+
+      assertThat(activity).isInstanceOf(TestApplication::class.java)
+    }
+  }
+
+  private class TestActivity : Activity()
+
+  private class TestApplication : Application()
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/app/BUILD b/runner/monitor/javatests/androidx/test/platform/app/BUILD
new file mode 100644
index 000000000..4eee02f8d
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/app/BUILD
@@ -0,0 +1,29 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "InstrumentationRegistryTest",
+    srcs = ["InstrumentationRegistryTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/graphics/BUILD b/runner/monitor/javatests/androidx/test/platform/graphics/BUILD
new file mode 100644
index 000000000..bff979c80
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/graphics/BUILD
@@ -0,0 +1,55 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:phone_devices.bzl",
+    "apis",
+    "devices",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+licenses(["notice"])
+
+# HardwareRendererCompatRenderingDisabledTest needs a separate rule, since it only
+# runs on slim image
+axt_android_library_test(
+    name = "HardwareRendererCompatRenderingDisabledTest",
+    srcs = ["HardwareRendererCompatRenderingDisabledTest.java"],
+    # only run on slim image
+    device_list = devices(
+        [30],
+        use_slim = True,
+    ),
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "HardwareRendererCompatUnsupportedTest",
+    srcs = ["HardwareRendererCompatUnsupportedTest.java"],
+    device_list = devices(apis(max_api = 29)),
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatRenderingDisabledTest.java b/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatRenderingDisabledTest.java
index e3c0784f0..64d1a97b9 100644
--- a/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatRenderingDisabledTest.java
+++ b/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatRenderingDisabledTest.java
@@ -38,11 +38,4 @@ public void setDrawingEnabled() {
     HardwareRendererCompat.setDrawingEnabled(false);
     assertThat(HardwareRendererCompat.isDrawingEnabled()).isFalse();
   }
-
-  @Test
-  public void enableDrawingIfNecessary() {
-    assertThat(HardwareRendererCompat.enableDrawingIfNecessary()).isFalse();
-    assertThat(HardwareRendererCompat.isDrawingEnabled()).isTrue();
-    HardwareRendererCompat.setDrawingEnabled(false);
-  }
 }
diff --git a/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatUnsupportedTest.java b/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatUnsupportedTest.java
index c903c3ba1..b5d6a7406 100644
--- a/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatUnsupportedTest.java
+++ b/runner/monitor/javatests/androidx/test/platform/graphics/HardwareRendererCompatUnsupportedTest.java
@@ -35,10 +35,4 @@ public void setDrawingEnabled() {
     // verify ignored
     assertThat(HardwareRendererCompat.isDrawingEnabled()).isTrue();
   }
-
-  @Test
-  public void enableDrawingIfNecessary() {
-    assertThat(HardwareRendererCompat.enableDrawingIfNecessary()).isTrue();
-    assertThat(HardwareRendererCompat.isDrawingEnabled()).isTrue();
-  }
 }
diff --git a/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml
new file mode 100644
index 000000000..fbf9c0f63
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/io/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.monitor.tests"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34"/>
+
+    <application android:label="AndroidJUnitRunner">
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation
+      android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="androidx.test.monitor.tests">
+    </instrumentation>
+
+</manifest>
+
diff --git a/runner/monitor/javatests/androidx/test/platform/io/BUILD b/runner/monitor/javatests/androidx/test/platform/io/BUILD
new file mode 100644
index 000000000..cd084dced
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/io/BUILD
@@ -0,0 +1,45 @@
+# Description: Monitor
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "PlatformTestStorageRegistryTest",
+    srcs = ["PlatformTestStorageRegistryTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/monitor",
+        "//runner/monitor/javatests/androidx/test/internal/platform:fixtures",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "//runner/rules",
+        "//services/storage",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+android_library(
+    name = "storage_test_assets",
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    manifest = "AndroidManifest.xml",
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/io/FileTestStorageTest.kt b/runner/monitor/javatests/androidx/test/platform/io/FileTestStorageTest.kt
new file mode 100644
index 000000000..199232bb6
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/io/FileTestStorageTest.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.io
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import java.io.BufferedReader
+import java.io.BufferedWriter
+import java.io.FileNotFoundException
+import java.io.InputStreamReader
+import java.io.OutputStreamWriter
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class FileTestStorageTest {
+
+  @Test
+  fun readNonExistentInputFile() {
+    val storage = FileTestStorage()
+    assertThrows(FileNotFoundException::class.java) { storage.openInputFile("not/here") }
+  }
+
+  /**
+   * Simple test for writing a file. Should be executed on every Android API to test for
+   * incompatibilities.
+   */
+  @Test
+  fun writeFile() {
+    val storage = FileTestStorage()
+    BufferedWriter(OutputStreamWriter(storage.openOutputFile("testcontent.txt"))).use {
+      it.write("test content\n")
+    }
+  }
+
+  @Test
+  fun inputArg() {
+    val storage = FileTestStorage()
+    assertThat(storage.getInputArg("thisisanarg")).isEqualTo("hi")
+  }
+
+  @Test
+  fun inputFile() {
+    val storage = FileTestStorage()
+
+    BufferedReader(InputStreamReader(storage.openInputFile("testinput.txt"))).use {
+      assertThat(it.readText().trim()).isEqualTo("Hi I'm an input file")
+    }
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/io/assets/testinput.txt b/runner/monitor/javatests/androidx/test/platform/io/assets/testinput.txt
new file mode 100644
index 000000000..ebcf4008c
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/io/assets/testinput.txt
@@ -0,0 +1 @@
+Hi I'm an input file
diff --git a/runner/monitor/javatests/androidx/test/platform/tracing/AndroidXTracerTest.java b/runner/monitor/javatests/androidx/test/platform/tracing/AndroidXTracerTest.java
new file mode 100644
index 000000000..0afe983f1
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/tracing/AndroidXTracerTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.tracing;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.platform.tracing.Tracer.Span;
+import androidx.tracing.Trace;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.shadows.ShadowTrace;
+
+/** Unit test for {@link AndroidXTracer}. */
+@RunWith(RobolectricTestRunner.class)
+public class AndroidXTracerTest {
+
+  @Before
+  public void setUp() throws Exception {
+    ShadowTrace.setEnabled(true);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    ShadowTrace.reset();
+  }
+
+  // Validates the current Robolectric test is configured with an SDK level that
+  // actually captures AndroidX tracing sessions. JB MR2 (API 18) or + is required.
+  @Test
+  public void validateSdkUsesAndroidXTracingSession() {
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections()).isEmpty();
+
+    Trace.beginSection("RootSection");
+
+    assertThat(ShadowTrace.getCurrentSections()).containsExactly("RootSection");
+    assertThat(ShadowTrace.getPreviousSections()).isEmpty();
+
+    // Sections can be nested. Sections are recorded by the shadow when they are closed,
+    // which essentially reverses the order in the assertion check below.
+    Trace.beginSection("NestedSection");
+    Trace.endSection();
+    Trace.endSection();
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections())
+        .containsExactly("NestedSection", "RootSection")
+        .inOrder();
+  }
+
+  @Test
+  public void beginSpan() {
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections()).isEmpty();
+
+    AndroidXTracer tracer = new AndroidXTracer();
+    try (Span span1 = tracer.beginSpan("span1")) {
+      assertThat(span1).isNotNull();
+
+      try (Span span11 = span1.beginChildSpan("span11")) {
+        assertThat(span11).isNotNull();
+      }
+      try (Span span12 = span1.beginChildSpan("span12")) {
+        assertThat(span12).isNotNull();
+      }
+    }
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections())
+        .containsExactly("span11", "span12", "span1")
+        .inOrder();
+  }
+
+  /**
+   * android.os.Trace throws if the name is > 127 character so we cut it at that exact length in the
+   * stored span name.
+   */
+  @Test
+  public void beginSpan_withSpanNameShortened() {
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections()).isEmpty();
+
+    final String suffix130 =
+        "0.........10........20........30........"
+            + "40........50........60........70........"
+            + "80........90........100.......110......."
+            + "120.......130.......";
+
+    AndroidXTracer tracer = new AndroidXTracer();
+    try (Span span1 = tracer.beginSpan("span1_" + suffix130)) {
+      assertThat(span1).isNotNull();
+
+      try (Span span11 = span1.beginChildSpan("span11_" + suffix130)) {
+        assertThat(span11).isNotNull();
+      }
+    }
+
+    assertThat(ShadowTrace.getCurrentSections()).isEmpty();
+    assertThat(ShadowTrace.getPreviousSections())
+        .containsExactly(
+            "span11_"
+                + "0.........10........20........30........"
+                + "40........50........60........70........"
+                + "80........90........100.......110.......",
+            "span1_"
+                + "0.........10........20........30........"
+                + "40........50........60........70........"
+                + "80........90........100.......110.......1")
+        .inOrder();
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/tracing/BUILD b/runner/monitor/javatests/androidx/test/platform/tracing/BUILD
new file mode 100644
index 000000000..3ef533770
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/tracing/BUILD
@@ -0,0 +1,51 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+load(
+    "//build_extensions:axt_android_local_test.bzl",
+    "axt_android_local_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "AndroidXTracerTest",
+    srcs = ["AndroidXTracerTest.java"],
+    manifest_values = {
+        "minSdkVersion": "28",
+        "targetSdkVersion": "28",
+    },
+    deps = [
+        "//runner/monitor",
+        "@maven//:androidx_tracing_tracing",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_library_test(
+    name = "TracingTest",
+    srcs =
+        [
+            "TracingTest.java",
+        ],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/tracing/TracingTest.java b/runner/monitor/javatests/androidx/test/platform/tracing/TracingTest.java
new file mode 100644
index 000000000..791416811
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/tracing/TracingTest.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.platform.tracing;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertThrows;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.tracing.Tracer.Span;
+import com.google.common.base.Strings;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TracingTest {
+
+  private Tracing tracing;
+
+  @Before
+  public void setUp() throws Exception {
+    tracing = Tracing.getInstance();
+  }
+
+  @Test
+  public void registerTracer() {
+    MyTracer tracer1 = new MyTracer();
+    MyTracer tracer2 = new MyTracer();
+
+    try (Span span0 = tracing.beginSpan("span0")) {
+      assertThat(tracer1.actions).isEmpty();
+      assertThat(tracer2.actions).isEmpty();
+
+      tracing.registerTracer(tracer1);
+      tracing.registerTracer(tracer1); // Duplicated tracer reference is ignored.
+
+      try (Span span1 = tracing.beginSpan("span1")) {
+        assertThat(tracer1.actions).containsExactly("beginSpan: span1");
+        assertThat(tracer2.actions).isEmpty();
+
+        tracing.registerTracer(tracer2);
+        try (Span span2 = tracing.beginSpan("span2")) {
+          assertThat(tracer1.actions)
+              .containsExactly("beginSpan: span1", "beginSpan: span2")
+              .inOrder();
+          assertThat(tracer2.actions).containsExactly("beginSpan: span2");
+        }
+      }
+    }
+  }
+
+  @Test
+  public void registrerTracer_nullTracerFails() {
+    NullPointerException thrown =
+        assertThrows(NullPointerException.class, () -> tracing.registerTracer(null));
+    assertThat(thrown).hasMessageThat().contains("Tracer cannot be null");
+  }
+
+  @Test
+  public void unregisterTracer() {
+    MyTracer tracer1 = new MyTracer();
+    MyTracer tracer2 = new MyTracer();
+
+    tracing.registerTracer(tracer1);
+    tracing.registerTracer(tracer2);
+    try (Span span0 = tracing.beginSpan("span0")) {
+      assertThat(tracer1.actions).containsExactly("beginSpan: span0");
+      assertThat(tracer2.actions).containsExactly("beginSpan: span0");
+
+      tracing.unregisterTracer(tracer1);
+      tracing.unregisterTracer(tracer1); // Already unregistered tracer reference is ignored.
+      tracing.unregisterTracer(null); // Null reference is ignored.
+
+      try (Span span1 = tracing.beginSpan("span1")) {
+        assertThat(tracer1.actions).containsExactly("beginSpan: span0");
+        assertThat(tracer2.actions)
+            .containsExactly("beginSpan: span0", "beginSpan: span1")
+            .inOrder();
+
+        tracing.unregisterTracer(tracer2);
+        try (Span span2 = tracing.beginSpan("span2")) {
+          assertThat(tracer1.actions).containsExactly("beginSpan: span0");
+          assertThat(tracer2.actions)
+              .containsExactly("beginSpan: span0", "beginSpan: span1")
+              .inOrder();
+        }
+      }
+    }
+  }
+
+  @Test
+  public void beingChildSpan() {
+    MyTracer tracer1 = new MyTracer();
+    tracing.registerTracer(tracer1);
+    try (Span span0 = tracing.beginSpan("span0")) {
+      assertThat(tracer1.actions).containsExactly("beginSpan: span0");
+
+      try (Span span01 = span0.beginChildSpan("span01")) {
+        try (Span span011 = span01.beginChildSpan("span011")) {
+          /* no-op */
+        }
+        try (Span span012 = span01.beginChildSpan("span012")) {
+          /* no-op */
+        }
+      }
+      try (Span span02 = span0.beginChildSpan("span02")) {
+        /* no-op */
+      }
+    }
+    try (Span span1 = tracing.beginSpan("span1")) {
+      /* no-op */
+    }
+
+    assertThat(tracer1.actions)
+        .containsExactly(
+            "beginSpan: span0",
+            "+ childSpan: span01",
+            "| + childSpan: span011",
+            "| | +-endSpan: span011",
+            "| + childSpan: span012",
+            "| | +-endSpan: span012",
+            "| +-endSpan: span01",
+            "+ childSpan: span02",
+            "| +-endSpan: span02",
+            "+-endSpan: span0",
+            "beginSpan: span1",
+            "+-endSpan: span1")
+        .inOrder();
+  }
+
+  @Test
+  public void beingChildSpan_andUnregisterTracer() {
+    MyTracer tracer1 = new MyTracer();
+    tracing.registerTracer(tracer1);
+    try (Span span0 = tracing.beginSpan("span0")) {
+      assertThat(tracer1.actions).containsExactly("beginSpan: span0");
+
+      try (Span span01 = span0.beginChildSpan("span01")) {
+        try (Span span011 = span01.beginChildSpan("span011")) {
+          /* no-op */
+        }
+        // Unregister tracer here... Any following beginSpan and beginChildSpan calls are not
+        // passed to the tracer: span012, span02, and span1 are dropped.
+        // However in-flights spans (like span0 and span01) are still closed.
+        tracing.unregisterTracer(tracer1);
+        try (Span span012 = span01.beginChildSpan("span012")) {
+          /* no-op */
+        }
+      }
+      try (Span span02 = span0.beginChildSpan("span02")) {
+        /* no-op */
+      }
+    }
+    try (Span span1 = tracing.beginSpan("span1")) {
+      /* no-op */
+    }
+
+    assertThat(tracer1.actions)
+        .containsExactly(
+            "beginSpan: span0",
+            "+ childSpan: span01",
+            "| + childSpan: span011",
+            "| | +-endSpan: span011",
+            "| +-endSpan: span01",
+            "+-endSpan: span0")
+        .inOrder();
+  }
+
+  static class MyTracer implements Tracer {
+    private final List<String> actions = new ArrayList<>();
+
+    @Override
+    public Span beginSpan(String name) {
+      actions.add("beginSpan: " + name);
+      return new MyTracerSpan(actions, name, 0);
+    }
+  }
+
+  static class MyTracerSpan implements Span {
+    private final List<String> actions;
+    private final String spanName;
+    private final int level;
+
+    public MyTracerSpan(List<String> actions, String spanName, int level) {
+      this.actions = actions;
+      this.spanName = spanName;
+      this.level = level;
+    }
+
+    @Override
+    public Span beginChildSpan(String name) {
+      actions.add(Strings.repeat("| ", level) + "+ childSpan: " + name);
+      return new MyTracerSpan(actions, name, level + 1);
+    }
+
+    @Override
+    public void close() {
+      actions.add(Strings.repeat("| ", level) + "+-endSpan: " + spanName);
+    }
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/BUILD b/runner/monitor/javatests/androidx/test/platform/view/inspector/BUILD
new file mode 100644
index 000000000..c56e770d3
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/BUILD
@@ -0,0 +1,37 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "WindowInspectorCompatTest",
+    srcs = ["WindowInspectorCompatTest.kt"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/monitor",
+        "//runner/monitor/javatests/androidx/test/internal/platform:fixtures",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "//runner/rules",
+        "//services/storage",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/WindowInspectorCompatTest.kt b/runner/monitor/javatests/androidx/test/platform/view/inspector/WindowInspectorCompatTest.kt
new file mode 100644
index 000000000..6da8c1c5e
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/WindowInspectorCompatTest.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.view.inspector
+
+import androidx.test.core.app.ActivityScenario
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.platform.view.inspector.fixtures.ActivityWithDialog
+import androidx.test.platform.view.inspector.fixtures.SimpleActivity
+import com.google.common.truth.Truth.assertThat
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class WindowInspectorCompatTest {
+
+  @Test
+  fun getGlobalWindowViews_empty() {
+    InstrumentationRegistry.getInstrumentation()
+      .runOnMainSync(
+        Runnable { assertThat(WindowInspectorCompat.getGlobalWindowViews()).isEmpty() }
+      )
+  }
+
+  @Test
+  fun getGlobalWindowViews_notMainThread() {
+    assertThrows(IllegalStateException::class.java) { WindowInspectorCompat.getGlobalWindowViews() }
+  }
+
+  @Test
+  fun getGlobalWindowViews_activity() {
+    ActivityScenario.launch<SimpleActivity>(SimpleActivity::class.java).use { scenario ->
+      scenario.onActivity { assertThat(WindowInspectorCompat.getGlobalWindowViews()).hasSize(1) }
+    }
+  }
+
+  @Test
+  fun getGlobalWindowViews_activityDialog() {
+    ActivityScenario.launch<ActivityWithDialog>(ActivityWithDialog::class.java).use { scenario ->
+      scenario.onActivity { assertThat(WindowInspectorCompat.getGlobalWindowViews()).hasSize(2) }
+    }
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/ActivityWithDialog.kt b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/ActivityWithDialog.kt
new file mode 100644
index 000000000..8ff3c32dd
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/ActivityWithDialog.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.view.inspector.fixtures
+
+import android.app.Activity
+import android.app.AlertDialog
+import android.os.Bundle
+
+class ActivityWithDialog : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.simple_activity)
+
+    AlertDialog.Builder(this)
+      .setMessage("This is a dialog")
+      .setTitle("Dialog Title")
+      .create()
+      .show()
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml
new file mode 100644
index 000000000..559da6ab1
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.platform.view.inspector.fixtures"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="30"/>
+
+    <application>
+        <activity android:name=".SimpleActivity" android:exported="true" />
+        <activity android:name=".ActivityWithDialog" android:exported="true" />
+    </application>
+</manifest>
+
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/BUILD b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/BUILD
new file mode 100644
index 000000000..7f5c7c324
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/BUILD
@@ -0,0 +1,17 @@
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+kt_android_library(
+    name = "fixtures",
+    srcs = glob(["*.kt"]),
+    exports_manifest = True,
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    visibility = ["//visibility:public"],
+    deps = [
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/SimpleActivity.kt b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/SimpleActivity.kt
new file mode 100644
index 000000000..3ce63791a
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/SimpleActivity.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.platform.view.inspector.fixtures
+
+import android.app.Activity
+import android.os.Bundle
+
+class SimpleActivity : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    setContentView(R.layout.simple_activity)
+  }
+}
diff --git a/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/res/layout/simple_activity.xml b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/res/layout/simple_activity.xml
new file mode 100644
index 000000000..d323e21da
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures/res/layout/simple_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/layout"
+    android:orientation="vertical"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal">
+
+  <EditText
+      android:id="@+id/edit_text"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:inputType="text"
+      android:hint="Edit Text" />
+
+  <Button
+      android:id="@+id/button"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content" />
+
+  <TextView
+      android:id="@+id/text_view"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="Text View" />
+
+</LinearLayout>
+
diff --git a/runner/monitor/javatests/androidx/test/runner/BUILD b/runner/monitor/javatests/androidx/test/runner/BUILD
new file mode 100644
index 000000000..06a478a4c
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/runner/BUILD
@@ -0,0 +1,31 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "MonitoringInstrumentationTest",
+    srcs = ["MonitoringInstrumentationTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/monitor/javatests/androidx/test/runner/MonitoringInstrumentationTest.java b/runner/monitor/javatests/androidx/test/runner/MonitoringInstrumentationTest.java
index e5b7201d8..10257af91 100644
--- a/runner/monitor/javatests/androidx/test/runner/MonitoringInstrumentationTest.java
+++ b/runner/monitor/javatests/androidx/test/runner/MonitoringInstrumentationTest.java
@@ -22,22 +22,29 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.sameInstance;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import android.app.Activity;
+import android.app.AppComponentFactory;
+import android.app.Application;
+import android.content.Context;
 import android.content.Intent;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.MediumTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.AppComponentFactoryRegistry;
 import androidx.test.runner.intercepting.InterceptingActivityFactory;
 import java.util.concurrent.atomic.AtomicReference;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-@MediumTest
 @RunWith(AndroidJUnit4.class)
+@MediumTest
 public class MonitoringInstrumentationTest {
 
   private MonitoringInstrumentation instrumentation;
@@ -47,92 +54,132 @@ public void setUp() throws Exception {
     instrumentation = (MonitoringInstrumentation) getInstrumentation();
   }
 
+  @Test
+  @SdkSuppress(minSdkVersion = 28)
+  public void shouldCreateNewAppComponentsUsingAppComponentFactorySet() {
+    final AppComponentFactory factory = new TestAppComponentFactory();
+    AppComponentFactoryRegistry.setAppComponentFactory(factory);
+
+    final AtomicReference<Activity> activity =
+        retrieveActivityOnMainThread(SomeOtherActivity.class);
+    final AtomicReference<Application> application =
+        retrieveApplicationOnMainThread(SomeOtherApplication.class);
+    instrumentation.waitForIdleSync();
+
+    assertThat(activity.get(), instanceOf(SomeOtherActivity.class));
+    assertThat(application.get(), instanceOf(SomeOtherApplication.class));
+  }
+
+  @Test
+  @SdkSuppress(minSdkVersion = 28)
+  public void shouldUseDefaultMechanismForCreatingAppComponentsIfAppComponentFactoryNotSet() {
+    AppComponentFactoryRegistry.setAppComponentFactory(null);
+
+    final AtomicReference<Activity> activity = retrieveActivityOnMainThread(TestActivity.class);
+    final AtomicReference<Application> application =
+        retrieveApplicationOnMainThread(TestApplication.class);
+    instrumentation.waitForIdleSync();
+
+    assertThat(activity.get(), instanceOf(TestActivity.class));
+    assertThat(application.get(), instanceOf(TestApplication.class));
+  }
+
   @Test
   public void shouldUseDefaultMechanismForCreatingActivityIfInterceptingActivityFactoryNotSet()
       throws Exception {
-    final Class<TestActivity> testActivityClass = TestActivity.class;
-    final AtomicReference<Activity> activity = new AtomicReference<>();
-    retrieveActivityOnMainThread(testActivityClass, activity);
-
+    final AtomicReference<Activity> activity = retrieveActivityOnMainThread(TestActivity.class);
     instrumentation.waitForIdleSync();
+
     assertThat(activity.get(), instanceOf(TestActivity.class));
   }
 
   @Test
   public void shouldCreateNewActivityUsingInterceptingActivityFactoryIfItCanCreate()
       throws Exception {
-    final Class<TestActivity> testActivityClass = TestActivity.class;
-
-    final AtomicReference<Activity> testActivityReference = new AtomicReference<>();
     final TestActivity myTestActivity = mock(TestActivity.class);
     instrumentation.interceptActivityUsing(interceptingActivityFactory(myTestActivity, true));
 
-    retrieveActivityOnMainThread(testActivityClass, testActivityReference);
-
+    final AtomicReference<Activity> activity = retrieveActivityOnMainThread(TestActivity.class);
     instrumentation.waitForIdleSync();
-    assertThat(testActivityReference.get(), sameInstance((Activity) myTestActivity));
+
+    assertThat(activity.get(), sameInstance(myTestActivity));
   }
 
   @Test
   public void shouldNotCreateNewActivityUsingInterceptingActivityFactoryIfItCannotCreate()
       throws Exception {
-    final Class<TestActivity> testActivityClass = TestActivity.class;
-
-    final AtomicReference<Activity> testActivityReference = new AtomicReference<>();
     final TestActivity myTestActivity = mock(TestActivity.class);
     instrumentation.interceptActivityUsing(interceptingActivityFactory(myTestActivity, false));
 
-    retrieveActivityOnMainThread(testActivityClass, testActivityReference);
-
+    final AtomicReference<Activity> activity = retrieveActivityOnMainThread(TestActivity.class);
     instrumentation.waitForIdleSync();
-    assertThat(testActivityReference.get(), not(sameInstance((Activity) myTestActivity)));
+
+    assertThat(activity.get(), not(sameInstance(myTestActivity)));
   }
 
   @Test
   public void shouldNotCreateNewActivityUsingInterceptingActivityFactoryIfReset() throws Exception {
-    final Class<TestActivity> testActivityClass = TestActivity.class;
-    final AtomicReference<Activity> activity = new AtomicReference<>();
-
     final TestActivity myTestActivity = mock(TestActivity.class);
     instrumentation.interceptActivityUsing(interceptingActivityFactory(myTestActivity, true));
     instrumentation.useDefaultInterceptingActivityFactory();
-    retrieveActivityOnMainThread(testActivityClass, activity);
 
+    final AtomicReference<Activity> activity = retrieveActivityOnMainThread(TestActivity.class);
     instrumentation.waitForIdleSync();
-    assertThat(activity.get(), not(sameInstance((Activity) myTestActivity)));
+
+    assertThat(activity.get(), not(sameInstance(myTestActivity)));
   }
 
   @Test
   public void runOnMainSyncShouldRethrowAssertionException() {
     final String expectedErrorMessage =
         "This AssertionError should be re-thrown by runOnMainSync() method.";
+    Throwable actual = null;
     try {
       instrumentation.runOnMainSync(() -> fail(expectedErrorMessage));
-      fail(
-          "AssertionError thrown in the runnable should be re-thrown in the instrumentation"
-              + " thread.");
     } catch (Throwable t) {
-      assertThat(t, is(instanceOf(AssertionError.class)));
-      assertEquals(expectedErrorMessage, t.getMessage());
+      actual = t;
     }
+    assertThat(
+        /* reason= */ "AssertionError thrown in the runnable should be re-thrown in the"
+            + " instrumentation thread.",
+        /* actual= */ actual,
+        /* matcher= */ is(instanceOf(AssertionError.class)));
+    assertThat(expectedErrorMessage, equalTo(actual.getMessage()));
+  }
+
+  private AtomicReference<Activity> retrieveActivityOnMainThread(
+      final Class<? extends Activity> classRef) {
+    final AtomicReference<Activity> atomicReference = new AtomicReference<>();
+    instrumentation.runOnMainSync(
+        () -> {
+          try {
+            final ClassLoader cl = classRef.getClassLoader();
+            final String className = classRef.getName();
+            final Activity activity = instrumentation.newActivity(cl, className, new Intent());
+            atomicReference.set(activity);
+          } catch (Exception ex) {
+            fail(ex.getMessage());
+          }
+        });
+    return atomicReference;
   }
 
-  private void retrieveActivityOnMainThread(
-      final Class<TestActivity> activityClass,
-      final AtomicReference<Activity> activityAtomicReference) {
+  private AtomicReference<Application> retrieveApplicationOnMainThread(
+      final Class<? extends Application> applicationClass) {
+    final AtomicReference<Application> atomicReference = new AtomicReference<>();
     instrumentation.runOnMainSync(
-        new Runnable() {
-          @Override
-          public void run() {
-            try {
-              activityAtomicReference.set(
-                  instrumentation.newActivity(
-                      activityClass.getClassLoader(), activityClass.getName(), new Intent()));
-            } catch (Exception ex) {
-              fail(ex.getMessage());
-            }
+        () -> {
+          try {
+            final ClassLoader cl = applicationClass.getClassLoader();
+            final String className = applicationClass.getName();
+            final Context context = instrumentation.getTargetContext();
+            final Application application = instrumentation.newApplication(cl, className, context);
+            atomicReference.set(application);
+          } catch (Exception ex) {
+            fail(ex.getMessage());
           }
         });
+    return atomicReference;
   }
 
   @NonNull
@@ -151,7 +198,37 @@ public Activity create(ClassLoader classLoader, String className, Intent intent)
     };
   }
 
+  public static class TestApplication extends Application {}
+
   public static class TestActivity extends Activity {}
 
   public static class SomeOtherActivity extends Activity {}
+
+  public static class SomeOtherApplication extends Application {}
+
+  public static class TestAppComponentFactory extends AppComponentFactory {
+
+    @NonNull
+    @Override
+    public Activity instantiateActivity(
+        @NonNull ClassLoader cl, @NonNull String className, @Nullable Intent intent)
+        throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+      if (className.equals(SomeOtherActivity.class.getName())) {
+        return new SomeOtherActivity();
+      } else {
+        return super.instantiateActivity(cl, className, intent);
+      }
+    }
+
+    @NonNull
+    @Override
+    public Application instantiateApplication(@NonNull ClassLoader cl, @NonNull String className)
+        throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+      if (className.equals(SomeOtherApplication.class.getName())) {
+        return new SomeOtherApplication();
+      } else {
+        return super.instantiateApplication(cl, className);
+      }
+    }
+  }
 }
diff --git a/runner/monitor/javatests/androidx/test/runner/intent/BUILD b/runner/monitor/javatests/androidx/test/runner/intent/BUILD
new file mode 100644
index 000000000..acdc51c25
--- /dev/null
+++ b/runner/monitor/javatests/androidx/test/runner/intent/BUILD
@@ -0,0 +1,43 @@
+# Description: Monitor
+
+load(
+    "//build_extensions:android_library_test.bzl",
+    "axt_android_library_test",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//visibility:private",
+    ],
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "IntentMonitorRegistryTest",
+    srcs = ["IntentMonitorRegistryTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "IntentStubberRegistryTest",
+    srcs = ["IntentStubberRegistryTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/monitor/javatests/androidx/test/platform/view/inspector/fixtures",
+        "//runner/rules",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/rules/BUILD b/runner/rules/BUILD
new file mode 100644
index 000000000..9414d699d
--- /dev/null
+++ b/runner/rules/BUILD
@@ -0,0 +1,17 @@
+# Publicly visible alias to the AXT rules target
+
+load("@rules_java//java:defs.bzl", "java_library")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# This needs to be a java_library instead of an alias, so java_* based rules can reference it
+java_library(
+    name = "rules",
+    visibility = ["//visibility:public"],
+    exports = ["//runner/rules/java/androidx/test:rules"],
+)
diff --git a/runner/rules/BUILD.bazel b/runner/rules/BUILD.bazel
deleted file mode 100644
index 07c0f07b6..000000000
--- a/runner/rules/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-# Publicly visible alias to the AXT rules target
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "rules",
-    visibility = ["//visibility:public"],
-    exports = ["//runner/rules/java/androidx/test:rules"],
-)
diff --git a/runner/rules/CHANGELOG.md b/runner/rules/CHANGELOG.md
new file mode 100644
index 000000000..2c9475e84
--- /dev/null
+++ b/runner/rules/CHANGELOG.md
@@ -0,0 +1,19 @@
+### rules {version} {:#rules-{version}}
+
+{{date}}
+
+`androidx.test:rules:{version}` is released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/runner/rules/java/androidx/test/AndroidManifest.xml b/runner/rules/java/androidx/test/AndroidManifest.xml
index bc53fa988..46610f22e 100644
--- a/runner/rules/java/androidx/test/AndroidManifest.xml
+++ b/runner/rules/java/androidx/test/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.rules" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
 </manifest>
diff --git a/runner/rules/java/androidx/test/BUILD b/runner/rules/java/androidx/test/BUILD
new file mode 100644
index 000000000..c52a7fe22
--- /dev/null
+++ b/runner/rules/java/androidx/test/BUILD
@@ -0,0 +1,61 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions:dackka_test.bzl", "dackka_test")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# Description: Build rules for building androidx.test from source
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__pkg__",
+        "//runner/rules:__pkg__",
+    ],
+)
+
+# test rules
+android_library(
+    name = "rules",
+    srcs = glob(["**/*.java"]),
+    custom_package = "androidx.test.rules",
+    manifest = "AndroidManifest.xml",
+    proguard_specs = [
+        "proguard.cfg",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_aar(
+    name = "rules_aar",
+    expected_class_prefixes = [
+        "androidx.test.annotation.UiThreadTest",
+        "androidx.test.rule",
+    ],
+    included_dep = ":rules",
+)
+
+maven_artifact(
+    name = "rules_maven_artifact",
+    last_updated = "20170622000000",
+    target = ":rules_aar",
+)
+
+dackka_test(
+    name = "rules_doc",
+    runtime_dep = ":rules",
+    src_jar = ":rules_aar-src.jar",
+)
+
+api_checks(
+    name = "rules_api",
+    runtime_dep = ":rules",
+    src_jar = ":rules_aar-src.jar",
+)
diff --git a/runner/rules/java/androidx/test/BUILD.bazel b/runner/rules/java/androidx/test/BUILD.bazel
deleted file mode 100644
index ad7286cd4..000000000
--- a/runner/rules/java/androidx/test/BUILD.bazel
+++ /dev/null
@@ -1,74 +0,0 @@
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "RUNNER_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-# Description: Build rules for building androidx.test from source
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-# test rules
-android_library(
-    name = "rules",
-    srcs = glob(["**/*.java"]),
-    proguard_specs = [
-        "proguard.cfg",
-    ],
-    deps = [
-        "//:androidx_annotation",
-        "//runner/android_junit_runner",
-        "@androidsdk//:legacy_test-30",
-        "@maven//:junit_junit",
-    ],
-)
-
-# Generate rules for the release artifacts. This generates two file: runner_release_no_dep.jar
-# and runner_release.aar
-axt_release_lib(
-    name = "rules_release",
-    custom_package = "androidx.test.rules",
-    keep_spec = "androidx/test",
-    overlapping_jars = [
-        "//runner/android_junit_runner/java/androidx/test:runner_release_no_deps.jar",
-        "//runner/monitor/java/androidx/test:monitor_release_no_deps.jar",
-        "//services/storage/java/androidx/test/services/storage:test_storage_release_no_deps.jar",
-    ],
-    proguard_library = "proguard.cfg",
-    # remove the generated R class
-    remove_spec = "androidx/test/rules/R[$$\\.]",
-    deps = [
-        ":rules",
-    ],
-)
-
-filegroup(
-    name = "rules_src",
-    srcs = [
-        ":librules-src.jar",
-    ],
-)
-
-combine_jars(
-    name = "rules_src_jars",
-    srcs = [
-        ":rules_src",
-    ],
-)
-
-maven_artifact(
-    name = "rules_maven_artifact",
-    src = ":rules_release.aar",
-    artifact_deps = [
-        "androidx.test:runner:%s" % RUNNER_VERSION,
-    ],
-    artifact_id = "rules",
-    group_id = "androidx.test",
-    last_updated = "20170622000000",
-    src_jar = ":rules_src_jars.jar",
-    version = "%s" % RULES_VERSION,
-)
diff --git a/runner/rules/java/androidx/test/api/1.4.0_public.txt b/runner/rules/java/androidx/test/api/1.4.0_public.txt
new file mode 100644
index 000000000..b3f155992
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.4.0_public.txt
@@ -0,0 +1,43 @@
+// Signature format: 3.0
+package androidx.test.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface UiThreadTest {
+  }
+
+}
+
+package androidx.test.rule {
+
+  @Deprecated public class ActivityTestRule<T extends android.app.Activity> implements org.junit.rules.TestRule {
+    ctor @Deprecated public ActivityTestRule(Class<T!>!);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(androidx.test.runner.intercepting.SingleActivityFactory<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, String, int, boolean, boolean);
+    method @Deprecated protected void afterActivityFinished();
+    method @Deprecated protected void afterActivityLaunched();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeActivityLaunched();
+    method @Deprecated public void finishActivity();
+    method @Deprecated public T! getActivity();
+    method @Deprecated protected android.content.Intent! getActivityIntent();
+    method @Deprecated public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method @Deprecated public T! launchActivity(android.content.Intent?);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+  }
+
+  public class DisableOnAndroidDebug implements org.junit.rules.TestRule {
+    ctor public DisableOnAndroidDebug(org.junit.rules.TestRule!);
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public boolean isDebugging();
+  }
+
+  @Deprecated public class UiThreadTestRule implements org.junit.rules.TestRule {
+    ctor @Deprecated public UiThreadTestRule();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+    method @Deprecated protected boolean shouldRunOnUiThread(org.junit.runner.Description!);
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/1.5.0_internal.txt b/runner/rules/java/androidx/test/api/1.5.0_internal.txt
new file mode 100644
index 000000000..3515c50ec
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.5.0_internal.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.test.rule {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PortForwardingRule implements org.junit.rules.TestRule {
+    ctor protected PortForwardingRule(int);
+    method protected void afterPortForwarding();
+    method protected void afterRestoreForwarding();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforePortForwarding();
+    method protected void beforeRestoreForwarding();
+    method protected static int getDefaultPort();
+    field public static final int MAX_PORT = 65535; // 0xffff
+    field public static final int MIN_PORT = 1024; // 0x400
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/1.5.0_public.txt b/runner/rules/java/androidx/test/api/1.5.0_public.txt
new file mode 100644
index 000000000..5734b2339
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.5.0_public.txt
@@ -0,0 +1,94 @@
+// Signature format: 3.0
+package androidx.test.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface UiThreadTest {
+  }
+
+}
+
+package androidx.test.rule {
+
+  @Deprecated public class ActivityTestRule<T extends android.app.Activity> implements org.junit.rules.TestRule {
+    ctor @Deprecated public ActivityTestRule(Class<T!>!);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(androidx.test.runner.intercepting.SingleActivityFactory<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, String, int, boolean, boolean);
+    method @Deprecated protected void afterActivityFinished();
+    method @Deprecated protected void afterActivityLaunched();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeActivityLaunched();
+    method @Deprecated public void finishActivity();
+    method @Deprecated public T! getActivity();
+    method @Deprecated protected android.content.Intent! getActivityIntent();
+    method @Deprecated public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method @Deprecated public T! launchActivity(android.content.Intent?);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+  }
+
+  public class DisableOnAndroidDebug implements org.junit.rules.TestRule {
+    ctor public DisableOnAndroidDebug(org.junit.rules.TestRule!);
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public boolean isDebugging();
+  }
+
+  public class GrantPermissionRule implements org.junit.rules.TestRule {
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public static androidx.test.rule.GrantPermissionRule! grant(java.lang.String!...);
+  }
+
+  public class ServiceTestRule implements org.junit.rules.TestRule {
+    ctor public ServiceTestRule();
+    ctor protected ServiceTestRule(long, java.util.concurrent.TimeUnit!);
+    method protected void afterService();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforeService();
+    method public android.os.IBinder! bindService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public android.os.IBinder! bindService(android.content.Intent, android.content.ServiceConnection, int) throws java.util.concurrent.TimeoutException;
+    method public void startService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public void unbindService();
+    method public static androidx.test.rule.ServiceTestRule! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+  @Deprecated public class UiThreadTestRule implements org.junit.rules.TestRule {
+    ctor @Deprecated public UiThreadTestRule();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+    method @Deprecated protected boolean shouldRunOnUiThread(org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.rule.logging {
+
+  @Deprecated @RequiresApi(21) public class AtraceLogger {
+    method @Deprecated public void atraceStart(java.util.Set<java.lang.String!>!, int, int, java.io.File!, String!) throws java.io.IOException;
+    method @Deprecated public void atraceStop() throws java.io.IOException, java.lang.InterruptedException;
+    method @Deprecated public static androidx.test.rule.logging.AtraceLogger! getAtraceLoggerInstance(android.app.Instrumentation!);
+  }
+
+}
+
+package androidx.test.rule.provider {
+
+  @Deprecated public class ProviderTestRule implements org.junit.rules.TestRule {
+    method @Deprecated protected void afterProviderCleanedUp();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeProviderSetup();
+    method @Deprecated public android.content.ContentResolver! getResolver();
+    method @Deprecated public void revokePermission(String);
+    method @Deprecated public void runDatabaseCommands(String, java.lang.String!...);
+  }
+
+  @Deprecated public static class ProviderTestRule.Builder {
+    ctor @Deprecated public ProviderTestRule.Builder(Class<T!>, String);
+    method @Deprecated public <T extends android.content.ContentProvider> androidx.test.rule.provider.ProviderTestRule.Builder! addProvider(Class<T!>, String);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule! build();
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommands(String, java.lang.String!...);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommandsFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setPrefix(String);
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/1.6.0_internal.txt b/runner/rules/java/androidx/test/api/1.6.0_internal.txt
new file mode 100644
index 000000000..3515c50ec
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.6.0_internal.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.test.rule {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PortForwardingRule implements org.junit.rules.TestRule {
+    ctor protected PortForwardingRule(int);
+    method protected void afterPortForwarding();
+    method protected void afterRestoreForwarding();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforePortForwarding();
+    method protected void beforeRestoreForwarding();
+    method protected static int getDefaultPort();
+    field public static final int MAX_PORT = 65535; // 0xffff
+    field public static final int MIN_PORT = 1024; // 0x400
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/1.6.0_public.txt b/runner/rules/java/androidx/test/api/1.6.0_public.txt
new file mode 100644
index 000000000..13716b976
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.6.0_public.txt
@@ -0,0 +1,94 @@
+// Signature format: 3.0
+package androidx.test.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface UiThreadTest {
+  }
+
+}
+
+package androidx.test.rule {
+
+  @Deprecated public class ActivityTestRule<T extends android.app.Activity> implements org.junit.rules.TestRule {
+    ctor @Deprecated public ActivityTestRule(androidx.test.runner.intercepting.SingleActivityFactory<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, String, int, boolean, boolean);
+    method @Deprecated protected void afterActivityFinished();
+    method @Deprecated protected void afterActivityLaunched();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeActivityLaunched();
+    method @Deprecated public void finishActivity();
+    method @Deprecated public T! getActivity();
+    method @Deprecated protected android.content.Intent! getActivityIntent();
+    method @Deprecated public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method @Deprecated public T! launchActivity(android.content.Intent?);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+  }
+
+  public class DisableOnAndroidDebug implements org.junit.rules.TestRule {
+    ctor public DisableOnAndroidDebug(org.junit.rules.TestRule!);
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public boolean isDebugging();
+  }
+
+  public class GrantPermissionRule implements org.junit.rules.TestRule {
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public static androidx.test.rule.GrantPermissionRule! grant(java.lang.String!...!);
+  }
+
+  public class ServiceTestRule implements org.junit.rules.TestRule {
+    ctor public ServiceTestRule();
+    ctor protected ServiceTestRule(long, java.util.concurrent.TimeUnit!);
+    method protected void afterService();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforeService();
+    method public android.os.IBinder! bindService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public android.os.IBinder! bindService(android.content.Intent, android.content.ServiceConnection, int) throws java.util.concurrent.TimeoutException;
+    method public void startService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public void unbindService();
+    method public static androidx.test.rule.ServiceTestRule! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+  @Deprecated public class UiThreadTestRule implements org.junit.rules.TestRule {
+    ctor @Deprecated public UiThreadTestRule();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+    method @Deprecated protected boolean shouldRunOnUiThread(org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.rule.logging {
+
+  @Deprecated @RequiresApi(21) public class AtraceLogger {
+    method @Deprecated public void atraceStart(java.util.Set<java.lang.String!>!, int, int, java.io.File!, String!) throws java.io.IOException;
+    method @Deprecated public void atraceStop() throws java.io.IOException, java.lang.InterruptedException;
+    method @Deprecated public static androidx.test.rule.logging.AtraceLogger! getAtraceLoggerInstance(android.app.Instrumentation!);
+  }
+
+}
+
+package androidx.test.rule.provider {
+
+  @Deprecated public class ProviderTestRule implements org.junit.rules.TestRule {
+    method @Deprecated protected void afterProviderCleanedUp();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeProviderSetup();
+    method @Deprecated public android.content.ContentResolver! getResolver();
+    method @Deprecated public void revokePermission(String);
+    method @Deprecated public void runDatabaseCommands(String, java.lang.String!...);
+  }
+
+  @Deprecated public static class ProviderTestRule.Builder {
+    ctor @Deprecated public <T extends android.content.ContentProvider> ProviderTestRule.Builder(Class<T!>, String);
+    method @Deprecated public <T extends android.content.ContentProvider> androidx.test.rule.provider.ProviderTestRule.Builder! addProvider(Class<T!>, String);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule! build();
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommands(String, java.lang.String!...);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommandsFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setPrefix(String);
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/1.7.0_internal.txt b/runner/rules/java/androidx/test/api/1.7.0_internal.txt
new file mode 100644
index 000000000..3515c50ec
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.7.0_internal.txt
@@ -0,0 +1,17 @@
+// Signature format: 3.0
+package androidx.test.rule {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PortForwardingRule implements org.junit.rules.TestRule {
+    ctor protected PortForwardingRule(int);
+    method protected void afterPortForwarding();
+    method protected void afterRestoreForwarding();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforePortForwarding();
+    method protected void beforeRestoreForwarding();
+    method protected static int getDefaultPort();
+    field public static final int MAX_PORT = 65535; // 0xffff
+    field public static final int MIN_PORT = 1024; // 0x400
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/1.7.0_public.txt b/runner/rules/java/androidx/test/api/1.7.0_public.txt
new file mode 100644
index 000000000..13716b976
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/1.7.0_public.txt
@@ -0,0 +1,94 @@
+// Signature format: 3.0
+package androidx.test.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface UiThreadTest {
+  }
+
+}
+
+package androidx.test.rule {
+
+  @Deprecated public class ActivityTestRule<T extends android.app.Activity> implements org.junit.rules.TestRule {
+    ctor @Deprecated public ActivityTestRule(androidx.test.runner.intercepting.SingleActivityFactory<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T!>!, String, int, boolean, boolean);
+    method @Deprecated protected void afterActivityFinished();
+    method @Deprecated protected void afterActivityLaunched();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeActivityLaunched();
+    method @Deprecated public void finishActivity();
+    method @Deprecated public T! getActivity();
+    method @Deprecated protected android.content.Intent! getActivityIntent();
+    method @Deprecated public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method @Deprecated public T! launchActivity(android.content.Intent?);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+  }
+
+  public class DisableOnAndroidDebug implements org.junit.rules.TestRule {
+    ctor public DisableOnAndroidDebug(org.junit.rules.TestRule!);
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public boolean isDebugging();
+  }
+
+  public class GrantPermissionRule implements org.junit.rules.TestRule {
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public static androidx.test.rule.GrantPermissionRule! grant(java.lang.String!...!);
+  }
+
+  public class ServiceTestRule implements org.junit.rules.TestRule {
+    ctor public ServiceTestRule();
+    ctor protected ServiceTestRule(long, java.util.concurrent.TimeUnit!);
+    method protected void afterService();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforeService();
+    method public android.os.IBinder! bindService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public android.os.IBinder! bindService(android.content.Intent, android.content.ServiceConnection, int) throws java.util.concurrent.TimeoutException;
+    method public void startService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public void unbindService();
+    method public static androidx.test.rule.ServiceTestRule! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+  @Deprecated public class UiThreadTestRule implements org.junit.rules.TestRule {
+    ctor @Deprecated public UiThreadTestRule();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+    method @Deprecated protected boolean shouldRunOnUiThread(org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.rule.logging {
+
+  @Deprecated @RequiresApi(21) public class AtraceLogger {
+    method @Deprecated public void atraceStart(java.util.Set<java.lang.String!>!, int, int, java.io.File!, String!) throws java.io.IOException;
+    method @Deprecated public void atraceStop() throws java.io.IOException, java.lang.InterruptedException;
+    method @Deprecated public static androidx.test.rule.logging.AtraceLogger! getAtraceLoggerInstance(android.app.Instrumentation!);
+  }
+
+}
+
+package androidx.test.rule.provider {
+
+  @Deprecated public class ProviderTestRule implements org.junit.rules.TestRule {
+    method @Deprecated protected void afterProviderCleanedUp();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeProviderSetup();
+    method @Deprecated public android.content.ContentResolver! getResolver();
+    method @Deprecated public void revokePermission(String);
+    method @Deprecated public void runDatabaseCommands(String, java.lang.String!...);
+  }
+
+  @Deprecated public static class ProviderTestRule.Builder {
+    ctor @Deprecated public <T extends android.content.ContentProvider> ProviderTestRule.Builder(Class<T!>, String);
+    method @Deprecated public <T extends android.content.ContentProvider> androidx.test.rule.provider.ProviderTestRule.Builder! addProvider(Class<T!>, String);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule! build();
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommands(String, java.lang.String!...);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommandsFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setPrefix(String);
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/current_internal.txt b/runner/rules/java/androidx/test/api/current_internal.txt
new file mode 100644
index 000000000..0e769dd85
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/current_internal.txt
@@ -0,0 +1,17 @@
+// Signature format: 5.0
+package androidx.test.rule {
+
+  @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public class PortForwardingRule implements org.junit.rules.TestRule {
+    ctor protected PortForwardingRule(int);
+    method protected void afterPortForwarding();
+    method protected void afterRestoreForwarding();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforePortForwarding();
+    method protected void beforeRestoreForwarding();
+    method protected static int getDefaultPort();
+    field public static final int MAX_PORT = 65535; // 0xffff
+    field public static final int MIN_PORT = 1024; // 0x400
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/api/current_public.txt b/runner/rules/java/androidx/test/api/current_public.txt
new file mode 100644
index 000000000..06f29af7d
--- /dev/null
+++ b/runner/rules/java/androidx/test/api/current_public.txt
@@ -0,0 +1,94 @@
+// Signature format: 5.0
+package androidx.test.annotation {
+
+  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.TYPE}) public @interface UiThreadTest {
+  }
+
+}
+
+package androidx.test.rule {
+
+  @Deprecated public class ActivityTestRule<T extends android.app.Activity> implements org.junit.rules.TestRule {
+    ctor @Deprecated public ActivityTestRule(androidx.test.runner.intercepting.SingleActivityFactory<T>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T>!);
+    ctor @Deprecated public ActivityTestRule(Class<T>!, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T>!, boolean, boolean);
+    ctor @Deprecated public ActivityTestRule(Class<T>!, String, int, boolean, boolean);
+    method @Deprecated protected void afterActivityFinished();
+    method @Deprecated protected void afterActivityLaunched();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeActivityLaunched();
+    method @Deprecated public void finishActivity();
+    method @Deprecated public T getActivity();
+    method @Deprecated protected android.content.Intent! getActivityIntent();
+    method @Deprecated public android.app.Instrumentation.ActivityResult! getActivityResult();
+    method @Deprecated public T launchActivity(android.content.Intent?);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+  }
+
+  public class DisableOnAndroidDebug implements org.junit.rules.TestRule {
+    ctor public DisableOnAndroidDebug(org.junit.rules.TestRule!);
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public boolean isDebugging();
+  }
+
+  public class GrantPermissionRule implements org.junit.rules.TestRule {
+    method public final org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method public static androidx.test.rule.GrantPermissionRule! grant(java.lang.String!...!);
+  }
+
+  public class ServiceTestRule implements org.junit.rules.TestRule {
+    ctor public ServiceTestRule();
+    ctor protected ServiceTestRule(long, java.util.concurrent.TimeUnit!);
+    method protected void afterService();
+    method public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method protected void beforeService();
+    method public android.os.IBinder! bindService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public android.os.IBinder! bindService(android.content.Intent, android.content.ServiceConnection, int) throws java.util.concurrent.TimeoutException;
+    method public void startService(android.content.Intent) throws java.util.concurrent.TimeoutException;
+    method public void unbindService();
+    method public static androidx.test.rule.ServiceTestRule! withTimeout(long, java.util.concurrent.TimeUnit!);
+  }
+
+  @Deprecated public class UiThreadTestRule implements org.junit.rules.TestRule {
+    ctor @Deprecated public UiThreadTestRule();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated public void runOnUiThread(Runnable!) throws java.lang.Throwable;
+    method @Deprecated protected boolean shouldRunOnUiThread(org.junit.runner.Description!);
+  }
+
+}
+
+package androidx.test.rule.logging {
+
+  @Deprecated public class AtraceLogger {
+    method @Deprecated public void atraceStart(java.util.Set<java.lang.String!>!, int, int, java.io.File!, String!) throws java.io.IOException;
+    method @Deprecated public void atraceStop() throws java.io.IOException, java.lang.InterruptedException;
+    method @Deprecated public static androidx.test.rule.logging.AtraceLogger! getAtraceLoggerInstance(android.app.Instrumentation!);
+  }
+
+}
+
+package androidx.test.rule.provider {
+
+  @Deprecated public class ProviderTestRule implements org.junit.rules.TestRule {
+    method @Deprecated protected void afterProviderCleanedUp();
+    method @Deprecated public org.junit.runners.model.Statement! apply(org.junit.runners.model.Statement!, org.junit.runner.Description!);
+    method @Deprecated protected void beforeProviderSetup();
+    method @Deprecated public android.content.ContentResolver! getResolver();
+    method @Deprecated public void revokePermission(String);
+    method @Deprecated public void runDatabaseCommands(String, java.lang.String!...);
+  }
+
+  @Deprecated public static class ProviderTestRule.Builder {
+    ctor @Deprecated public <T extends android.content.ContentProvider> ProviderTestRule.Builder(Class<T>, String);
+    method @Deprecated public <T extends android.content.ContentProvider> androidx.test.rule.provider.ProviderTestRule.Builder! addProvider(Class<T>, String);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule! build();
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommands(String, java.lang.String!...);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseCommandsFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setDatabaseFile(String, java.io.File);
+    method @Deprecated public androidx.test.rule.provider.ProviderTestRule.Builder! setPrefix(String);
+  }
+
+}
+
diff --git a/runner/rules/java/androidx/test/internal/package.html b/runner/rules/java/androidx/test/internal/package.html
deleted file mode 100644
index df2fc38c2..000000000
--- a/runner/rules/java/androidx/test/internal/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2017 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/rules/java/androidx/test/internal/statement/UiThreadStatement.java b/runner/rules/java/androidx/test/internal/statement/UiThreadStatement.java
deleted file mode 100644
index bce65dd8f..000000000
--- a/runner/rules/java/androidx/test/internal/statement/UiThreadStatement.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.internal.statement;
-
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-
-import java.util.concurrent.atomic.AtomicReference;
-import org.junit.runners.model.Statement;
-
-/** {@link Statement} that executes a test on the application's main thread (or UI thread). */
-public class UiThreadStatement extends Statement {
-  private final Statement base;
-  private final boolean runOnUiThread;
-
-  public UiThreadStatement(Statement base, boolean runOnUiThread) {
-    this.base = base;
-    this.runOnUiThread = runOnUiThread;
-  }
-
-  @Override
-  public void evaluate() throws Throwable {
-    if (runOnUiThread) {
-      final AtomicReference<Throwable> exceptionRef = new AtomicReference<>();
-      getInstrumentation()
-          .runOnMainSync(
-              new Runnable() {
-                @Override
-                public void run() {
-                  try {
-                    base.evaluate();
-                  } catch (Throwable throwable) {
-                    exceptionRef.set(throwable);
-                  }
-                }
-              });
-      Throwable throwable = exceptionRef.get();
-      if (throwable != null) {
-        throw throwable;
-      }
-    } else {
-      base.evaluate();
-    }
-  }
-}
diff --git a/runner/rules/java/androidx/test/internal/statement/package.html b/runner/rules/java/androidx/test/internal/statement/package.html
deleted file mode 100644
index 27d887eef..000000000
--- a/runner/rules/java/androidx/test/internal/statement/package.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-  ~ Copyright (C) 2015 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<html>
-<body>
-    {@hide}
-</body>
-</html>
diff --git a/runner/rules/java/androidx/test/rule/ActivityTestRule.java b/runner/rules/java/androidx/test/rule/ActivityTestRule.java
index 53eb54313..a52d1e954 100644
--- a/runner/rules/java/androidx/test/rule/ActivityTestRule.java
+++ b/runner/rules/java/androidx/test/rule/ActivityTestRule.java
@@ -25,9 +25,9 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Looper;
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement;
@@ -46,12 +46,9 @@
 /**
  * This rule provides functional testing of a single {@link Activity}. When {@code launchActivity}
  * is set to true in the constructor, the Activity under test will be launched before each test
- * annotated with <a href="http://junit.org/javadoc/latest/org/junit/Test.html"><code>Test</code>
- * </a> and before methods annotated with <a
- * href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before</code></a>, and it
- * will be terminated after the test is completed and methods annotated with <a
- * href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>After
- * </code></a> are finished.
+ * annotated with {@link org.junit.Test} </a> and before methods annotated with {@link
+ * org.junit.Before}, and it will be terminated after the test is completed and methods annotated
+ * with {@link org.junit.After} are finished.
  *
  * <p>The Activity can be manually launched with {@link #launchActivity(Intent)}, and manually
  * finished with {@link #finishActivity()}. If the Activity is running at the end of the test, the
@@ -127,11 +124,8 @@ public ActivityTestRule(Class<T> activityClass) {
 
   /**
    * Similar to {@link #ActivityTestRule(Class, boolean, boolean)} but defaults to launch the
-   * activity under test once per <a href="http://junit.org/javadoc/latest/org/junit/Test.html">
-   * <code>Test</code></a> method. It is launched before the first <a
-   * href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before</code></a>
-   * method, and terminated after the last <a
-   * href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>After</code></a> method.
+   * activity under test once per {@link org.junit.Test} method. It is launched before the first
+   * {@link org.junit.Before} method, and terminated after the last {@link org.junit.After} method.
    *
    * @param activityClass The activity under test. This must be a class in the instrumentation
    *     targetPackage specified in the AndroidManifest.xml
@@ -151,13 +145,9 @@ public ActivityTestRule(Class<T> activityClass, boolean initialTouchMode) {
    * @param activityClass The activity under test. This must be a class in the instrumentation
    *     targetPackage specified in the AndroidManifest.xml
    * @param initialTouchMode true if the Activity should be placed into "touch mode" when started
-   * @param launchActivity true if the Activity should be launched once per <a
-   *     href="http://junit.org/javadoc/latest/org/junit/Test.html"><code>Test</code></a> method. It
-   *     will be launched before the first <a
-   *     href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before</code></a>
-   *     method, and terminated after the last <a
-   *     href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>After</code></a>
-   *     method.
+   * @param launchActivity true if the Activity should be launched once per {@link org.junit.Test}
+   *     method. It will be launched before the first {@link org.junit.Before} method, and
+   *     terminated after the last {@link org.junit.After} method.
    */
   public ActivityTestRule(
       Class<T> activityClass, boolean initialTouchMode, boolean launchActivity) {
@@ -174,13 +164,9 @@ public ActivityTestRule(
    *
    * @param activityFactory factory to be used for creating Activity instance
    * @param initialTouchMode true if the Activity should be placed into "touch mode" when started
-   * @param launchActivity true if the Activity should be launched once per <a
-   *     href="http://junit.org/javadoc/latest/org/junit/Test.html"><code>Test</code></a> method. It
-   *     will be launched before the first <a
-   *     href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before</code></a>
-   *     method, and terminated after the last <a
-   *     href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>After</code></a>
-   *     method.
+   * @param launchActivity true if the Activity should be launched once per {@link org.junit.Test}
+   *     method. It will be launched before the first {@link org.junit.Before} method, and
+   *     terminated after the last {@link org.junit.After} method.
    */
   public ActivityTestRule(
       SingleActivityFactory<T> activityFactory, boolean initialTouchMode, boolean launchActivity) {
@@ -194,13 +180,9 @@ public ActivityTestRule(
    * @param activityClass The activity under test. This must be a class in the instrumentation
    *     targetPackage specified in the AndroidManifest.xml
    * @param initialTouchMode true if the Activity should be placed into "touch mode" when started
-   * @param launchActivity true if the Activity should be launched once per <a
-   *     href="http://junit.org/javadoc/latest/org/junit/Test.html"><code>Test</code></a> method. It
-   *     will be launched before the first <a
-   *     href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before</code></a>
-   *     method, and terminated after the last <a
-   *     href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>After</code></a>
-   *     method.
+   * @param launchActivity true if the Activity should be launched once per {@link org.junit.Test}
+   *     method. It will be launched before the first {@link org.junit.Before} method, and
+   *     terminated after the last {@link org.junit.After} method.
    * @param targetPackage The name of the target package that the Activity is started under. This
    *     value is passed down to the start Intent using {@link
    *     Intent#setClassName(android.content.Context, String)}. Can not be null.
@@ -250,8 +232,7 @@ protected Intent getActivityIntent() {
   /**
    * Override this method to execute any code that should run before your {@link Activity} is
    * created and launched. This method is called before each test method, including any method
-   * annotated with <a href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>
-   * Before</code></a>.
+   * annotated with {@link org.junit.Before}.
    */
   protected void beforeActivityLaunched() {
     // empty by default
@@ -259,13 +240,12 @@ protected void beforeActivityLaunched() {
 
   /**
    * Override this method to execute any code that should run after your {@link Activity} is
-   * launched, but before any test code is run including any method annotated with <a
-   * href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before</code></a>.
+   * launched, but before any test code is run including any method annotated with {@link
+   * org.junit.Before}.
    *
-   * <p>Prefer <a href="http://junit.sourceforge.net/javadoc/org/junit/Before.html"><code>Before
-   * </code></a> over this method. This method should usually not be overwritten directly in tests
-   * and only be used by subclasses of ActivityTestRule to get notified when the activity is created
-   * and visible but test runs.
+   * <p>Prefer {@link org.junit.Before} over this method. This method should usually not be
+   * overwritten directly in tests and only be used by subclasses of ActivityTestRule to get
+   * notified when the activity is created and visible but test runs.
    */
   protected void afterActivityLaunched() {
     // empty by default
@@ -274,13 +254,11 @@ protected void afterActivityLaunched() {
   /**
    * Override this method to execute any code that should run after the currently launched {@link
    * Activity} is finished. This method is called after each test method, including any method
-   * annotated with <a href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>After
-   * </code></a>.
+   * annotated with {@link org.junit.After}.
    *
-   * <p>Prefer <a href="http://junit.sourceforge.net/javadoc/org/junit/After.html"><code>Before
-   * </code></a> over this method. This method should usually not be overwritten directly in tests
-   * and only be used by subclasses of ActivityTestRule to get notified when the activity is created
-   * and visible but test runs.
+   * <p>Prefer {@link org.junit.After} over this method. This method should usually not be
+   * overwritten directly in tests and only be used by subclasses of ActivityTestRule to get
+   * notified when the activity is created and visible but test runs.
    */
   protected void afterActivityFinished() {
     // empty by default
@@ -473,6 +451,7 @@ public ActivityResult getActivityResult() {
     return activityResult;
   }
 
+  @SuppressWarnings("DiscouragedPrivateApi")
   private void setActivityResultForActivity(final T activity) {
     checkState(Looper.myLooper() == Looper.getMainLooper(), "Must be called on the main thread!");
     checkNotNull(activity, "Activity wasn't created yet or already destroyed!");
@@ -516,8 +495,8 @@ public void runOnUiThread(final Runnable runnable) throws Throwable {
   }
 
   /**
-   * <a href="http://junit.org/apidocs/org/junit/runners/model/Statement.html"><code>Statement
-   * </code></a> that finishes the activity after the test was executed
+   * {@link org.junit.runners.model.Statement} that finishes the activity after the test was
+   * executed
    */
   private class ActivityStatement extends Statement {
 
diff --git a/runner/rules/java/androidx/test/rule/DisableOnAndroidDebug.java b/runner/rules/java/androidx/test/rule/DisableOnAndroidDebug.java
index 7011a81f4..d4c32fdfa 100644
--- a/runner/rules/java/androidx/test/rule/DisableOnAndroidDebug.java
+++ b/runner/rules/java/androidx/test/rule/DisableOnAndroidDebug.java
@@ -24,13 +24,12 @@
  * The {@code DisableOnAndroidDebug} Rule allows you to label certain rules to be disabled when
  * debugging.
  *
- * <p>The most illustrative use case is for tests that make use of the <a
- * href="http://junit.org/apidocs/org/junit/rules/Timeout.html"><code>Timeout</code></a> rule, when
- * ran in debug mode the test may terminate on timeout abruptly during debugging. Developers may
- * disable the timeout, or increase the timeout by making a code change on tests that need debugging
- * and remember revert the change afterwards or rules such as <a
- * href="http://junit.org/apidocs/org/junit/rules/Timeout.html"><code>Timeout</code></a> that may be
- * disabled during debugging may be wrapped in a {@code DisableOnDebug}.
+ * <p>The most illustrative use case is for tests that make use of the {@link
+ * org.junit.rules.Timeout} rule, when ran in debug mode the test may terminate on timeout abruptly
+ * during debugging. Developers may disable the timeout, or increase the timeout by making a code
+ * change on tests that need debugging and remember revert the change afterwards or rules such as
+ * {@link org.junit.rules.Timeout} that may be disabled during debugging may be wrapped in a {@code
+ * DisableOnDebug}.
  *
  * <p>The important benefit of this feature is that you can disable such rules without any making
  * any modifications to your test class to remove them during debugging.
diff --git a/runner/rules/java/androidx/test/rule/GrantPermissionRule.java b/runner/rules/java/androidx/test/rule/GrantPermissionRule.java
index f83673e41..1957edb3b 100644
--- a/runner/rules/java/androidx/test/rule/GrantPermissionRule.java
+++ b/runner/rules/java/androidx/test/rule/GrantPermissionRule.java
@@ -19,12 +19,13 @@
 import static androidx.test.internal.util.Checks.checkNotNull;
 
 import android.Manifest.permission;
+import android.os.Build.VERSION;
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import androidx.test.internal.platform.ServiceLoaderWrapper;
 import androidx.test.internal.platform.content.PermissionGranter;
 import androidx.test.runner.permission.PermissionRequester;
+import androidx.test.runner.permission.UiAutomationPermissionGranter;
 import java.util.Arrays;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -69,15 +70,26 @@
  * <p>See <a href="https://developer.android.com/training/permissions/requesting">Request App
  * Permissions</a> for more details on runtime permissions.
  *
- * <p><b>This API is currently in beta.</b>
+ * <p>For tests running on Android SDKs >= API 28, use <br>
+ * {@link android.app.UiAutomation#grantRuntimePermission(String, String)} instead.
  */
-@Beta
 public class GrantPermissionRule implements TestRule {
 
   private PermissionGranter permissionGranter;
 
   private GrantPermissionRule() {
-    this(ServiceLoaderWrapper.loadSingleService(PermissionGranter.class, PermissionRequester::new));
+    PermissionGranter granter =
+        ServiceLoaderWrapper.loadSingleServiceOrNull(PermissionGranter.class);
+    if (granter == null) {
+      if (VERSION.SDK_INT >= 28) {
+        granter = new UiAutomationPermissionGranter();
+      } else {
+        // use the shell permission requester
+        granter = new PermissionRequester();
+      }
+    }
+
+    setPermissionGranter(granter);
   }
 
   @VisibleForTesting
@@ -106,8 +118,7 @@ private void grantPermissions(String... permissions) {
     permissionGranter.addPermissions(permissionSet.toArray(new String[permissionSet.size()]));
   }
 
-  @VisibleForTesting
-  Set<String> satisfyPermissionDependencies(String... permissions) {
+  private Set<String> satisfyPermissionDependencies(String... permissions) {
     Set<String> permissionList = new LinkedHashSet<>(Arrays.asList(permissions));
     // Explicitly grant READ_EXTERNAL_STORAGE permission when WRITE_EXTERNAL_STORAGE was requested.
     if (permissionList.contains(permission.WRITE_EXTERNAL_STORAGE)) {
@@ -121,8 +132,7 @@ public final Statement apply(final Statement base, Description description) {
     return new RequestPermissionStatement(base);
   }
 
-  @VisibleForTesting
-  void setPermissionGranter(PermissionGranter permissionGranter) {
+  private void setPermissionGranter(PermissionGranter permissionGranter) {
     this.permissionGranter = checkNotNull(permissionGranter, "permissionRequester cannot be null!");
   }
 
diff --git a/runner/rules/java/androidx/test/rule/PortForwardingRule.java b/runner/rules/java/androidx/test/rule/PortForwardingRule.java
index 858ce7078..dc15c87ef 100644
--- a/runner/rules/java/androidx/test/rule/PortForwardingRule.java
+++ b/runner/rules/java/androidx/test/rule/PortForwardingRule.java
@@ -19,10 +19,11 @@
 import static androidx.test.internal.util.Checks.checkArgument;
 import static androidx.test.internal.util.Checks.checkNotNull;
 
-import androidx.annotation.NonNull;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import java.util.Properties;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -39,7 +40,7 @@
  *
  * @hide
  */
-@Beta
+@RestrictTo(Scope.LIBRARY_GROUP)
 public class PortForwardingRule implements TestRule {
 
   private static final String TAG = "PortForwardingRule";
diff --git a/runner/rules/java/androidx/test/rule/ServiceTestRule.java b/runner/rules/java/androidx/test/rule/ServiceTestRule.java
index 4a14fb8c8..de5756e32 100644
--- a/runner/rules/java/androidx/test/rule/ServiceTestRule.java
+++ b/runner/rules/java/androidx/test/rule/ServiceTestRule.java
@@ -21,10 +21,9 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import androidx.annotation.NonNull;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import androidx.test.internal.util.Checks;
 import androidx.test.platform.app.InstrumentationRegistry;
 import java.util.concurrent.CountDownLatch;
@@ -68,12 +67,7 @@
  *     assertTrue("True wasn't returned", service.doSomethingToReturnTrue());
  * }
  * </pre>
- *
- * <p>
- *
- * <p><b>This API is currently in beta.</b>
  */
-@Beta
 public class ServiceTestRule implements TestRule {
 
   private static final String TAG = "ServiceTestRule";
@@ -126,10 +120,20 @@ public static ServiceTestRule withTimeout(long timeout, TimeUnit timeUnit) {
    *     {@link android.content.Context#startService(Intent) Context.startService (Intent)}.
    * @throws SecurityException if you do not have permission to bind to the given service.
    * @throws TimeoutException if timed out waiting for a successful connection with the service.
+   * @throws IllegalArgumentException if the intent did not resolve to a service
    */
   public void startService(@NonNull Intent intent) throws TimeoutException {
     serviceIntent = Checks.checkNotNull(intent, "intent can't be null");
-    InstrumentationRegistry.getInstrumentation().getTargetContext().startService(serviceIntent);
+    ComponentName componentName =
+        InstrumentationRegistry.getInstrumentation().getTargetContext().startService(serviceIntent);
+    if (componentName == null) {
+      throw new IllegalArgumentException(
+          "Intent "
+              + intent
+              + "did not start a service - this could be triggered by:\n"
+              + "  1. Your service is not declared in the manifest\n"
+              + "  2. The service is not visible to your app, because of package filtering\n");
+    }
     serviceStarted = true;
 
     // bind to the started service to guarantee its started and connected before test execution
diff --git a/runner/rules/java/androidx/test/rule/logging/AtraceLogger.java b/runner/rules/java/androidx/test/rule/logging/AtraceLogger.java
index 543fddece..ed17ed7e7 100644
--- a/runner/rules/java/androidx/test/rule/logging/AtraceLogger.java
+++ b/runner/rules/java/androidx/test/rule/logging/AtraceLogger.java
@@ -19,7 +19,6 @@
 import android.app.UiAutomation;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
-import androidx.test.annotation.Beta;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
@@ -29,13 +28,14 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * Class contains helper methods to dump atrace info asynchronously while running the test case.
  *
- * <p><b>This API is currently in beta.</b>
+ * @deprecated unsupported. Consider running trace from host such as via Android Studio
  */
-@Beta
+@Deprecated
 public class AtraceLogger {
 
   private static final String ATRACE_START = "atrace --async_start -b %d -c %s";
@@ -58,8 +58,7 @@ private AtraceLogger(Instrumentation instrumentation) {
   }
 
   /**
-   * To make sure only one instance of atrace logger is created. Note : Supported only for minsdk
-   * version 23 and above because of UiAutomation executeShellCommand limitation.
+   * To make sure only one instance of atrace logger is created.
    *
    * @param instrumentation Used to execute atrace shell commands
    * @return instance of the AtraceLogger
@@ -135,11 +134,11 @@ public void atraceStart(
     atraceRunning = true;
     dumpIOException = null;
     atraceDataList = new ArrayList<ByteArrayOutputStream>();
-    dumpThread =
-        new Thread(
-            new DumpTraceRunnable(
-                traceCategoriesList.toString(), atraceBufferSize, dumpIntervalSecs));
+    DumpTraceRunnable dumpTraceRunnable =
+        new DumpTraceRunnable(traceCategoriesList.toString(), atraceBufferSize, dumpIntervalSecs);
+    dumpThread = new Thread(dumpTraceRunnable);
     dumpThread.start();
+    dumpTraceRunnable.waitForStart();
   }
 
   /**
@@ -223,6 +222,7 @@ private class DumpTraceRunnable implements Runnable {
     private String traceCategories;
     private int bufferSize;
     private int dumpIntervalInSecs;
+    private final CountDownLatch startLatch = new CountDownLatch(1);
 
     DumpTraceRunnable(String traceCategories, int bufferSize, int dumpIntervalInSecs) {
       this.traceCategories = traceCategories;
@@ -230,8 +230,17 @@ private class DumpTraceRunnable implements Runnable {
       this.dumpIntervalInSecs = dumpIntervalInSecs;
     }
 
+    void waitForStart() {
+      try {
+        startLatch.await();
+      } catch (InterruptedException e) {
+        // ignore
+      }
+    }
+
     @Override
     public void run() {
+      startLatch.countDown();
       try {
         while (!Thread.currentThread().isInterrupted()) {
           try {
diff --git a/runner/rules/java/androidx/test/rule/provider/DelegatingContext.java b/runner/rules/java/androidx/test/rule/provider/DelegatingContext.java
index 1b34c3a03..7ce0b366b 100644
--- a/runner/rules/java/androidx/test/rule/provider/DelegatingContext.java
+++ b/runner/rules/java/androidx/test/rule/provider/DelegatingContext.java
@@ -40,16 +40,15 @@
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.UserHandle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Display;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -143,22 +142,17 @@ public SQLiteDatabase openOrCreateDatabase(
   public SQLiteDatabase openOrCreateDatabase(
       @NonNull String name, int mode, CursorFactory factory, DatabaseErrorHandler errorHandler) {
     checkArgument(!TextUtils.isEmpty(name), "Database name cannot be empty or null");
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-      String prefixName = getPrefixName(name);
-      if (!databases.contains(name)) {
-        addDatabase(name);
-        if (context.getDatabasePath(prefixName).exists() && !context.deleteDatabase(prefixName)) {
-          Log.w(
-              TAG,
-              "Database with prefixed name "
-                  + prefixName
-                  + " already exists and cannot be deleted.");
-        }
+
+    String prefixName = getPrefixName(name);
+    if (!databases.contains(name)) {
+      addDatabase(name);
+      if (context.getDatabasePath(prefixName).exists() && !context.deleteDatabase(prefixName)) {
+        Log.w(
+            TAG,
+            "Database with prefixed name " + prefixName + " already exists and cannot be deleted.");
       }
-      return context.openOrCreateDatabase(prefixName, mode, factory, errorHandler);
     }
-    throw new UnsupportedOperationException(
-        "For API level < 11, use openOrCreateDatabase(String, int, CursorFactory) instead");
+    return context.openOrCreateDatabase(prefixName, mode, factory, errorHandler);
   }
 
   /**
@@ -268,10 +262,8 @@ public boolean deleteFile(@NonNull String name) {
   @Override
   public Object getSystemService(@NonNull String name) {
     checkArgument(!TextUtils.isEmpty(name), "name cannot be empty or null");
-    // getSystemService(Context.APP_OPS_SERVICE) is only used in ContentProvider#attachInfo for
-    // API level >= 19.
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT
-        && Context.APP_OPS_SERVICE.equals(name)) {
+    // getSystemService(Context.APP_OPS_SERVICE) is only used in ContentProvider#attachInfo
+    if (Context.APP_OPS_SERVICE.equals(name)) {
       return context.getSystemService(Context.APP_OPS_SERVICE);
     }
     throw new UnsupportedOperationException();
diff --git a/runner/rules/java/androidx/test/rule/provider/ProviderTestRule.java b/runner/rules/java/androidx/test/rule/provider/ProviderTestRule.java
index 6c1f37c24..e6bf90681 100644
--- a/runner/rules/java/androidx/test/rule/provider/ProviderTestRule.java
+++ b/runner/rules/java/androidx/test/rule/provider/ProviderTestRule.java
@@ -26,13 +26,11 @@
 import android.content.pm.ProviderInfo;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
-import android.os.Build;
-import androidx.annotation.NonNull;
 import android.test.mock.MockContentResolver;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
-import androidx.test.annotation.Beta;
 import androidx.test.platform.app.InstrumentationRegistry;
 import java.io.BufferedReader;
 import java.io.File;
@@ -128,9 +126,10 @@
  * }
  * </pre>
  *
- * <p><b>This API is currently in beta.</b>
+ * @deprecated relies on deprecated android.test.mock. Consider using a real provider, or
+ *     implementing a fake ContentProvider specific to your use case.
  */
-@Beta
+@Deprecated
 public class ProviderTestRule implements TestRule {
 
   private static final String TAG = "ProviderTestRule";
@@ -323,16 +322,12 @@ private void copyFile(File src, File dest) throws IOException {
   }
 
   private void cleanUpProviders() {
-    // ContentProvider.shutdown() method is added in HONEYCOMB
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-      for (WeakReference<ContentProvider> providerRef : providersRef) {
-        ContentProvider provider = providerRef.get();
-        if (provider != null) {
-          provider.shutdown();
-        }
+    for (WeakReference<ContentProvider> providerRef : providersRef) {
+      ContentProvider provider = providerRef.get();
+      if (provider != null) {
+        provider.shutdown();
       }
     }
-
     for (DatabaseArgs databaseArgs : databaseArgsSet) {
       String dbName = databaseArgs.getDBName();
       if (dbName != null) {
@@ -349,7 +344,11 @@ private void cleanUpProviders() {
    * specify the prefix to use when renaming test files for isolation by {@link #setPrefix}. If the
    * ContentProvider under test is implemented based on {@link SQLiteDatabase}, users can also pass
    * in database file to restore or database commands to run before tests.
+   *
+   * @deprecated Consider using a real provider, or implementing a fake ContentProvider specific to
+   *     your use case.
    */
+  @Deprecated
   public static class Builder {
 
     private static final String DEFAULT_PREFIX = "test.";
diff --git a/runner/rules/javatests/androidx/test/rule/ActivityTestRuleTest.java b/runner/rules/javatests/androidx/test/rule/ActivityTestRuleTest.java
index 39ef14054..de40b24ac 100644
--- a/runner/rules/javatests/androidx/test/rule/ActivityTestRuleTest.java
+++ b/runner/rules/javatests/androidx/test/rule/ActivityTestRuleTest.java
@@ -42,7 +42,6 @@
 import androidx.test.annotation.UiThreadTest;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.runner.MonitoringInstrumentation;
 import androidx.test.runner.intercepting.SingleActivityFactory;
 import org.hamcrest.CoreMatchers;
@@ -525,7 +524,6 @@ public void customGetActivityIntentOverridesDefaults() {
     assertThat(result.getFailureCount(), equalTo(0));
   }
 
-  @SdkSuppress(minSdkVersion = 17)
   @Test
   public void shouldAskInstrumentationToInterceptActivityUsingGivenFactoryAndResetItAfterTest()
       throws Throwable {
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest.xml
deleted file mode 100644
index 5a2b9f4bf..000000000
--- a/runner/rules/javatests/androidx/test/rule/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<manifest
-    package="androidx.test.rule.tests"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="28"/>
-
-    <application android:label="AndroidJUnitRunner" >
-
-        <uses-library android:name="android.test.runner" />
-        <activity android:name="android.app.Activity"/>
-        <service android:name="androidx.test.rule.ServiceTestRuleTest$TestService" />
-        <service android:name="androidx.test.rule.ServiceTestRuleTest$ServiceThatCantBeBoundTo" />
-        <service android:name="androidx.test.rule.ServiceTestRuleTest$TimeoutService" />
-
-    </application>
-
-
-</manifest>
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml
new file mode 100644
index 000000000..ef026209d
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_activitytestrule.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.rule"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33"/>
+
+    <application android:label="AndroidJUnitRunner" >
+
+
+        <activity android:name="android.app.Activity"/>
+
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="androidx.test.rule">
+    </instrumentation>
+
+
+</manifest>
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml
new file mode 100644
index 000000000..ac9b03123
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_servicetestrule.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.rule"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33"/>
+
+    <application android:label="AndroidJUnitRunner" >
+
+        <service android:name="androidx.test.rule.ServiceTestRuleTest$TestService" />
+        <service android:name="androidx.test.rule.ServiceTestRuleTest$ServiceThatCantBeBoundTo" />
+        <service android:name="androidx.test.rule.ServiceTestRuleTest$TimeoutService" />
+
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="androidx.test.rule">
+    </instrumentation>
+
+
+</manifest>
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml b/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml
new file mode 100644
index 000000000..751fb2dd6
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/AndroidManifest_testlibrary.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<manifest
+    package="androidx.test.rule"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="33"/>
+
+    <application android:label="AndroidJUnitRunner" >
+
+<uses-library android:name="android.test.runner"/>
+
+
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="androidx.test.rule">
+    </instrumentation>
+
+
+</manifest>
diff --git a/runner/rules/javatests/androidx/test/rule/AndroidTimeoutUiTest.java b/runner/rules/javatests/androidx/test/rule/AndroidTimeoutUiTest.java
index bfe50becf..c08cc457b 100644
--- a/runner/rules/javatests/androidx/test/rule/AndroidTimeoutUiTest.java
+++ b/runner/rules/javatests/androidx/test/rule/AndroidTimeoutUiTest.java
@@ -19,6 +19,7 @@
 package androidx.test.rule;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
@@ -43,7 +44,7 @@
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class AndroidTimeoutUiTest {
-  @Rule public Timeout globalTimeout = new Timeout(100);
+  @Rule public Timeout globalTimeout = Timeout.millis(100);
 
   private static final ActivityFixture mockActivity = mock(ActivityFixture.class);
 
@@ -90,15 +91,16 @@ public void verifyOnUiThread() throws Exception {
   @UiThreadTest
   public void verifyOnUiThreadWhenTimeoutUsed() {
     // Create a new handler to check if we are actually running on the UI thread
-    new Handler();
+    var unused = new Handler();
     verifyRunsOnUiThread();
   }
 
-  @Test(timeout = 100, expected = RuntimeException.class)
+  @Test(timeout = 100)
   public void attemptingToCreateHandlerNotOnUiThreadThrows() {
     verifyRunsNotOnUiThread();
     // Creating a new handler outside of the UI thread will throw an exception
-    new Handler();
+
+    assertThrows(RuntimeException.class, () -> new Handler());
   }
 
   @Test
diff --git a/runner/rules/javatests/androidx/test/rule/BUILD b/runner/rules/javatests/androidx/test/rule/BUILD
new file mode 100644
index 000000000..d985e20d0
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/BUILD
@@ -0,0 +1,109 @@
+# Description: Tests for Rules.
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:phone_devices.bzl", "apis", "devices")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "ActivityTestRuleTest",
+    srcs = ["ActivityTestRuleTest.java"],
+    manifest = "AndroidManifest_activitytestrule.xml",
+    shard_count = 2,
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "AndroidTimeoutUiTest",
+    srcs = ["AndroidTimeoutUiTest.java"],
+    # needs access to android.test classes
+    manifest = "AndroidManifest_testlibrary.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "DisableOnAndroidDebugTest",
+    srcs = ["DisableOnAndroidDebugTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "GrantPermissionRuleTest",
+    srcs = ["GrantPermissionRuleTest.java"],
+    # runtime permissions only a thing from api 23+
+    device_list = devices(apis(min_api = 24)),
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/rules",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "PortForwardingRuleTest",
+    srcs = ["PortForwardingRuleTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_library_test(
+    name = "ServiceTestRuleTest",
+    srcs = ["ServiceTestRuleTest.java"],
+    manifest = "AndroidManifest_servicetestrule.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//opensource/androidx:annotation",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "UiThreadTestRuleTest",
+    srcs = ["UiThreadTestRuleTest.java"],
+    # needs access to android.test classes
+    manifest = "AndroidManifest_testlibrary.xml",
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/rules/javatests/androidx/test/rule/BUILD.bazel b/runner/rules/javatests/androidx/test/rule/BUILD.bazel
deleted file mode 100644
index 20911c07f..000000000
--- a/runner/rules/javatests/androidx/test/rule/BUILD.bazel
+++ /dev/null
@@ -1,43 +0,0 @@
-# Description: Tests for Rules.
-
-load(
-    "//build_extensions:android_library_instrumentation_tests.bzl",
-    "android_library_instrumentation_tests",
-)
-load(
-    "//build_extensions:test_devices.bzl",
-    "devices",
-)
-
-package(
-    default_testonly = 1,
-)
-
-licenses(["notice"])  # Apache License 2.0
-
-android_library(
-    name = "manifest",
-    exports_manifest = 1,
-    manifest = "AndroidManifest.xml",
-)
-
-android_library_instrumentation_tests(
-    name = "rules_tests",
-    srcs = glob(["*.java"]),
-    target_devices = devices(),
-    deps = [
-        "@androidsdk//:legacy_test-30",
-        ":manifest",
-        "//:androidx_annotation",
-        "//core",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//runner/rules",
-        "@maven//:com_linkedin_dexmaker_dexmaker",
-        "@maven//:com_linkedin_dexmaker_dexmaker_mockito",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-    ],
-)
diff --git a/runner/rules/javatests/androidx/test/rule/GrantPermissionRuleTest.java b/runner/rules/javatests/androidx/test/rule/GrantPermissionRuleTest.java
index 31451ce57..1357ee89c 100644
--- a/runner/rules/javatests/androidx/test/rule/GrantPermissionRuleTest.java
+++ b/runner/rules/javatests/androidx/test/rule/GrantPermissionRuleTest.java
@@ -16,73 +16,56 @@
 
 package androidx.test.rule;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.contains;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.hasSize;
-import static org.hamcrest.Matchers.not;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
+import static android.content.Context.POWER_SERVICE;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static org.junit.Assert.assertThrows;
 
 import android.Manifest.permission;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.permission.PermissionRequester;
-import java.util.Set;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.Description;
 import org.junit.runner.RunWith;
 import org.junit.runners.model.Statement;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 
 /** Tests for {@link GrantPermissionRule} */
-@SmallTest
 @RunWith(AndroidJUnit4.class)
 public class GrantPermissionRuleTest {
 
-  private static final String RUNTIME_PERMISSION1 = "android.permission.PERMISSION1";
-
-  @Mock public PermissionRequester permissionRequester;
-
-  private GrantPermissionRule grantPermissionRule;
+  @Test
+  public void newWakelock_permissionGranted() {
+    WakeLock wakeLock = createWakeLock();
+    assertThrows(SecurityException.class, wakeLock::acquire);
 
-  @Before
-  public void initMocks() {
-    MockitoAnnotations.initMocks(this);
-    grantPermissionRule = GrantPermissionRule.grant(RUNTIME_PERMISSION1);
-    grantPermissionRule.setPermissionGranter(permissionRequester);
+    GrantPermissionRule rule = GrantPermissionRule.grant(permission.WAKE_LOCK);
+    rule.apply(new EmptyStatement(), Description.EMPTY);
+    // now should succeed
+    wakeLock.acquire();
+    wakeLock.release();
   }
 
+  /**
+   * Simple test that external storage permission can be granted without error.
+   *
+   * <p>This is useful since libraries such as androidx.benchmark depend on this functionality. See
+   * b/268058721
+   */
   @Test
-  public void applyingRuleRunsPermissionRunsTest() throws Throwable {
-    Statement mockBaseStatement = mock(Statement.class);
-    Description mockDescription = mock(Description.class);
-
-    grantPermissionRule.apply(mockBaseStatement, mockDescription).evaluate();
-
-    verify(mockBaseStatement).evaluate();
-    verify(permissionRequester).requestPermissions();
+  public void externalStorage_granted() {
+    GrantPermissionRule rule = GrantPermissionRule.grant(permission.WRITE_EXTERNAL_STORAGE);
+    rule.apply(new EmptyStatement(), Description.EMPTY);
   }
 
-  @Test
-  public void requestingWriteExternalStoragePermission_addsReadExternalStoragePermission()
-      throws Throwable {
-    GrantPermissionRule grantPermissionRule = new GrantPermissionRule(permissionRequester);
-    Set<String> permissions =
-        grantPermissionRule.satisfyPermissionDependencies(permission.WRITE_EXTERNAL_STORAGE);
-    assertThat(permissions, hasSize(2));
-    assertThat(
-        permissions,
-        containsInAnyOrder(permission.WRITE_EXTERNAL_STORAGE, permission.READ_EXTERNAL_STORAGE));
+  private static WakeLock createWakeLock() {
+    PowerManager powerManager =
+        (PowerManager) getApplicationContext().getSystemService(POWER_SERVICE);
+    return powerManager.newWakeLock(
+        PowerManager.PARTIAL_WAKE_LOCK, "GrantPermissionRuleTest::MyWakelockTag");
   }
 
-  @Test
-  public void requestingPermission_doesNotAddReadExternalStoragePermission() throws Throwable {
-    GrantPermissionRule grantPermissionRule = new GrantPermissionRule(permissionRequester);
-    assertThat(
-        grantPermissionRule.satisfyPermissionDependencies(RUNTIME_PERMISSION1),
-        not(contains(permission.READ_EXTERNAL_STORAGE)));
+  private static class EmptyStatement extends Statement {
+    @Override
+    public void evaluate() throws Throwable {}
   }
 }
diff --git a/runner/rules/javatests/androidx/test/rule/ServiceTestRuleTest.java b/runner/rules/javatests/androidx/test/rule/ServiceTestRuleTest.java
index 865e0b736..7aabaec07 100644
--- a/runner/rules/javatests/androidx/test/rule/ServiceTestRuleTest.java
+++ b/runner/rules/javatests/androidx/test/rule/ServiceTestRuleTest.java
@@ -17,11 +17,12 @@
 package androidx.test.rule;
 
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.runner.JUnitCore.runClasses;
@@ -250,6 +251,22 @@ public void checkServiceTimeoutLogic() {
 
   @Rule public final ServiceTestRule serviceRule = new ServiceTestRule();
 
+  @Test
+  public void verifyFailureIfServiceNotStarted() throws Exception {
+    final class NotDeclaredService extends Service {
+      @Override
+      public IBinder onBind(Intent intent) {
+        return null;
+      }
+    }
+    try {
+      serviceRule.startService(new Intent(getApplicationContext(), NotDeclaredService.class));
+      fail("Should have thrown");
+    } catch (IllegalArgumentException e) {
+      assertThat(e.getMessage(), containsString("did not start a service"));
+    }
+  }
+
   @Test
   public void verifySuccessfulServiceStart() throws TimeoutException {
     serviceRule.startService(new Intent(getApplicationContext(), TestService.class));
diff --git a/runner/rules/javatests/androidx/test/rule/UiThreadTestRuleTest.java b/runner/rules/javatests/androidx/test/rule/UiThreadTestRuleTest.java
index d7241b587..354bf5600 100644
--- a/runner/rules/javatests/androidx/test/rule/UiThreadTestRuleTest.java
+++ b/runner/rules/javatests/androidx/test/rule/UiThreadTestRuleTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.runner.JUnitCore.runClasses;
 
@@ -173,14 +174,14 @@ public void verifyBeforeAndAfterRunNotOnUiThread() {
   @Test(timeout = 1000)
   @UiThreadTest
   public void verifyOnUiThreadWhenTimeoutUsed() {
-    new Handler();
+    var unused = new Handler();
     verifyRunsOnUiThread();
   }
 
-  @Test(timeout = 100, expected = RuntimeException.class)
+  @Test(timeout = 100)
   public void attemptingToCreateHandlerNotOnUiThreadThrows() {
     verifyRunsNotOnUiThread();
-    new Handler();
+    assertThrows(RuntimeException.class, () -> new Handler());
   }
 
   @Test()
diff --git a/runner/rules/javatests/androidx/test/rule/logging/AtraceLoggerTest.kt b/runner/rules/javatests/androidx/test/rule/logging/AtraceLoggerTest.kt
new file mode 100644
index 000000000..b6b9b0fa7
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/logging/AtraceLoggerTest.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.rule.logging
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/** Simple integration test for [AtraceLogger]. */
+@RunWith(AndroidJUnit4::class)
+class AtraceLoggerTest {
+
+  /**
+   * Simple test that just exercises the happy path of starting and stopping a trace, and ensures
+   * there are no crashes.
+   */
+  @Test
+  fun trace() {
+    val logger = AtraceLogger.getAtraceLoggerInstance(getInstrumentation())
+    assertThat(logger).isNotNull()
+    val categories = HashSet<String>()
+    categories.add("am")
+    logger.atraceStart(categories, 1024, 10, getInstrumentation().targetContext.cacheDir, null)
+    logger.atraceStop()
+  }
+}
diff --git a/runner/rules/javatests/androidx/test/rule/logging/BUILD b/runner/rules/javatests/androidx/test/rule/logging/BUILD
new file mode 100644
index 000000000..11c0ce6f2
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/logging/BUILD
@@ -0,0 +1,26 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load(
+    "//build_extensions:phone_devices.bzl",
+    "apis",
+    "devices",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+axt_android_library_test(
+    name = "AtraceLoggerTest",
+    srcs = ["AtraceLoggerTest.kt"],
+    device_list = devices(
+        apis(),
+    ),
+    deps = [
+        "//ext/junit",
+        "//runner/monitor",
+        "//runner/rules",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/runner/rules/javatests/androidx/test/rule/provider/BUILD b/runner/rules/javatests/androidx/test/rule/provider/BUILD
new file mode 100644
index 000000000..f1a21e6eb
--- /dev/null
+++ b/runner/rules/javatests/androidx/test/rule/provider/BUILD
@@ -0,0 +1,23 @@
+# Description: Tests for Rules.
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "DelegatingContextTest",
+    srcs = ["DelegatingContextTest.java"],
+    deps = [
+        "//core",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//runner/rules",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
diff --git a/runner/rules/javatests/androidx/test/rule/provider/DelegatingContextTest.java b/runner/rules/javatests/androidx/test/rule/provider/DelegatingContextTest.java
index 782a7daad..a8abc954a 100644
--- a/runner/rules/javatests/androidx/test/rule/provider/DelegatingContextTest.java
+++ b/runner/rules/javatests/androidx/test/rule/provider/DelegatingContextTest.java
@@ -30,7 +30,6 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -138,10 +137,9 @@ public void openOrCreateDatabaseWithoutHandler() {
 
   /**
    * Similar to test {@link #openOrCreateDatabaseWithoutHandler}, but test openOrCreateDatabase API
-   * with errorHandler, which is added in API level 11.
+   * with errorHandler.
    */
   @Test
-  @SdkSuppress(minSdkVersion = 11)
   public void openOrCreateDatabaseWithHandler() {
     assertEquals(delegatingContext.databaseList().length, 0);
     SQLiteDatabase testDatabase =
diff --git a/services/AndroidManifest.xml b/services/AndroidManifest.xml
index 82e20b5bf..831bd4fb1 100644
--- a/services/AndroidManifest.xml
+++ b/services/AndroidManifest.xml
@@ -17,10 +17,12 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
-  package="androidx.test.services">
+  package="androidx.test.services"
+  android:versionCode="2"
+  android:versionName="${appVersion}">
 
   <uses-sdk
-    android:minSdkVersion="14"
+    android:minSdkVersion="23"
     tools:overrideLibrary="android.support.graphics.drawable, androidx.vectordrawable.graphics.drawable.animated, androidx.test.services.speakeasy.server, androidx.test.services.storage.provider"
     android:targetSdkVersion="30" />
 
@@ -81,12 +83,6 @@
         android:directBootAware="true"
         android:exported="true"
         android:grantUriPermissions="true" />
-    <provider
-        android:name="androidx.test.services.storage.provider.TestDiagnosticsContentProvider"
-        android:authorities="androidx.test.services.storage.diagnostics"
-        android:directBootAware="true"
-        android:exported="true"
-        android:grantUriPermissions="true"/>
   </application>
 
 </manifest>
diff --git a/services/BUILD b/services/BUILD
new file mode 100644
index 000000000..ea6f35c85
--- /dev/null
+++ b/services/BUILD
@@ -0,0 +1,57 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("@rules_license//rules:license.bzl", "license")
+load("//build_extensions:axt_versions.bzl", "SERVICES_VERSION")
+load("//build_extensions/maven:axt_maven_apk.bzl", "axt_maven_apk")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+# Description:
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = [":license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+license(
+    name = "license",
+)
+
+exports_files(["LICENSE"])
+
+# Standard test services that can be installed on any device.
+android_binary(
+    name = "test_services",
+    custom_package = "androidx.test.services",
+    manifest = "AndroidManifest.xml",
+    manifest_values = {
+        "appVersion": SERVICES_VERSION,
+    },
+    proguard_specs = [
+        "//:proguard_binary.cfg",
+        "proguard_library.cfg",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+    deps = [
+        "//services/shellexecutor:exec_server",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/server",
+        "//services/storage/java/androidx/test/services/storage/provider:storage_content_providers",
+    ],
+)
+
+axt_maven_apk(
+    name = "test_services_release_apk",
+    included_dep = ":test_services",
+)
+
+maven_artifact(
+    name = "test_services_maven_artifact",
+    last_updated = "20191210000000",
+    target = ":test_services_release_apk",
+)
diff --git a/services/BUILD.bazel b/services/BUILD.bazel
deleted file mode 100644
index 775a60211..000000000
--- a/services/BUILD.bazel
+++ /dev/null
@@ -1,54 +0,0 @@
-# Description:
-#   Top level apk for services required for full orchestrated testing.
-licenses(["notice"])
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-)
-
-exports_files(["AndroidManifest.xml"])
-
-# Standard test services that can be installed on any device.
-android_binary(
-    name = "test_services",
-    custom_package = "androidx.test.services",
-    licenses = ["permissive"],
-    manifest = "AndroidManifest.xml",
-    proguard_specs = [
-        "//:proguard_binary.cfg",
-        "proguard_library.cfg",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//services/shellexecutor:exec_server",
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/server",
-        "//services/storage/java/androidx/test/services/storage/provider:storage_content_providers",
-    ],
-)
-
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "SERVICES_VERSION")
-load("//build_extensions:combine_jars.bzl", "combine_jars")
-
-combine_jars(
-    name = "test_services_jars",
-    srcs = [
-        "//services/shellexecutor:shellexecuter_src",
-        "//services/speakeasy/java/androidx/test/services/speakeasy:libprotocol-src.jar",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/server:libspeak_easy_service-src.jar",
-        "//services/storage/java/androidx/test/services/storage/provider:libstorage_content_providers-src.jar",
-    ],
-)
-
-maven_artifact(
-    name = "test_services_maven_artifact",
-    src = ":test_services.apk",
-    artifact_id = "test-services",
-    group_id = "androidx.test.services",
-    last_updated = "20191210000000",
-    src_jar = ":test_services_jars.jar",
-    version = "%s" % SERVICES_VERSION,
-)
diff --git a/services/CHANGELOG.md b/services/CHANGELOG.md
new file mode 100644
index 000000000..5f06775b0
--- /dev/null
+++ b/services/CHANGELOG.md
@@ -0,0 +1,19 @@
+### services {version} {:#services-{version}}
+
+{{date}}
+
+`androidx.test.services:test-services:{version}` `androidx.test.services:storage:{version}` are released.
+
+**Bug Fixes**
+
+**New Features**
+
+**Breaking Changes**
+
+**API Changes**
+
+* Update to minSdkVersion 23 and remove all related logic for SDKs < 23
+
+**Breaking API Changes**
+
+**Known Issues**
diff --git a/services/events/java/androidx/test/services/events/AnnotationInfo.java b/services/events/java/androidx/test/services/events/AnnotationInfo.java
index a86bcf668..59ce4c16c 100644
--- a/services/events/java/androidx/test/services/events/AnnotationInfo.java
+++ b/services/events/java/androidx/test/services/events/AnnotationInfo.java
@@ -21,6 +21,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,7 +32,10 @@
  *
  * <p>See <a href="https://developer.android.com/reference/android/os/Parcelable.html">Android
  * Parcelable</a>.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class AnnotationInfo implements Parcelable {
   /** Name of the annotation. For example: {@code com.java.Foo}. */
   @NonNull public final String name;
diff --git a/services/events/java/androidx/test/services/events/AnnotationValue.java b/services/events/java/androidx/test/services/events/AnnotationValue.java
index 8c5ffdc6a..d5e6e1a23 100644
--- a/services/events/java/androidx/test/services/events/AnnotationValue.java
+++ b/services/events/java/androidx/test/services/events/AnnotationValue.java
@@ -21,6 +21,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,7 +30,10 @@
  *
  * <p>See <a href="https://developer.android.com/reference/android/os/Parcelable.html">Android
  * Parcelable</a>.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class AnnotationValue implements Parcelable {
   /** Name of the field in a {@link java.lang.annotation.Annotation}. */
   @NonNull public final String fieldName;
diff --git a/services/events/java/androidx/test/services/events/BUILD b/services/events/java/androidx/test/services/events/BUILD
new file mode 100644
index 000000000..a25676d79
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/BUILD
@@ -0,0 +1,31 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+android_library(
+    name = "events",
+    srcs = glob(["**/*.java"]),
+    idl_parcelables = [
+        "discovery/TestDiscoveryEvent.aidl",
+        "platform/TestPlatformEvent.aidl",
+        "run/TestRunEvent.aidl",
+    ],
+    idl_srcs = [
+        "discovery/ITestDiscoveryEvent.aidl",
+        "platform/ITestPlatformEvent.aidl",
+        "run/ITestRunEvent.aidl",
+    ],
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/services/events/java/androidx/test/services/events/BUILD.bazel b/services/events/java/androidx/test/services/events/BUILD.bazel
deleted file mode 100644
index 33cd4edb4..000000000
--- a/services/events/java/androidx/test/services/events/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-licenses(["notice"])
-
-android_library(
-    name = "events",
-    srcs = glob(["**/*.java"]),
-    idl_parcelables = [
-        "discovery/TestDiscoveryEvent.aidl",
-        "run/TestRunEvent.aidl",
-        "platform/TestPlatformEvent.aidl",
-    ],
-    idl_srcs = [
-        "discovery/ITestDiscoveryEvent.aidl",
-        "run/ITestRunEvent.aidl",
-        "platform/ITestPlatformEvent.aidl",
-    ],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//:androidx_annotation",
-        "//runner/monitor/java/androidx/test:monitor",
-        "@maven//:junit_junit",
-    ],
-)
diff --git a/services/events/java/androidx/test/services/events/ErrorInfo.java b/services/events/java/androidx/test/services/events/ErrorInfo.java
index fad450944..8ebbd9b7a 100644
--- a/services/events/java/androidx/test/services/events/ErrorInfo.java
+++ b/services/events/java/androidx/test/services/events/ErrorInfo.java
@@ -22,10 +22,16 @@
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.test.services.events.internal.StackTrimmer;
+import org.junit.runner.notification.Failure;
 
 /**
  * Denotes an android test error. Has details of the error including stack trace, type, and message.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class ErrorInfo implements Parcelable {
 
   /** The message associated with the error. */
@@ -81,4 +87,11 @@ public ErrorInfo[] newArray(int size) {
           return new ErrorInfo[size];
         }
       };
+
+  public static ErrorInfo createFromFailure(Failure failure) {
+    return new ErrorInfo(
+        StackTrimmer.getTrimmedMessage(failure),
+        failure.getException().getClass().getName(),
+        StackTrimmer.getTrimmedStackTrace(failure));
+  }
 }
diff --git a/services/events/java/androidx/test/services/events/FailureInfo.java b/services/events/java/androidx/test/services/events/FailureInfo.java
index 8d60ba3f4..5812226e0 100644
--- a/services/events/java/androidx/test/services/events/FailureInfo.java
+++ b/services/events/java/androidx/test/services/events/FailureInfo.java
@@ -22,11 +22,15 @@
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
 
 /**
  * Denotes an android test failure, has details of the failure including stack trace / type and
  * message.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class FailureInfo implements Parcelable {
 
   /** The failure message associated with the failure. */
diff --git a/services/events/java/androidx/test/services/events/ParcelableConverter.java b/services/events/java/androidx/test/services/events/ParcelableConverter.java
index 1d47620de..c39a02c6e 100644
--- a/services/events/java/androidx/test/services/events/ParcelableConverter.java
+++ b/services/events/java/androidx/test/services/events/ParcelableConverter.java
@@ -18,9 +18,10 @@
 
 import static java.util.Collections.emptyList;
 
+import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import android.util.Log;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.internal.StackTrimmer;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
@@ -34,7 +35,10 @@
 /**
  * Utility to convert JUnit {@link Description} and related test data classes to parcelables for
  * sending to a remote service.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class ParcelableConverter {
 
   private static final String TAG = "ParcelableConverter";
diff --git a/services/events/java/androidx/test/services/events/TestCaseInfo.java b/services/events/java/androidx/test/services/events/TestCaseInfo.java
index 27ad84db6..c3c458b50 100644
--- a/services/events/java/androidx/test/services/events/TestCaseInfo.java
+++ b/services/events/java/androidx/test/services/events/TestCaseInfo.java
@@ -20,6 +20,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,7 +33,10 @@
  *
  * <p>See <a href="https://developer.android.com/reference/android/os/Parcelable.html">Android
  * Parcelable</a>.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class TestCaseInfo implements Parcelable {
   /** Name of the test class. */
   @NonNull public final String className;
diff --git a/services/events/java/androidx/test/services/events/TestEventException.java b/services/events/java/androidx/test/services/events/TestEventException.java
index de20edc97..aca71afd2 100644
--- a/services/events/java/androidx/test/services/events/TestEventException.java
+++ b/services/events/java/androidx/test/services/events/TestEventException.java
@@ -17,8 +17,14 @@
 package androidx.test.services.events;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
-/** A checked {@link Exception} indicating that a test event operation failed. */
+/**
+ * A checked {@link Exception} indicating that a test event operation failed.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestEventException extends Exception {
   /** Creates a new {@link TestEventException} with the given message. */
   public TestEventException(@NonNull String message) {
diff --git a/services/events/java/androidx/test/services/events/TestRunInfo.java b/services/events/java/androidx/test/services/events/TestRunInfo.java
index 27fbc7969..7cd298073 100644
--- a/services/events/java/androidx/test/services/events/TestRunInfo.java
+++ b/services/events/java/androidx/test/services/events/TestRunInfo.java
@@ -20,6 +20,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,7 +30,10 @@
  *
  * <p>See <a href="https://developer.android.com/reference/android/os/Parcelable.html">Android
  * Parcelable</a>.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class TestRunInfo implements Parcelable {
   /** Name of this test run */
   @NonNull public final String testRunName;
diff --git a/services/events/java/androidx/test/services/events/TestStatus.java b/services/events/java/androidx/test/services/events/TestStatus.java
index 816c07f91..69aff9586 100644
--- a/services/events/java/androidx/test/services/events/TestStatus.java
+++ b/services/events/java/androidx/test/services/events/TestStatus.java
@@ -21,8 +21,14 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 
-/** The final status of a Test Case or Test Run. */
+/**
+ * The final status of a Test Case or Test Run.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class TestStatus implements Parcelable {
   /**
    * Valid test statuses for individual test cases and test runs. Check the documentation on
diff --git a/services/events/java/androidx/test/services/events/TimeStamp.java b/services/events/java/androidx/test/services/events/TimeStamp.java
index a9181547f..9c2210c33 100644
--- a/services/events/java/androidx/test/services/events/TimeStamp.java
+++ b/services/events/java/androidx/test/services/events/TimeStamp.java
@@ -17,14 +17,24 @@
 package androidx.test.services.events;
 
 import static androidx.test.internal.util.Checks.checkNotNull;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
 
+import android.annotation.TargetApi;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import java.time.Clock;
+import java.time.Instant;
 
 /**
  * Denotes an android test error. Has details of the error including stack trace, type, and message.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class TimeStamp implements Parcelable {
 
   /** Represents sends of UTC time since the Unix epoch. */
@@ -33,6 +43,9 @@ public final class TimeStamp implements Parcelable {
   /** Timestamp nanoseconds - must be non negative even if seconds is negative. */
   @NonNull public final Integer nanos;
 
+  /** Clock, package-private for testing. */
+  static Clock clock = null;
+
   /** Constructor to create a {@link TimeStamp}. */
   public TimeStamp(@NonNull Long seconds, @NonNull Integer nanos) {
     this.seconds = checkNotNull(seconds, "seconds cannot be null");
@@ -73,4 +86,32 @@ public TimeStamp[] newArray(int size) {
           return new TimeStamp[size];
         }
       };
+
+  @TargetApi(Build.VERSION_CODES.O)
+  private static TimeStamp modernNow() {
+    if (clock == null) {
+      clock = Clock.systemUTC();
+    }
+    Instant now = Instant.now(clock);
+    return new TimeStamp(now.getEpochSecond(), now.getNano());
+  }
+
+  @TargetApi(Build.VERSION_CODES.N_MR1)
+  @SuppressWarnings({"MillisTo_Seconds", "MillisTo_Nanos", "SecondsTo_Nanos"})
+  private static TimeStamp legacyNow() {
+    // System.nanoTime() only gives you a high-resolution time source and makes no guarantees
+    // about the event it references; it can be negative!
+    long now = System.currentTimeMillis();
+    long seconds = MILLISECONDS.toSeconds(now);
+    long nanosOffset = MILLISECONDS.toNanos(now) - SECONDS.toNanos(seconds);
+    return new TimeStamp(seconds, (int) nanosOffset);
+  }
+
+  public static TimeStamp now() {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      return modernNow();
+    } else {
+      return legacyNow();
+    }
+  }
 }
diff --git a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryErrorEvent.java b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryErrorEvent.java
new file mode 100644
index 000000000..2033ff3e3
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryErrorEvent.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.events.discovery;
+
+import static androidx.test.internal.util.Checks.checkNotNull;
+
+import android.os.Parcel;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.test.services.events.ErrorInfo;
+import androidx.test.services.events.TimeStamp;
+
+/**
+ * This event is sent when an error is encountered during test discovery. Multiple {@link
+ * TestDiscoveryErrorEvent}s may be reported. This event does not mean discovery has finished.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+public class TestDiscoveryErrorEvent extends TestDiscoveryEvent {
+  /* The error that occurred */
+  @NonNull public final ErrorInfo error;
+  /* The time when this error occurred */
+  @NonNull public final TimeStamp timeStamp;
+
+  /**
+   * Constructor to create {@link TestDiscoveryErrorEvent}.
+   *
+   * @param error the error that occurred.
+   * @param timeStamp the time when this error occurred.
+   */
+  public TestDiscoveryErrorEvent(@NonNull ErrorInfo error, @NonNull TimeStamp timeStamp) {
+    this.error = checkNotNull(error, "error cannot be null");
+    this.timeStamp = checkNotNull(timeStamp, "timeStamp cannot be null");
+  }
+
+  /**
+   * Creates a {@link TestDiscoveryErrorEvent} from an {@link Parcel}.
+   *
+   * @param source {@link Parcel} to create the {@link TestDiscoveryErrorEvent} from.
+   */
+  TestDiscoveryErrorEvent(Parcel source) {
+    error = new ErrorInfo(source);
+    timeStamp = new TimeStamp(source);
+  }
+
+  @Override
+  EventType instanceType() {
+    return EventType.ERROR;
+  }
+
+  @Override
+  public void writeToParcel(Parcel parcel, int i) {
+    super.writeToParcel(parcel, i);
+    error.writeToParcel(parcel, i);
+    timeStamp.writeToParcel(parcel, i);
+  }
+}
diff --git a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEvent.java b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEvent.java
index 9f1f85619..7724606bc 100644
--- a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEvent.java
+++ b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEvent.java
@@ -18,8 +18,14 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.RestrictTo;
 
-/** Base class for different test discovery events to implement. */
+/**
+ * Base class for different test discovery events to implement.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class TestDiscoveryEvent implements Parcelable {
   TestDiscoveryEvent() {}
 
@@ -27,6 +33,7 @@ public abstract class TestDiscoveryEvent implements Parcelable {
   enum EventType {
     STARTED,
     TEST_FOUND,
+    ERROR,
     FINISHED
   }
 
diff --git a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEventFactory.java b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEventFactory.java
index c02ae25e1..4c89146ba 100644
--- a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEventFactory.java
+++ b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryEventFactory.java
@@ -18,13 +18,17 @@
 
 import android.os.Parcel;
 import android.os.Parcelable.Creator;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.discovery.TestDiscoveryEvent.EventType;
 
 /**
  * The factory for {@link TestDiscoveryEvent#CREATOR}. When the parcel was created, the first entry
  * written to it was the {@link TestDiscoveryEvent#instanceType()} enum value, so use the EventType
  * to instantiate the correct subclass.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 final class TestDiscoveryEventFactory implements Creator<TestDiscoveryEvent> {
   @Override
   public TestDiscoveryEvent createFromParcel(Parcel source) {
@@ -34,6 +38,8 @@ public TestDiscoveryEvent createFromParcel(Parcel source) {
         return new TestDiscoveryStartedEvent();
       case TEST_FOUND:
         return new TestFoundEvent(source);
+      case ERROR:
+        return new TestDiscoveryErrorEvent(source);
       case FINISHED:
         return new TestDiscoveryFinishedEvent();
     }
diff --git a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryFinishedEvent.java b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryFinishedEvent.java
index 950b1766b..fc2075f74 100644
--- a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryFinishedEvent.java
+++ b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryFinishedEvent.java
@@ -16,7 +16,14 @@
 
 package androidx.test.services.events.discovery;
 
-/** Denotes that test discovery has finished */
+import androidx.annotation.RestrictTo;
+
+/**
+ * Denotes that test discovery has finished
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestDiscoveryFinishedEvent extends TestDiscoveryEvent {
   @Override
   EventType instanceType() {
diff --git a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryStartedEvent.java b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryStartedEvent.java
index 393121700..179a0a5f8 100644
--- a/services/events/java/androidx/test/services/events/discovery/TestDiscoveryStartedEvent.java
+++ b/services/events/java/androidx/test/services/events/discovery/TestDiscoveryStartedEvent.java
@@ -16,7 +16,14 @@
 
 package androidx.test.services.events.discovery;
 
-/** Denotes that test discovery has started */
+import androidx.annotation.RestrictTo;
+
+/**
+ * Denotes that test discovery has started
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestDiscoveryStartedEvent extends TestDiscoveryEvent {
   @Override
   EventType instanceType() {
diff --git a/services/events/java/androidx/test/services/events/discovery/TestFoundEvent.java b/services/events/java/androidx/test/services/events/discovery/TestFoundEvent.java
index 76f805d00..8a7c6c793 100644
--- a/services/events/java/androidx/test/services/events/discovery/TestFoundEvent.java
+++ b/services/events/java/androidx/test/services/events/discovery/TestFoundEvent.java
@@ -20,12 +20,16 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that test discovery has found a test case. The {@link TestCaseInfo} is provided along
  * with the event.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestFoundEvent extends TestDiscoveryEvent {
   @NonNull public final TestCaseInfo testCase;
 
diff --git a/services/events/java/androidx/test/services/events/discovery/package-info.java b/services/events/java/androidx/test/services/events/discovery/package-info.java
new file mode 100644
index 000000000..925dec37d
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/discovery/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY_GROUP)
+package androidx.test.services.events.discovery;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/services/events/java/androidx/test/services/events/internal/StackTrimmer.java b/services/events/java/androidx/test/services/events/internal/StackTrimmer.java
index b77016242..336d57f61 100644
--- a/services/events/java/androidx/test/services/events/internal/StackTrimmer.java
+++ b/services/events/java/androidx/test/services/events/internal/StackTrimmer.java
@@ -47,7 +47,14 @@ public static String getTrimmedStackTrace(Failure failure) {
   }
 
   public static String getTrimmedMessage(Failure failure) {
-    String message = failure.getMessage();
+    String message = null;
+    try {
+      // Even this can fail! If so, don't let it wreck error reporting.
+      message = failure.getMessage();
+    } catch (Throwable t) {
+      Log.e(TAG, "Failed to get message from " + failure, t);
+      message = "Couldn't get message due to " + t.getMessage();
+    }
     if (message != null && message.length() > MAX_TRACE_SIZE) {
       // Since AJUR needs to report failures back to AM via a binder IPC, we need to make sure that
       // we don't exceed the Binder transaction limit - which is 1MB per process.
@@ -57,4 +64,16 @@ public static String getTrimmedMessage(Failure failure) {
     }
     return message;
   }
+
+  /** Truncates the given text to ensure it doesn't exceed Binder transaction limit */
+  public static String getTrimmedSummary(String summary) {
+    if (summary != null && summary.length() > MAX_TRACE_SIZE) {
+      // Since AJUR needs to report failures back to AM via a binder IPC, we need to make sure that
+      // we don't exceed the Binder transaction limit - which is 1MB per process.
+      Log.w(
+          TAG, String.format("Content too long, trimmed to first %s characters.", MAX_TRACE_SIZE));
+      summary = summary.substring(0, MAX_TRACE_SIZE) + "\n";
+    }
+    return summary;
+  }
 }
diff --git a/services/events/java/androidx/test/services/events/internal/Throwables.java b/services/events/java/androidx/test/services/events/internal/Throwables.java
index 7df96e72f..cd5fb8bae 100644
--- a/services/events/java/androidx/test/services/events/internal/Throwables.java
+++ b/services/events/java/androidx/test/services/events/internal/Throwables.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package androidx.test.services.events.internal;
 
 import java.io.BufferedReader;
@@ -35,6 +50,8 @@ public static String getTrimmedStackTrace(Throwable exception) {
 
     StringBuilder result = new StringBuilder(exception.toString());
     appendStackTraceLines(trimmedStackTraceLines, result);
+    // Throwable.lockedPrintStackTrace prints suppressed exceptions before it prints the cause.
+    appendStackTraceLines(getSuppressedStackTraceLines(exception), result);
     appendStackTraceLines(getCauseStackTraceLines(exception), result);
     return result.toString();
   }
@@ -63,6 +80,27 @@ private static List<String> getTrimmedStackTraceLines(Throwable exception) {
     return Collections.emptyList();
   }
 
+  private static List<String> getSuppressedStackTraceLines(Throwable exception) {
+    if (exception.getSuppressed() == null || exception.getSuppressed().length == 0) {
+      return Collections.emptyList();
+    }
+    List<String> lines = new ArrayList<>();
+    for (Throwable suppressed : exception.getSuppressed()) {
+      lines.add(
+          "\tSuppressed: " + suppressed.getClass().getName() + ": " + suppressed.getMessage());
+      for (String line : getTrimmedStackTraceLines(suppressed)) {
+        if (line.isEmpty()) {
+          continue;
+        }
+        lines.add("\t" + line);
+      }
+      for (String line : getCauseStackTraceLines(suppressed)) {
+        lines.add("\t" + line);
+      }
+    }
+    return lines;
+  }
+
   private static List<String> getCauseStackTraceLines(Throwable exception) {
     if (exception.getCause() != null) {
       String fullTrace = getFullStackTrace(exception);
diff --git a/services/events/java/androidx/test/services/events/internal/package-info.java b/services/events/java/androidx/test/services/events/internal/package-info.java
new file mode 100644
index 000000000..545632778
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/internal/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.services.events.internal;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/services/events/java/androidx/test/services/events/package-info.java b/services/events/java/androidx/test/services/events/package-info.java
new file mode 100644
index 000000000..87a87ac0f
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY_GROUP)
+package androidx.test.services.events;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/services/events/java/androidx/test/services/events/platform/TestCaseErrorEvent.java b/services/events/java/androidx/test/services/events/platform/TestCaseErrorEvent.java
index dd75c4351..5e63a585b 100644
--- a/services/events/java/androidx/test/services/events/platform/TestCaseErrorEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestCaseErrorEvent.java
@@ -20,6 +20,7 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.ErrorInfo;
 import androidx.test.services.events.TestCaseInfo;
 import androidx.test.services.events.TimeStamp;
@@ -31,7 +32,9 @@
  * @see TestCaseFinishedEvent to signal an individual test case as completed.
  * @see TestRunErrorEvent to signal errors that are not able to be attributed to an individual test
  *     case.
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestCaseErrorEvent extends TestPlatformEvent {
   @NonNull public final TestCaseInfo testCase;
   @NonNull public final ErrorInfo error;
diff --git a/services/events/java/androidx/test/services/events/platform/TestCaseFinishedEvent.java b/services/events/java/androidx/test/services/events/platform/TestCaseFinishedEvent.java
index b0cab8eaa..e3ed6aa34 100644
--- a/services/events/java/androidx/test/services/events/platform/TestCaseFinishedEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestCaseFinishedEvent.java
@@ -20,6 +20,7 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 import androidx.test.services.events.TestStatus;
 import androidx.test.services.events.TimeStamp;
@@ -39,7 +40,9 @@
  * @see TestCaseStartedEvent to signal that a test case has started.
  * @see TestCaseErrorEvent for reporting errors that occurred while this test case was running.
  * @see TestStatus.Status for more information on our test statuses.
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestCaseFinishedEvent extends TestPlatformEvent {
   /* The test case that finished */
   @NonNull public final TestCaseInfo testCase;
diff --git a/services/events/java/androidx/test/services/events/platform/TestCaseStartedEvent.java b/services/events/java/androidx/test/services/events/platform/TestCaseStartedEvent.java
index 75554d15c..4a802c389 100644
--- a/services/events/java/androidx/test/services/events/platform/TestCaseStartedEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestCaseStartedEvent.java
@@ -20,6 +20,7 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 import androidx.test.services.events.TimeStamp;
 
@@ -38,7 +39,9 @@
  *
  * @see TestCaseFinishedEvent to indicate the end of a test case
  * @see TestCaseErrorEvent for reporting various errors encountered during a test run.
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class TestCaseStartedEvent extends TestPlatformEvent {
   /** The test case that started. */
   @NonNull public final TestCaseInfo testCase;
diff --git a/services/events/java/androidx/test/services/events/platform/TestPlatformEvent.java b/services/events/java/androidx/test/services/events/platform/TestPlatformEvent.java
index 95c732eba..d4dad6735 100644
--- a/services/events/java/androidx/test/services/events/platform/TestPlatformEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestPlatformEvent.java
@@ -18,14 +18,20 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.RestrictTo;
 
-/** Base class for all other {@code TestPlatformEvents} to extend. */
+/**
+ * Base class for all other {@code TestPlatformEvents} to extend.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class TestPlatformEvent implements Parcelable {
   /** Creates a {@link TestPlatformEvent}. */
   TestPlatformEvent() {}
 
   /** Each derived class will return its corresponding EventType in {@link #instanceType()}. */
-  enum EventType {
+  public enum EventType {
     TEST_RUN_STARTED,
     TEST_RUN_ERROR,
     TEST_RUN_FINISHED,
diff --git a/services/events/java/androidx/test/services/events/platform/TestPlatformEventFactory.java b/services/events/java/androidx/test/services/events/platform/TestPlatformEventFactory.java
index de2b9e838..cd080ac13 100644
--- a/services/events/java/androidx/test/services/events/platform/TestPlatformEventFactory.java
+++ b/services/events/java/androidx/test/services/events/platform/TestPlatformEventFactory.java
@@ -18,13 +18,17 @@
 
 import android.os.Parcel;
 import android.os.Parcelable.Creator;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.platform.TestPlatformEvent.EventType;
 
 /**
  * The factory for {@link TestPlatformEvent#CREATOR}. When the parcel was created, the first entry
  * written to it was the {@link TestPlatformEvent#instanceType()} enum value, so use the EventType
  * to instantiate the correct subclass.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public final class TestPlatformEventFactory implements Creator<TestPlatformEvent> {
   @Override
   public TestPlatformEvent createFromParcel(Parcel source) {
diff --git a/services/events/java/androidx/test/services/events/platform/TestRunErrorEvent.java b/services/events/java/androidx/test/services/events/platform/TestRunErrorEvent.java
index f29d067dc..1a88aa394 100644
--- a/services/events/java/androidx/test/services/events/platform/TestRunErrorEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestRunErrorEvent.java
@@ -20,6 +20,7 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.ErrorInfo;
 import androidx.test.services.events.TestRunInfo;
 import androidx.test.services.events.TimeStamp;
@@ -31,7 +32,9 @@
  *
  * @see TestCaseErrorEvent for an event regarding errors for a specific test.
  * @see TestRunFinishedEvent to mark the test run as finished.
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestRunErrorEvent extends TestPlatformEvent {
   /* The test run this error is attributed to */
   @NonNull public final TestRunInfo testRun;
diff --git a/services/events/java/androidx/test/services/events/platform/TestRunFinishedEvent.java b/services/events/java/androidx/test/services/events/platform/TestRunFinishedEvent.java
index 6612548e2..1fbae582d 100644
--- a/services/events/java/androidx/test/services/events/platform/TestRunFinishedEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestRunFinishedEvent.java
@@ -20,6 +20,7 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestRunInfo;
 import androidx.test.services.events.TestStatus;
 import androidx.test.services.events.TimeStamp;
@@ -29,7 +30,9 @@
  * sent after this. This event should always be emitted.
  *
  * @see TestRunStartedEvent to begin a test run.
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestRunFinishedEvent extends TestPlatformEvent {
   /* The test run that finished */
   public final TestRunInfo testRun;
diff --git a/services/events/java/androidx/test/services/events/platform/TestRunStartedEvent.java b/services/events/java/androidx/test/services/events/platform/TestRunStartedEvent.java
index bf4c0a5b5..9144bf0a9 100644
--- a/services/events/java/androidx/test/services/events/platform/TestRunStartedEvent.java
+++ b/services/events/java/androidx/test/services/events/platform/TestRunStartedEvent.java
@@ -20,6 +20,7 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestRunInfo;
 import androidx.test.services.events.TimeStamp;
 
@@ -29,7 +30,9 @@
  *
  * @see TestRunFinishedEvent to report that a test run is finished.
  * @see TestCaseStartedEvent to report individual test cases have begun.
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestRunStartedEvent extends TestPlatformEvent {
   /* The test run that started */
   public final TestRunInfo testRun;
diff --git a/services/events/java/androidx/test/services/events/platform/package-info.java b/services/events/java/androidx/test/services/events/platform/package-info.java
new file mode 100644
index 000000000..46c4126a3
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/platform/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY_GROUP)
+package androidx.test.services.events.platform;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/services/events/java/androidx/test/services/events/run/TestAssumptionFailureEvent.java b/services/events/java/androidx/test/services/events/run/TestAssumptionFailureEvent.java
index 06cf46940..8f7eee556 100644
--- a/services/events/java/androidx/test/services/events/run/TestAssumptionFailureEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestAssumptionFailureEvent.java
@@ -18,13 +18,17 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.FailureInfo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that the test ended with a TEST_ASSUMPTION_FAILURE. It has the {@link FailureInfo} object
  * to denote what was the cause of the failure/error.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestAssumptionFailureEvent extends TestFailureEvent {
   /**
    * Creates a {@link TestAssumptionFailureEvent} from {@link TestCaseInfo} and {@link FailureInfo}.
diff --git a/services/events/java/androidx/test/services/events/run/TestFailureEvent.java b/services/events/java/androidx/test/services/events/run/TestFailureEvent.java
index c6803af44..e0bec114f 100644
--- a/services/events/java/androidx/test/services/events/run/TestFailureEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestFailureEvent.java
@@ -20,13 +20,17 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.FailureInfo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that the test ended with a TEST_FAILURE. It has the {@link FailureInfo} object to denote
  * what was the cause of the failure/error.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestFailureEvent extends TestRunEventWithTestCase {
   @NonNull public final FailureInfo failure;
 
diff --git a/services/events/java/androidx/test/services/events/run/TestFinishedEvent.java b/services/events/java/androidx/test/services/events/run/TestFinishedEvent.java
index b0114eca4..144309657 100644
--- a/services/events/java/androidx/test/services/events/run/TestFinishedEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestFinishedEvent.java
@@ -18,12 +18,16 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that the test ended with a TEST_FINISHED. It has the {@link TestCaseInfo} object to
  * denote which case this event is associated to.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestFinishedEvent extends TestRunEventWithTestCase {
   /**
    * Constructor to create {@link TestFinishedEvent}.
diff --git a/services/events/java/androidx/test/services/events/run/TestIgnoredEvent.java b/services/events/java/androidx/test/services/events/run/TestIgnoredEvent.java
index 0f3e9b669..029b110fe 100644
--- a/services/events/java/androidx/test/services/events/run/TestIgnoredEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestIgnoredEvent.java
@@ -18,12 +18,16 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that the test ended with a TEST_IGNORED. It has the {@link TestCaseInfo} object to denote
  * which case this event is associated to.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestIgnoredEvent extends TestRunEventWithTestCase {
   /**
    * Constructor to create {@link TestFinishedEvent}.
diff --git a/services/events/java/androidx/test/services/events/run/TestRunEvent.java b/services/events/java/androidx/test/services/events/run/TestRunEvent.java
index 59e7856ea..10f5b7cc5 100644
--- a/services/events/java/androidx/test/services/events/run/TestRunEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestRunEvent.java
@@ -18,8 +18,14 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.RestrictTo;
 
-/** Base class for all other {@code TestRunEvents} to extend. */
+/**
+ * Base class for all other {@code TestRunEvents} to extend.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class TestRunEvent implements Parcelable {
   /** Creates a {@link TestRunEvent}. */
   TestRunEvent() {}
diff --git a/services/events/java/androidx/test/services/events/run/TestRunEventFactory.java b/services/events/java/androidx/test/services/events/run/TestRunEventFactory.java
index d9be9058e..27e2cb668 100644
--- a/services/events/java/androidx/test/services/events/run/TestRunEventFactory.java
+++ b/services/events/java/androidx/test/services/events/run/TestRunEventFactory.java
@@ -18,13 +18,17 @@
 
 import android.os.Parcel;
 import android.os.Parcelable.Creator;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.run.TestRunEvent.EventType;
 
 /**
  * The factory for {@link TestRunEvent#CREATOR}. When the parcel was created, the first entry
  * written to it was the {@link TestRunEvent#instanceType()} enum value, so use the EventType to
  * instantiate the correct subclass.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 final class TestRunEventFactory implements Creator<TestRunEvent> {
   @Override
   public TestRunEvent createFromParcel(Parcel source) {
diff --git a/services/events/java/androidx/test/services/events/run/TestRunEventWithTestCase.java b/services/events/java/androidx/test/services/events/run/TestRunEventWithTestCase.java
index e765986f5..5a6d9d3f5 100644
--- a/services/events/java/androidx/test/services/events/run/TestRunEventWithTestCase.java
+++ b/services/events/java/androidx/test/services/events/run/TestRunEventWithTestCase.java
@@ -20,9 +20,15 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 
-/** Represents a {@link TestRunEvent} with an associated {@link TestCaseInfo}. */
+/**
+ * Represents a {@link TestRunEvent} with an associated {@link TestCaseInfo}.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public abstract class TestRunEventWithTestCase extends TestRunEvent {
   /** The {@link TestCaseInfo} this event is associated with. */
   @NonNull public final TestCaseInfo testCase;
diff --git a/services/events/java/androidx/test/services/events/run/TestRunFinishedEvent.java b/services/events/java/androidx/test/services/events/run/TestRunFinishedEvent.java
index 8a8350fcd..758b39b94 100644
--- a/services/events/java/androidx/test/services/events/run/TestRunFinishedEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestRunFinishedEvent.java
@@ -21,11 +21,17 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.FailureInfo;
 import java.util.ArrayList;
 import java.util.List;
 
-/** Denotes that the test ended with a TEST_RUN_FINISHED event. */
+/**
+ * Denotes that the test ended with a TEST_RUN_FINISHED event.
+ *
+ * @hide
+ */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestRunFinishedEvent extends TestRunEvent {
   public final int count;
   public final int ignoreCount;
diff --git a/services/events/java/androidx/test/services/events/run/TestRunStartedEvent.java b/services/events/java/androidx/test/services/events/run/TestRunStartedEvent.java
index ce833bd68..954aba978 100644
--- a/services/events/java/androidx/test/services/events/run/TestRunStartedEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestRunStartedEvent.java
@@ -18,12 +18,16 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that the test ended with a TEST_RUN_STARTED event. It has the {@link TestCaseInfo} object
  * to denote which case this event is associated to.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestRunStartedEvent extends TestRunEventWithTestCase {
   /**
    * Constructor to create {@link TestRunStartedEvent}.
diff --git a/services/events/java/androidx/test/services/events/run/TestStartedEvent.java b/services/events/java/androidx/test/services/events/run/TestStartedEvent.java
index b6f85b408..0bf021d5b 100644
--- a/services/events/java/androidx/test/services/events/run/TestStartedEvent.java
+++ b/services/events/java/androidx/test/services/events/run/TestStartedEvent.java
@@ -18,12 +18,16 @@
 
 import android.os.Parcel;
 import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
 import androidx.test.services.events.TestCaseInfo;
 
 /**
  * Denotes that the test ended with a TEST_STARTED. It has the {@link TestCaseInfo} object that this
  * event is associated with.
+ *
+ * @hide
  */
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class TestStartedEvent extends TestRunEventWithTestCase {
 
   /**
diff --git a/services/events/java/androidx/test/services/events/run/package-info.java b/services/events/java/androidx/test/services/events/run/package-info.java
new file mode 100644
index 000000000..054fd480a
--- /dev/null
+++ b/services/events/java/androidx/test/services/events/run/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY_GROUP)
+package androidx.test.services.events.run;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/services/events/javatests/androidx/test/services/events/BUILD b/services/events/javatests/androidx/test/services/events/BUILD
new file mode 100644
index 000000000..c839dba66
--- /dev/null
+++ b/services/events/javatests/androidx/test/services/events/BUILD
@@ -0,0 +1,116 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+# Tests for On-Device Infrastructure - Orchestrator
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+axt_android_local_test(
+    name = "TestCaseInfoTest",
+    size = "small",
+    srcs = [
+        "TestCaseInfoTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "FailureInfoTest",
+    size = "small",
+    srcs = [
+        "FailureInfoTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "ParcelableConverterTest",
+    size = "small",
+    srcs = [
+        "ParcelableConverterTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRunInfoTest",
+    size = "small",
+    srcs = [
+        "TestRunInfoTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "ErrorInfoTest",
+    size = "small",
+    srcs = [
+        "ErrorInfoTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TimeStampTest",
+    size = "small",
+    srcs = [
+        "TimeStampTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "TimeStampEmulatorTest",
+    size = "medium",  # generic_phone_android_28_x86 is flaky at "small"
+    srcs = ["TimeStampEmulatorTest.java"],
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",  # unuseddeps: keep
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestStatusTest",
+    size = "small",
+    srcs = [
+        "TestStatusTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/services/events/javatests/androidx/test/services/events/TimeStampEmulatorTest.java b/services/events/javatests/androidx/test/services/events/TimeStampEmulatorTest.java
new file mode 100644
index 000000000..92297a19f
--- /dev/null
+++ b/services/events/javatests/androidx/test/services/events/TimeStampEmulatorTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.events;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class TimeStampEmulatorTest {
+
+  /** Verify that the API 26+ code is corralled so it won't fail on lower APIs. */
+  @Test
+  public void now_works() {
+    TimeStamp now = TimeStamp.now();
+    assertThat(now.seconds).isGreaterThan(0);
+    assertThat(now.nanos).isGreaterThan(-1);
+  }
+}
diff --git a/services/events/javatests/androidx/test/services/events/TimeStampTest.java b/services/events/javatests/androidx/test/services/events/TimeStampTest.java
index 7c30ee31d..9194b1a0d 100644
--- a/services/events/javatests/androidx/test/services/events/TimeStampTest.java
+++ b/services/events/javatests/androidx/test/services/events/TimeStampTest.java
@@ -17,17 +17,25 @@
 package androidx.test.services.events;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.time.ZoneOffset.UTC;
 
+import android.os.Build;
 import android.os.Parcel;
+import android.os.SystemClock;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import java.time.Clock;
+import java.time.Instant;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.internal.DoNotInstrument;
 
 /**
  * Unit tests for the parcelable {@link TimeStamp}. We write and read from the parcel to test
  * everything is done correctly.
  */
 @RunWith(AndroidJUnit4.class)
+@DoNotInstrument // needed for now_legacy_ok
 public class TimeStampTest {
 
   @Test
diff --git a/services/events/javatests/androidx/test/services/events/discovery/BUILD b/services/events/javatests/androidx/test/services/events/discovery/BUILD
new file mode 100644
index 000000000..c0ab2fc07
--- /dev/null
+++ b/services/events/javatests/androidx/test/services/events/discovery/BUILD
@@ -0,0 +1,48 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+# Tests for On-Device Infrastructure - Orchestrator
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+axt_android_local_test(
+    name = "TestFoundEventTest",
+    size = "small",
+    srcs = [
+        "TestFoundEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestDiscoveryStartedEventTest",
+    size = "small",
+    srcs = [
+        "TestDiscoveryStartedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestDiscoveryFinishedEventTest",
+    size = "small",
+    srcs = [
+        "TestDiscoveryFinishedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/services/events/javatests/androidx/test/services/events/internal/BUILD b/services/events/javatests/androidx/test/services/events/internal/BUILD
new file mode 100644
index 000000000..5dd70e21c
--- /dev/null
+++ b/services/events/javatests/androidx/test/services/events/internal/BUILD
@@ -0,0 +1,25 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+# Tests for On-Device Infrastructure - Orchestrator
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "StackTrimmerTest",
+    size = "small",
+    srcs = [
+        "StackTrimmerTest.java",
+    ],
+    manifest_values = {
+        "minSdkVersion": "23",
+    },
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/services/events/javatests/androidx/test/services/events/internal/BUILD.bazel b/services/events/javatests/androidx/test/services/events/internal/BUILD.bazel
deleted file mode 100644
index 0013bcc70..000000000
--- a/services/events/javatests/androidx/test/services/events/internal/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-# Tests for On-Device Infrastructure - Orchestrator
-licenses(["notice"])
-
-android_local_test(
-    name = "StackTrimmerTest",
-    size = "small",
-    srcs = [
-        "StackTrimmerTest.java",
-    ],
-    manifest_values = {
-        "minSdkVersion": "14",
-    },
-    tags = ["robolectric"],
-    deps = [
-        "//ext/junit",
-        "//services/events/java/androidx/test/services/events",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_robolectric_robolectric",
-        "@maven//:org_robolectric_annotations",
-        "@robolectric//bazel:android-all",
-    ],
-)
diff --git a/services/events/javatests/androidx/test/services/events/internal/StackTrimmerTest.java b/services/events/javatests/androidx/test/services/events/internal/StackTrimmerTest.java
index 6eb41ff49..522f9f117 100644
--- a/services/events/javatests/androidx/test/services/events/internal/StackTrimmerTest.java
+++ b/services/events/javatests/androidx/test/services/events/internal/StackTrimmerTest.java
@@ -25,10 +25,8 @@
 import org.junit.runner.Description;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.Failure;
-import org.robolectric.annotation.Config;
 
 @RunWith(AndroidJUnit4.class)
-@Config(sdk = 19)
 public class StackTrimmerTest {
 
   @Test
@@ -59,6 +57,28 @@ public void verifyFailureStackTraceIsTruncated() throws Exception {
         testResultTraceLength <= MAX_TRACE_SIZE);
   }
 
+  @Test
+  public void verifySuppressedExceptionIsRendered() throws Exception {
+    Throwable example = new Exception("Failing exception");
+    example.initCause(new RuntimeException("Cause of failing exception"));
+    Throwable suppressed = new RuntimeException("Suppressed exception");
+    suppressed.initCause(new RuntimeException("Cause of suppressed exception"));
+    example.addSuppressed(suppressed);
+    Failure testFailure = new Failure(Description.EMPTY, example);
+
+    // ensure trace contains the current method, but not any of the junit + androidx.test framework
+    // traces
+    String trace = StackTrimmer.getTrimmedStackTrace(testFailure);
+    assertThat(trace).contains("StackTrimmerTest.verifySuppressedExceptionIsRendered");
+    assertThat(trace).contains("Failing exception");
+    assertThat(trace).contains("Cause of failing exception");
+    assertThat(trace).contains("Suppressed exception");
+    assertThat(trace).contains("Cause of suppressed exception");
+    // Make sure that nothing crept into the suppressed exception's stack trace, or its cause.
+    assertThat(trace).doesNotContain("androidx.test.runner.AndroidJUnitRunner.onStart");
+    assertThat(trace).doesNotContain("org.junit.runners.ParentRunner.run");
+  }
+
   private static String getVeryLargeString() {
     return new String(new char[1000000]);
   }
diff --git a/services/events/javatests/androidx/test/services/events/platform/BUILD b/services/events/javatests/androidx/test/services/events/platform/BUILD
new file mode 100644
index 000000000..e024669cb
--- /dev/null
+++ b/services/events/javatests/androidx/test/services/events/platform/BUILD
@@ -0,0 +1,94 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+# Tests for On-Device Infrastructure - Orchestrator
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+TEST_DEPS = [
+    "//ext/junit",
+    "//services/events/java/androidx/test/services/events",
+    "@maven//:junit_junit",
+    "@maven//:com_google_truth_truth",
+]
+
+axt_android_local_test(
+    name = "TestRunFinishedEventTest",
+    size = "small",
+    srcs = [
+        "TestRunFinishedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRunErrorEventTest",
+    size = "small",
+    srcs = [
+        "TestRunErrorEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRunStartedEventTest",
+    size = "small",
+    srcs = [
+        "TestRunStartedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestCaseStartedEventTest",
+    size = "small",
+    srcs = [
+        "TestCaseStartedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestCaseErrorEventTest",
+    size = "small",
+    srcs = [
+        "TestCaseErrorEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestCaseFinishedEventTest",
+    size = "small",
+    srcs = [
+        "TestCaseFinishedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/services/events/javatests/androidx/test/services/events/run/BUILD b/services/events/javatests/androidx/test/services/events/run/BUILD
new file mode 100644
index 000000000..e207faafd
--- /dev/null
+++ b/services/events/javatests/androidx/test/services/events/run/BUILD
@@ -0,0 +1,107 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+# Tests for On-Device Infrastructure - Orchestrator
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+TEST_DEPS = [
+    "//ext/junit",
+    "//services/events/java/androidx/test/services/events",
+    "@maven//:junit_junit",
+    "@maven//:com_google_truth_truth",
+]
+
+axt_android_local_test(
+    name = "TestAssumptionFailureEventTest",
+    size = "small",
+    srcs = [
+        "TestAssumptionFailureEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestFailureEventTest",
+    size = "small",
+    srcs = [
+        "TestFailureEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestFinishedEventTest",
+    size = "small",
+    srcs = [
+        "TestFinishedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestIgnoredEventTest",
+    size = "small",
+    srcs = [
+        "TestIgnoredEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRunFinishedEventTest",
+    size = "small",
+    srcs = [
+        "TestRunFinishedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestRunStartedEventTest",
+    size = "small",
+    srcs = [
+        "TestRunStartedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
+
+axt_android_local_test(
+    name = "TestStartedEventTest",
+    size = "small",
+    srcs = [
+        "TestStartedEventTest.java",
+    ],
+    deps = [
+        "//ext/junit",
+        "//services/events/java/androidx/test/services/events",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/services/proguard_library.cfg b/services/proguard_library.cfg
index 326afd656..da2ac5e26 100644
--- a/services/proguard_library.cfg
+++ b/services/proguard_library.cfg
@@ -18,4 +18,36 @@
 -dontwarn kotlin.annotation.AnnotationRetention
 -dontwarn kotlin.annotation.AnnotationTarget
 -dontwarn kotlin.annotation.Retention
--dontwarn kotlin.annotation.Target
\ No newline at end of file
+-dontwarn kotlin.annotation.Target
+-dontwarn kotlin.Deprecated
+-dontwarn kotlin.ReplaceWith
+
+# ServiceLoader support
+-keepnames class kotlinx.coroutines.internal.MainDispatcherFactory {}
+-keepnames class kotlinx.coroutines.CoroutineExceptionHandler {}
+
+# Most of volatile fields are updated with AFU and should not be mangled
+-keepclassmembers class kotlinx.coroutines.** {
+    volatile <fields>;
+}
+
+# Same story for the standard library's SafeContinuation that also uses AtomicReferenceFieldUpdater
+-keepclassmembers class kotlin.coroutines.SafeContinuation {
+    volatile <fields>;
+}
+
+# These classes are only required by kotlinx.coroutines.debug.AgentPremain, which is only loaded when
+# kotlinx-coroutines-core is used as a Java agent, so these are not needed in contexts where ProGuard is used.
+-dontwarn java.lang.instrument.ClassFileTransformer
+-dontwarn sun.misc.SignalHandler
+-dontwarn java.lang.instrument.Instrumentation
+-dontwarn sun.misc.Signal
+
+# Only used in `kotlinx.coroutines.internal.ExceptionsConstructor`.
+# The case when it is not available is hidden in a `try`-`catch`, as well as a check for Android.
+-dontwarn java.lang.ClassValue
+
+# An annotation used for build tooling, won't be directly accessed.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+
+-dontwarn kotlinx.coroutines.internal.ClassValueCtorCache
diff --git a/services/shellexecutor/BUILD b/services/shellexecutor/BUILD
new file mode 100644
index 000000000..9b80e9480
--- /dev/null
+++ b/services/shellexecutor/BUILD
@@ -0,0 +1,31 @@
+# A shell command execution server to allow shell commands to be run at elevated permissions
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "exec_server",
+    visibility = [":server_access"],
+    exports = ["//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_server"],
+)
+
+alias(
+    name = "exec_client",
+    actual = "//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_client",
+    visibility = ["//visibility:public"],
+)
+
+# List any packages allowed to access to server exec server.
+package_group(
+    name = "server_access",
+    packages = [
+        "//services",
+        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor",
+    ],
+)
diff --git a/services/shellexecutor/BUILD.bazel b/services/shellexecutor/BUILD.bazel
deleted file mode 100644
index 08f24258e..000000000
--- a/services/shellexecutor/BUILD.bazel
+++ /dev/null
@@ -1,35 +0,0 @@
-# A shell command execution server to allow shell commands to be run at elevated permissions
-
-licenses(["notice"])
-
-android_library(
-    name = "exec_server",
-    visibility = [":server_access"],
-    exports = ["//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_server"],
-)
-
-android_library(
-    name = "exec_client",
-    visibility = ["//visibility:public"],
-    exports = ["//services/shellexecutor/java/androidx/test/services/shellexecutor:exec_client"],
-)
-
-# List any packages allowed to access to server exec server.
-# Rather than adding to this allowlist, please invoke via AndroidTestUtil.executeShellCommand()
-package_group(
-    name = "server_access",
-    packages = [
-        # "//java/com/google/android/apps/common/testing/services",
-        "//services",
-        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor",
-    ],
-)
-
-filegroup(
-    name = "shellexecuter_src",
-    srcs = [
-        "//services/shellexecutor/java/androidx/test/services/shellexecutor:libexec_client-src.jar",
-        "//services/shellexecutor/java/androidx/test/services/shellexecutor:libexec_server-src.jar",
-    ],
-    visibility = [":server_access"],
-)
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD b/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
new file mode 100644
index 000000000..5ede51e35
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD
@@ -0,0 +1,115 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:kt_android_library.bzl", "kt_android_library")
+
+# A shell command execution server to allow shell commands to be run at elevated permissions
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+proto_library(
+    name = "local_socket_protocol_pb",
+    srcs = ["local_socket_protocol.proto"],
+)
+
+java_lite_proto_library(
+    name = "local_socket_protocol_pb_java_proto_lite",
+    visibility = [
+        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
+    ],
+    deps = [":local_socket_protocol_pb"],
+)
+
+kt_android_library(
+    name = "local_socket_protocol",
+    srcs = ["LocalSocketProtocol.kt"],
+    visibility = [
+        "//services/shellexecutor/javatests/androidx/test/services/shellexecutor:__subpackages__",
+    ],
+    deps = [
+        ":local_socket_protocol_pb_java_proto_lite",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
+    ],
+)
+
+android_library(
+    name = "exec_idl",
+    idl_srcs = ["Command.aidl"],
+    visibility = ["//visibility:private"],
+)
+
+kt_android_library(
+    name = "exec_server",
+    srcs = [
+        "BlockingPublish.java",
+        "LocalSocketShellMain.kt",
+        "ShellCommand.java",
+        "ShellCommandExecutor.java",
+        "ShellCommandExecutorServer.java",
+        "ShellCommandLocalSocketExecutorServer.kt",
+        "ShellExecSharedConstants.java",
+        "ShellMain.java",
+    ],
+    visibility = [":export"],
+    deps = [
+        ":exec_idl",
+        ":local_socket_protocol",
+        ":local_socket_protocol_pb_java_proto_lite",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
+        "@maven//:com_google_guava_guava",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
+    ],
+)
+
+kt_android_library(
+    name = "exec_client",
+    srcs = [
+        "BlockingFind.java",
+        "ClientNotConnected.java",
+        "ShellCommand.java",
+        "ShellCommandClient.java",
+        "ShellCommandLocalSocketClient.kt",
+        "ShellExecSharedConstants.java",
+        "ShellExecutor.java",
+        "ShellExecutorFactory.java",
+        "ShellExecutorImpl.java",
+        "ShellExecutorLocalSocketImpl.kt",
+    ],
+    visibility = [":export"],
+    deps = [
+        ":exec_idl",
+        ":local_socket_protocol",
+        ":local_socket_protocol_pb_java_proto_lite",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core",
+    ],
+)
+
+# Make it easy to deserialize exceptions that are sent over from device to host.
+java_library(
+    name = "exceptions",
+    srcs = [
+        "ClientNotConnected.java",
+    ],
+    visibility = [
+    ],
+)
+
+# Do not link to these targets directly, rely on exporting target instead
+package_group(
+    name = "export",
+    packages = [
+        "//services/shellexecutor",
+    ],
+)
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD.bazel b/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD.bazel
deleted file mode 100644
index 1c4454410..000000000
--- a/services/shellexecutor/java/androidx/test/services/shellexecutor/BUILD.bazel
+++ /dev/null
@@ -1,52 +0,0 @@
-# A shell command execution server to allow shell commands to be run at elevated permissions
-
-licenses(["notice"])
-
-android_library(
-    name = "exec_server",
-    srcs = [
-        "BlockingPublish.java",
-        "ShellCommand.java",
-        "ShellCommandExecutor.java",
-        "ShellCommandExecutorServer.java",
-        "ShellExecSharedConstants.java",
-        "ShellMain.java",
-    ],
-    idl_srcs = ["Command.aidl"],
-    visibility = [":export"],
-    deps = [
-        "//runner/android_junit_runner/java/androidx/test:runner",
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/client",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "exec_client",
-    srcs = [
-        "BlockingFind.java",
-        "ClientNotConnected.java",
-        "ShellCommand.java",
-        "ShellCommandClient.java",
-        "ShellExecSharedConstants.java",
-        "ShellExecutor.java",
-        "ShellExecutorImpl.java",
-    ],
-    idl_srcs = ["Command.aidl"],
-    visibility = [":export"],
-    deps = [
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/client",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
-    ],
-)
-
-# Do not link to these targets directly, rely on exporting target instead
-package_group(
-    name = "export",
-    packages = [
-        "//services/shellexecutor",
-    ],
-)
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ClientNotConnected.java b/services/shellexecutor/java/androidx/test/services/shellexecutor/ClientNotConnected.java
index 168cfc387..ff1827e5d 100644
--- a/services/shellexecutor/java/androidx/test/services/shellexecutor/ClientNotConnected.java
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ClientNotConnected.java
@@ -21,4 +21,16 @@
  *
  * <p>Likely thrown if the ShellCommandExecutor was never started.
  */
-public class ClientNotConnected extends Exception {}
+public class ClientNotConnected extends Exception {
+  public ClientNotConnected() {
+    super();
+  }
+
+  public ClientNotConnected(String message) {
+    super(message);
+  }
+
+  public ClientNotConnected(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/LocalSocketProtocol.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/LocalSocketProtocol.kt
new file mode 100644
index 000000000..4949d232d
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/LocalSocketProtocol.kt
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import android.net.LocalSocket
+import android.net.LocalSocketAddress
+import android.util.Log
+import androidx.test.services.shellexecutor.LocalSocketProtocolProto.RunCommandRequest
+import androidx.test.services.shellexecutor.LocalSocketProtocolProto.RunCommandResponse
+import com.google.protobuf.ByteString
+import java.io.IOException
+import java.net.URLDecoder
+import java.net.URLEncoder
+import kotlin.time.Duration
+
+/**
+ * Protocol for ShellCommandLocalSocketClient to talk to ShellCommandLocalSocketExecutorServer.
+ *
+ * Since androidx.test.services already includes the protobuf runtime, we aren't paying much extra
+ * for adding some more protos to ship back and forth, which is vastly easier to deal with than
+ * PersistableBundles (which don't even support ByteArray types).
+ *
+ * A conversation consists of a single RunCommandRequest from the client followed by a stream of
+ * RunCommandResponses from the server; the final response has an exit code.
+ */
+object LocalSocketProtocol {
+  /**
+   * Composes a RunCommandRequest and sends it over the LocalSocket.
+   *
+   * @param secret The secret to authenticate the request.
+   * @param argv The argv of the command line to run.
+   * @param env The environment variables to provide to the process.
+   * @param timeout The timeout for the command; infinite or nonpositive values mean no timeout.
+   */
+  fun LocalSocket.sendRequest(
+    secret: String,
+    argv: List<String>,
+    env: Map<String, String>? = null,
+    timeout: Duration,
+  ) {
+    val builder = RunCommandRequest.newBuilder().setSecret(secret).addAllArgv(argv)
+    env?.forEach { (k, v) -> builder.putEnvironment(k, v) }
+    if (timeout.isInfinite() || timeout.isNegative() || timeout == Duration.ZERO) {
+      builder.setTimeoutMs(0) // <= 0 means no timeout
+    } else {
+      builder.setTimeoutMs(timeout.inWholeMilliseconds)
+    }
+    builder.build().writeDelimitedTo(outputStream)
+  }
+
+  /** Reads a RunCommandRequest from the LocalSocket. */
+  fun LocalSocket.readRequest(): RunCommandRequest {
+    return RunCommandRequest.parseDelimitedFrom(inputStream)!!
+  }
+
+  /** Composes a RunCommandResponse and sends it over the LocalSocket. */
+  fun LocalSocket.sendResponse(
+    buffer: ByteArray? = null,
+    size: Int = 0,
+    exitCode: Int? = null,
+  ): Boolean {
+    val builder = RunCommandResponse.newBuilder()
+    buffer?.let {
+      val bufferSize = if (size > 0) size else it.size
+      builder.buffer = ByteString.copyFrom(it, 0, bufferSize)
+    }
+    // Since we're currently stuck on a version of protobuf where we don't have hasExitCode(), we
+    // use a magic value to indicate that exitCode is not set. When we upgrade to a newer version
+    // of protobuf, we can obsolete this.
+    if (exitCode != null) {
+      builder.exitCode = exitCode
+    } else {
+      builder.exitCode = HAS_NOT_EXITED
+    }
+
+    try {
+      builder.build().writeDelimitedTo(outputStream)
+    } catch (x: IOException) {
+      // Sadly, the only way to discover that the client cut the connection is an exception that
+      // can only be distinguished by its text.
+      if (x.message.equals("Broken pipe")) {
+        Log.i(TAG, "LocalSocket stream closed early")
+      } else {
+        Log.w(TAG, "LocalSocket write failed", x)
+      }
+      return false
+    }
+    return true
+  }
+
+  /** Reads a RunCommandResponse from the LocalSocket. */
+  fun LocalSocket.readResponse(): RunCommandResponse? {
+    return RunCommandResponse.parseDelimitedFrom(inputStream)
+  }
+
+  /**
+   * Is this the end of the stream?
+   *
+   * Once we upgrade to a newer version of protobuf, we can switch to hasExitCode().
+   */
+  fun RunCommandResponse.hasExited() = exitCode != HAS_NOT_EXITED
+
+  /**
+   * Builds a "binder key", given the server address and secret. (We are not actually using a Binder
+   * here, but the ShellExecutor interface calls the secret for connecting client to server a
+   * "binder key", so we stick with that nomenclature.) Binder keys should be opaque outside
+   * this directory.
+   *
+   * The address can contain spaces, and since it gets passed through a command line, we need to
+   * encode it so it doesn't get split by argv. java.net.URLEncoder is conveniently available on all
+   * SDK versions.
+   */
+  @JvmStatic
+  fun LocalSocketAddress.asBinderKey(secret: String) = buildString {
+    append(":")
+    append(URLEncoder.encode(name, "UTF-8")) // Will convert any : to %3A
+    append(":")
+    append(URLEncoder.encode(secret, "UTF-8"))
+    append(":")
+  }
+
+  /** Extracts the address from a binder key. */
+  @JvmStatic
+  fun addressFromBinderKey(binderKey: String) =
+    LocalSocketAddress(URLDecoder.decode(binderKey.split(":")[1], "UTF-8"))
+
+  /** Extracts the secret from a binder key. */
+  @JvmStatic
+  fun secretFromBinderKey(binderKey: String) = URLDecoder.decode(binderKey.split(":")[2], "UTF-8")
+
+  /** Is this a valid binder key? */
+  @JvmStatic
+  fun isBinderKey(maybeKey: String) =
+    maybeKey.startsWith(':') && maybeKey.endsWith(':') && maybeKey.split(":").size == 4
+
+  const val TAG = "LocalSocketProtocol"
+  private const val HAS_NOT_EXITED = 0xCA7F00D
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/LocalSocketShellMain.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/LocalSocketShellMain.kt
new file mode 100644
index 000000000..e68d4c5d0
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/LocalSocketShellMain.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import android.util.Log
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.util.concurrent.Executors
+import kotlin.time.Duration.Companion.milliseconds
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.runInterruptible
+
+/** Variant of ShellMain that uses a LocalSocket to communicate with the client. */
+class LocalSocketShellMain {
+
+  suspend fun run(args: Array<String>): Int {
+    val scope = CoroutineScope(Executors.newCachedThreadPool().asCoroutineDispatcher())
+    val server = ShellCommandLocalSocketExecutorServer(scope = scope)
+    server.start()
+
+    val processArgs = args.toMutableList()
+    processArgs.addAll(
+      processArgs.size - 1,
+      listOf("-e", ShellExecSharedConstants.BINDER_KEY, server.binderKey()),
+    )
+    val pb = ProcessBuilder(processArgs.toList())
+
+    val exitCode: Int
+
+    try {
+      val process = pb.start()
+
+      val stdinCopier = scope.launch { copyStream("stdin", System.`in`, process.outputStream) }
+      val stdoutCopier = scope.launch { copyStream("stdout", process.inputStream, System.out) }
+      val stderrCopier = scope.launch { copyStream("stderr", process.errorStream, System.err) }
+
+      runInterruptible { process.waitFor() }
+      exitCode = process.exitValue()
+
+      stdinCopier.cancel() // System.`in`.close() does not force input.read() to return
+      stdoutCopier.join()
+      stderrCopier.join()
+    } finally {
+      server.stop(100.milliseconds)
+    }
+    return exitCode
+  }
+
+  suspend fun copyStream(name: String, input: InputStream, output: OutputStream) {
+    val buf = ByteArray(1024)
+    try {
+      while (true) {
+        val size = input.read(buf)
+        if (size == -1) break
+        output.write(buf, 0, size)
+      }
+      output.flush()
+    } catch (x: IOException) {
+      Log.e(TAG, "IOException on $name. Terminating.", x)
+    }
+  }
+
+  companion object {
+    private const val TAG = "LocalSocketShellMain"
+
+    @JvmStatic
+    public fun main(args: Array<String>) {
+      System.exit(runBlocking { LocalSocketShellMain().run(args) })
+    }
+  }
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/Messages.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/Messages.kt
new file mode 100644
index 000000000..b90742b67
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/Messages.kt
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import java.io.InputStream
+import java.io.ObjectInputStream
+import java.io.ObjectOutputStream
+import java.io.OutputStream
+
+/**
+ * Messages used for communication between the ShellCommandFileObserverClient and the
+ * ShellCommandFileObserverExecutorServer.
+ *
+ * These are not protobufs because on APIs 15-19, desugaring causes the FileObserverShellMain to
+ * crash with ClassNotFound: j$.util.concurrent.ConcurrentHashMap, and GeneratedMessageLite needs
+ * that class. The fix for this (starting multidex earlier) is not possible in a class with no
+ * Context.
+ *
+ * They aren't PersistableBundles because those get introduced in API 21. So we resort to the
+ * ObjectInputStream/ObjectOutputStream, working around the BanSerializableRead.
+ */
+object Messages {
+  data class Command(
+    val command: String,
+    val parameters: List<String> = emptyList(),
+    val shellEnv: Map<String, String> = emptyMap(),
+    val executeThroughShell: Boolean = false,
+    val redirectErrorStream: Boolean = false,
+    val timeoutMs: Long,
+  ) {
+    fun writeTo(outputStream: OutputStream) {
+      ObjectOutputStream(outputStream).use {
+        it.apply {
+          writeUTF(command)
+          write(parameters)
+          write(shellEnv)
+          writeBoolean(executeThroughShell)
+          writeBoolean(redirectErrorStream)
+          writeLong(timeoutMs)
+        }
+      }
+    }
+
+    override fun toString(): String {
+      val env = shellEnv.asSequence().map { "${it.key}=${it.value}" }.joinToString(", ")
+      val ets = if (executeThroughShell) " executeThroughShell" else ""
+      val res = if (redirectErrorStream) " redirectErrorStream" else ""
+      return "[$command] [${parameters.joinToString("] [")}] ($env)$ets$res ${timeoutMs}ms"
+    }
+
+    companion object {
+      fun readFrom(inputStream: InputStream): Command {
+        ObjectInputStream(inputStream).use {
+          it.apply {
+            return Command(
+              command = readUTF(),
+              parameters = readStringList(),
+              shellEnv = readStringMap(),
+              executeThroughShell = readBoolean(),
+              redirectErrorStream = readBoolean(),
+              timeoutMs = readLong()
+            )
+          }
+        }
+      }
+    }
+  }
+
+  enum class ResultType {
+    EXITED,
+    TIMED_OUT,
+    SERVER_ERROR,
+    CLIENT_ERROR
+  }
+
+  data class CommandResult(
+    val resultType: ResultType,
+    val exitCode: Int = -1,
+    val stdout: ByteArray = ByteArray(0),
+    val stderr: ByteArray = ByteArray(0),
+  ) {
+    fun writeTo(outputStream: OutputStream) {
+      ObjectOutputStream(outputStream).use {
+        it.apply {
+          write(resultType)
+          writeInt(exitCode)
+          writeInt(stdout.size)
+          write(stdout)
+          writeInt(stderr.size)
+          write(stderr)
+        }
+      }
+    }
+
+    override fun toString(): String {
+      val out = stdout.toString(Charsets.UTF_8)
+      val err = stderr.toString(Charsets.UTF_8)
+      return "${resultType.name} $exitCode stdout=[$out] stderr=[$err]"
+    }
+
+    companion object {
+      fun readFrom(inputStream: InputStream): CommandResult {
+        ObjectInputStream(inputStream).use {
+          it.apply {
+            return CommandResult(
+              resultType = readResultType(),
+              exitCode = readInt(),
+              stdout = ByteArray(readInt()).also { readFully(it) },
+              stderr = ByteArray(readInt()).also { readFully(it) }
+            )
+          }
+        }
+      }
+    }
+  }
+
+  private fun ObjectOutputStream.write(resultType: ResultType) {
+    writeUTF(resultType.name)
+  }
+
+  private fun ObjectInputStream.readResultType() = ResultType.valueOf(readUTF())
+
+  private fun ObjectOutputStream.write(list: List<String>) {
+    writeInt(list.size)
+    for (s in list) writeUTF(s)
+  }
+
+  private fun ObjectInputStream.readStringList(): List<String> {
+    val count = readInt()
+    val result = mutableListOf<String>()
+    for (i in 1..count) result.add(readUTF())
+    return result
+  }
+
+  private fun ObjectOutputStream.write(map: Map<String, String>) {
+    writeInt(map.size)
+    for (entry in map) {
+      writeUTF(entry.key)
+      writeUTF(entry.value)
+    }
+  }
+
+  private fun ObjectInputStream.readStringMap(): Map<String, String> {
+    val count = readInt()
+    val result = mutableMapOf<String, String>()
+    for (i in 1..count) result.put(readUTF(), readUTF())
+    return result
+  }
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandClient.java b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandClient.java
index 250087357..45a788c31 100644
--- a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandClient.java
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandClient.java
@@ -22,7 +22,6 @@
 import android.os.RemoteException;
 import android.text.TextUtils;
 import android.util.Log;
-import androidx.test.services.shellexecutor.Command.Stub;
 import androidx.test.services.speakeasy.SpeakEasyProtocol.FindResult;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -34,8 +33,8 @@
 
 /**
  * Client for the ShellCommandExecutor service, to allow an instrumentation to executes a shell
- * command in a similar manner and environment as {@link @UiAutomation.executeShellCommand()} (i.e.
- * as either root or shell)
+ * command in a similar manner and environment as {@link UiAutomation.executeShellCommand} (i.e. as
+ * either root or shell).
  *
  * <p>To use this method while running from the shell, you must prefix am instrument with: {@code
  * CLASSPATH=$(pm path com.google.android.apps.common.testing.services) app_process /
@@ -95,15 +94,19 @@ public static synchronized InputStream execOnServer(
       result = BlockingFind.getResult(Looper.getMainLooper(), context, secret);
       if (!result.found) {
         Log.e(TAG, "Couldn't find a published binder");
-        throw new ClientNotConnected();
+        throw new ClientNotConnected(
+            "Couldn't find a binder published by androidx.test.services. It is very likely that"
+                + " androidx.test.services was killed, which is usually due to low memory"
+                + " conditions. Consider switching to a device with more memory.");
       }
     } catch (InterruptedException e) {
-      throw new ClientNotConnected();
+      throw new ClientNotConnected(
+          "Search for an androidx.test.services binder was interrupted", e);
     }
 
     ParcelFileDescriptor[] pipe = ParcelFileDescriptor.createPipe();
 
-    Command commandStub = Stub.asInterface(result.binder);
+    Command commandStub = Command.Stub.asInterface(result.binder);
     // Only use timeout version if timeout is greater than 0
     if (timeoutMs > 0L) {
       // NOTICE: this is not be supported on older versions of the Command server.
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandExecutor.java b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandExecutor.java
index ef01e1394..919758ffa 100644
--- a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandExecutor.java
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandExecutor.java
@@ -16,6 +16,7 @@
 
 package androidx.test.services.shellexecutor;
 
+import static com.google.common.base.Preconditions.checkNotNull;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import android.util.Log;
@@ -56,7 +57,7 @@ public void execute(ShellCommand shellCommand, OutputStream writeStdoutTo) throw
       toExecute.add("-c");
     }
     toExecute.add(shellCommand.getCommand());
-    debug("Command to execute: %s", shellCommand.getCommand());
+    debug("Command to execute: %s", toExecute.toString());
     if (shellCommand.getParameters() != null) {
       for (String parameter : shellCommand.getParameters()) {
         debug("Added param: %s", parameter);
@@ -139,9 +140,13 @@ public void run() {
         new Runnable() {
           @Override
           public void run() {
+            checkNotNull(p, "Process is null.");
             InputStream stdout = p.getInputStream();
             byte[] buf = new byte[ShellExecSharedConstants.BUFFER_SIZE];
 
+            checkNotNull(stdout, "Process stdout is null.");
+            checkNotNull(writeStdoutTo, "Process write-stdout-to is null.");
+
             while (true) {
               try {
                 int read = stdout.read(buf);
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketClient.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketClient.kt
new file mode 100644
index 000000000..103a5b190
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketClient.kt
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import android.net.LocalSocket
+import android.net.LocalSocketAddress
+import android.os.Build
+import android.util.Log
+import androidx.test.services.shellexecutor.LocalSocketProtocol.addressFromBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.hasExited
+import androidx.test.services.shellexecutor.LocalSocketProtocol.readResponse
+import androidx.test.services.shellexecutor.LocalSocketProtocol.secretFromBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.sendRequest
+import java.io.IOException
+import java.io.InputStream
+import java.io.PipedInputStream
+import java.io.PipedOutputStream
+import java.util.concurrent.Executors
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.measureTime
+import kotlin.time.toKotlinDuration
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.withTimeout
+
+/**
+ * Client that sends requests to the ShellCommandLocalSocketExecutorServer.
+ *
+ * This client is designed to be callable from Java.
+ */
+class ShellCommandLocalSocketClient(binderKey: String) {
+  private val address: LocalSocketAddress = addressFromBinderKey(binderKey)
+  private val secret: String = secretFromBinderKey(binderKey)
+  private lateinit var socket: LocalSocket
+
+  /**
+   * Composes a request and sends it to the server, and streams the resulting output.
+   * @param command The command to run.
+   * @param parameters The parameters to the command. command + parameters = argv
+   * @param shellEnv The environment variables to provide to the process.
+   * @param executeThroughShell Whether to execute the command through a shell, making the argv
+   *   "sh" "-c" "command parameters".
+   * @param timeout The timeout for the command; infinite or nonpositive values mean no timeout.
+   * @return An InputStream that can be used to read the output of the command.
+   */
+  @kotlin.time.ExperimentalTime
+  fun request(
+    command: String?,
+    parameters: List<String>?,
+    shellEnv: Map<String, String>?,
+    executeThroughShell: Boolean,
+    timeout: Duration,
+  ): InputStream {
+    if (command == null || command.isEmpty()) {
+      throw IllegalArgumentException("Null or empty command")
+    }
+
+    lateinit var result: InputStream
+
+    // The call to runBlocking causes Android to emit "art: Note: end time exceeds epoch:". This is
+    // in InitTimeSpec in runtime/utils.cc. I don't see a way to invoke it in such a way that it
+    // doesn't clutter the logcat.
+    runBlocking(scope.coroutineContext) {
+      withTimeout(timeout) {
+        runInterruptible {
+          socket = LocalSocket(LocalSocket.SOCKET_STREAM)
+          // While there *is* a timeout option on connect(), in the Android source, it throws
+          // UnsupportedOperationException! So we leave the timeout up to withTimeout +
+          // runInterruptible. Capture the time taken to connect so we can subtract it from the
+          // overall timeout. (Calling socket.setSoTimeout() before connect() throws IOException
+          // "socket not created".)
+          val connectTime = measureTime { socket.connect(address) }
+
+          val argv = mutableListOf<String>()
+          if (executeThroughShell) {
+            argv.addAll(listOf("sh", "-c"))
+            argv.add((listOf(command) + (parameters ?: emptyList())).joinToString(" "))
+          } else {
+            argv.add(command)
+            parameters?.let { argv.addAll(it) }
+          }
+
+          socket.sendRequest(secret, argv, shellEnv, timeout - connectTime)
+          socket.shutdownOutput()
+
+          // We read responses off the socket, write buffers to the pipe, and close the pipe when we
+          // get an exit code. The existing ShellExecutor API doesn't provide for *returning* that
+          // exit code, but it's useful as a way to know when to close the stream. By using the pipe
+          // as an intermediary, we can respond to exceptions sensibly.
+          val upstream = PipedOutputStream()
+          val downstream = PipedInputStream(upstream)
+
+          scope.launch {
+            try {
+              socket.inputStream.use {
+                while (true) {
+                  val response = socket.readResponse()
+                  if (response == null) break  // EOF
+                  if (response.buffer.size() > 0) response.buffer.writeTo(upstream)
+                  if (response.hasExited()) {
+                    Log.i(TAG, "Process ${argv[0]} exited with code ${response.exitCode}")
+                    break
+                  }
+                }
+              }
+            } catch (x: IOException) {
+              if (x.isPipeClosed()) {
+                Log.i(TAG, "LocalSocket relay for ${argv[0]} closed early")
+              } else {
+                Log.w(TAG, "LocalSocket relay for ${argv[0]} failed", x)
+              }
+            } finally {
+              upstream.flush()
+              upstream.close()
+            }
+          }
+
+          result = downstream
+        }
+      }
+    }
+    return result
+  }
+
+  /** Java-friendly wrapper for the above. */
+  @kotlin.time.ExperimentalTime
+  fun request(
+    command: String?,
+    parameters: List<String>?,
+    shellEnv: Map<String, String>?,
+    executeThroughShell: Boolean,
+    timeout: java.time.Duration,
+  ): InputStream =
+    request(command, parameters, shellEnv, executeThroughShell, timeout.toKotlinDuration())
+
+  private companion object {
+    private const val TAG = "SCLSClient" // up to 23 characters
+
+    // Keep this around for all clients; if you create a new one with every object, you can wind up
+    // running out of threads.
+    private val scope = CoroutineScope(Executors.newCachedThreadPool().asCoroutineDispatcher())
+  }
+}
+
+// Sadly, the only way to distinguish the downstream pipe being closed is the text
+// of the exception thrown when you try to write to it. Which varies by API level.
+private fun IOException.isPipeClosed() =
+  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+    message.equals("Pipe closed")
+  } else {
+    message.equals("Pipe is closed")
+  }
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt
new file mode 100644
index 000000000..775f81d89
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServer.kt
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import android.net.LocalServerSocket
+import android.net.LocalSocket
+import android.net.LocalSocketAddress
+import android.os.Process as AndroidProcess
+import android.util.Log
+import androidx.test.services.shellexecutor.LocalSocketProtocol.asBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.readRequest
+import androidx.test.services.shellexecutor.LocalSocketProtocol.sendResponse
+import androidx.test.services.shellexecutor.LocalSocketProtocolProto.RunCommandRequest
+import java.io.IOException
+import java.io.InterruptedIOException
+import java.security.SecureRandom
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicBoolean
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.runInterruptible
+import kotlinx.coroutines.withTimeout
+
+/** Server that run shell commands for a client talking over a LocalSocket. */
+final class ShellCommandLocalSocketExecutorServer
+@JvmOverloads
+constructor(
+  private val scope: CoroutineScope =
+    CoroutineScope(Executors.newCachedThreadPool().asCoroutineDispatcher())
+) {
+  // Use the same secret generation as SpeakEasy does.
+  private val secret = java.lang.Long.toHexString(SecureRandom().nextLong())
+  lateinit var socket: LocalServerSocket
+  lateinit var address: LocalSocketAddress
+  // Since LocalServerSocket.accept() has to be interrupted, we keep that in its own Job...
+  lateinit var serverJob: Job
+  // ...while all the child jobs are under a single SupervisorJob that we can join later.
+  val shellJobs = SupervisorJob()
+  val running = AtomicBoolean(true)
+
+  /** Returns the binder key to pass to client processes. */
+  fun binderKey(): String {
+    // The address can contain spaces, and since it gets passed through a command line, we need to
+    // encode it. java.net.URLEncoder is conveniently available in all SDK versions.
+    return address.asBinderKey(secret)
+  }
+
+  /** Runs a simple server. */
+  private suspend fun server() = coroutineScope {
+    while (running.get()) {
+      val connection =
+        try {
+          runInterruptible { socket.accept() }
+        } catch (x: Exception) {
+          // None of my tests have managed to trigger this one.
+          Log.e(TAG, "LocalServerSocket.accept() failed", x)
+          break
+        }
+      launch(scope.coroutineContext + shellJobs) { handleConnection(connection) }
+    }
+  }
+
+  /**
+   * Relays the output of process to connection with a series of RunCommandResponses.
+   *
+   * @param process The process to relay output from.
+   * @param connection The connection to relay output to.
+   * @return false if there was a problem, true otherwise.
+   */
+  private suspend fun relay(process: Process, connection: LocalSocket): Boolean {
+    // Experiment shows that 64K is *much* faster than 4K, especially on API 21-23. Streaming 1MB
+    // takes 3s with 4K buffers and 2s with 64K on API 23. 22 is a bit faster (2.6s -> 1.5s),
+    // 21 faster still (630ms -> 545ms). Higher API levels are *much* faster (24 is 119 ms ->
+    // 75ms).
+    val buffer = ByteArray(65536)
+    var size: Int
+
+    // LocalSocket.isOutputShutdown() throws UnsupportedOperationException, so we can't use
+    // that as our loop constraint.
+    while (true) {
+      try {
+        size = runInterruptible { process.inputStream.read(buffer) }
+        if (size < 0) return true // EOF
+        if (size == 0) {
+          delay(1.milliseconds)
+          continue
+        }
+      } catch (x: InterruptedIOException) {
+        // We start getting these at API 24 when the timeout handling kicks in.
+        Log.i(TAG, "Interrupted while reading from ${process}: ${x.message}")
+        return false
+      } catch (x: IOException) {
+        Log.i(TAG, "Error reading from ${process}; did it time out?", x)
+        return false
+      }
+
+      if (!connection.sendResponse(buffer = buffer, size = size)) {
+        return false
+      }
+    }
+  }
+
+  /** Handle one connection. */
+  private suspend fun handleConnection(connection: LocalSocket) {
+    // connection.localSocketAddress is always null, so no point in logging it.
+
+    // Close the connection when done.
+    connection.use {
+      val request = connection.readRequest()
+
+      if (request.secret.compareTo(secret) != 0) {
+        Log.w(TAG, "Ignoring request with wrong secret: $request")
+        return
+      }
+
+      val pb = request.toProcessBuilder()
+      pb.redirectErrorStream(true)
+
+      val process: Process
+      try {
+        process = pb.start()
+      } catch (x: IOException) {
+        Log.e(TAG, "Failed to start process", x)
+        connection.sendResponse(
+          buffer = x.stackTraceToString().toByteArray(),
+          exitCode = EXIT_CODE_FAILED_TO_START,
+        )
+        return
+      }
+
+      // We will not be writing anything to the process' stdin.
+      process.outputStream.close()
+
+      // Close the process' stdout when we're done reading.
+      process.inputStream.use {
+        // Launch a coroutine to relay the process' output to the client. If it times out, kill the
+        // process and cancel the job. This is more coroutine-friendly than using waitFor() to
+        // handle timeouts.
+        val ioJob = scope.async { relay(process, connection) }
+
+        try {
+          withTimeout(request.timeout()) {
+            if (!ioJob.await()) {
+              Log.w(TAG, "Relaying ${process} output failed")
+            }
+            runInterruptible { process.waitFor() }
+          }
+        } catch (x: TimeoutCancellationException) {
+          Log.e(TAG, "Process ${process} timed out after ${request.timeout()}")
+          process.destroy()
+          ioJob.cancel()
+          connection.sendResponse(exitCode = EXIT_CODE_TIMED_OUT)
+          return
+        }
+
+        connection.sendResponse(exitCode = process.exitValue())
+      }
+    }
+  }
+
+  /** Starts the server. */
+  fun start() {
+    socket = LocalServerSocket("androidx.test.services ${AndroidProcess.myPid()}")
+    address = socket.localSocketAddress
+    Log.i(TAG, "Starting server on ${address.name}")
+
+    // Launch a coroutine to call socket.accept()
+    serverJob = scope.launch { server() }
+  }
+
+  /** Stops the server. */
+  fun stop(timeout: Duration) {
+    running.set(false)
+    // Closing the socket does not interrupt accept()...
+    socket.close()
+    runBlocking(scope.coroutineContext) {
+      try {
+        // ...so we simply cancel that job...
+        serverJob.cancel()
+        // ...and play nicely with all the shell jobs underneath.
+        withTimeout(timeout) {
+          shellJobs.complete()
+          shellJobs.join()
+        }
+      } catch (x: TimeoutCancellationException) {
+        Log.w(TAG, "Shell jobs did not stop after $timeout", x)
+        shellJobs.cancel()
+      }
+    }
+  }
+
+  private fun RunCommandRequest.timeout(): Duration =
+    if (timeoutMs <= 0) {
+      Duration.INFINITE
+    } else {
+      timeoutMs.milliseconds
+    }
+
+  /**
+   * Sets up a ProcessBuilder with information from the request; other configuration is up to the
+   * caller.
+   */
+  private fun RunCommandRequest.toProcessBuilder(): ProcessBuilder {
+    val pb = ProcessBuilder(argvList)
+    val redacted = argvList.map { it.replace(secret, "(SECRET)") } // Don't log the secret!
+    Log.i(TAG, "Command to execute: [${redacted.joinToString("] [")}] within ${timeout()}")
+    if (environmentMap.isNotEmpty()) {
+      pb.environment().putAll(environmentMap)
+      val env = environmentMap.entries.map { (k, v) -> "$k=$v" }.joinToString(", ")
+      Log.i(TAG, "Environment: $env")
+    }
+    return pb
+  }
+
+  private companion object {
+    const val TAG = "SCLSEServer" // up to 23 characters
+
+    const val EXIT_CODE_FAILED_TO_START = -1
+    const val EXIT_CODE_TIMED_OUT = -2
+  }
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorFactory.java b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorFactory.java
new file mode 100644
index 000000000..11f5639b7
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorFactory.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor;
+
+import android.content.Context;
+
+/** Factory class for providing ShellExecutors. */
+public final class ShellExecutorFactory {
+
+  private final Context context;
+  private final String binderKey;
+
+  public ShellExecutorFactory(Context context, String binderKey) {
+    this.context = context;
+    this.binderKey = binderKey;
+  }
+
+  public ShellExecutor create() {
+    // Binder keys for SpeakEasy are a string of hex digits. Binder keys for the LocalSocket
+    // protocol start and end with a colon.
+    if (LocalSocketProtocol.isBinderKey(binderKey)) {
+      return new ShellExecutorLocalSocketImpl(binderKey);
+    } else {
+      return new ShellExecutorImpl(context, binderKey);
+    }
+  }
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorImpl.java b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorImpl.java
index f59204308..269ee202b 100644
--- a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorImpl.java
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorImpl.java
@@ -31,7 +31,7 @@ public final class ShellExecutorImpl implements ShellExecutor {
   private final Context context;
   private final String binderKey;
 
-  public ShellExecutorImpl(Context context, String binderKey) {
+  ShellExecutorImpl(Context context, String binderKey) {
     if (null == context) {
       throw new NullPointerException("context, cannot be null!");
     }
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorLocalSocketImpl.kt b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorLocalSocketImpl.kt
new file mode 100644
index 000000000..7f903442e
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorLocalSocketImpl.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import java.io.InputStream
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+/** ShellExecutor that talks to LocalSocketShellMain. */
+class ShellExecutorLocalSocketImpl(private val binderKey: String) : ShellExecutor {
+
+  /** {@inheritDoc} */
+  override fun getBinderKey() = binderKey
+
+  /** {@inheritDoc} */
+  @kotlin.time.ExperimentalTime
+  override fun executeShellCommandSync(
+    command: String?,
+    parameters: List<String>?,
+    shellEnv: Map<String, String>?,
+    executeThroughShell: Boolean,
+    timeoutMs: Long,
+  ): String =
+    executeShellCommand(command, parameters, shellEnv, executeThroughShell, timeoutMs).use {
+      it.readBytes().toString(Charsets.UTF_8)
+    }
+
+  /** {@inheritDoc} */
+  @kotlin.time.ExperimentalTime
+  override fun executeShellCommandSync(
+    command: String?,
+    parameters: List<String>?,
+    shellEnv: Map<String, String>?,
+    executeThroughShell: Boolean,
+  ) = executeShellCommandSync(command, parameters, shellEnv, executeThroughShell, TIMEOUT_FOREVER)
+
+  /** {@inheritDoc} */
+  @kotlin.time.ExperimentalTime
+  override fun executeShellCommand(
+    command: String?,
+    parameters: List<String>?,
+    shellEnv: Map<String, String>?,
+    executeThroughShell: Boolean,
+    timeoutMs: Long,
+  ): InputStream {
+    if (command == null || command.isEmpty()) {
+      throw IllegalArgumentException("Null or empty command")
+    }
+    val client = ShellCommandLocalSocketClient(binderKey)
+    val timeout =
+      if (timeoutMs > 0) {
+        timeoutMs.milliseconds
+      } else {
+        Duration.INFINITE
+      }
+    return client.request(command, parameters, shellEnv, executeThroughShell, timeout)
+  }
+
+  /** {@inheritDoc} */
+  @kotlin.time.ExperimentalTime
+  override fun executeShellCommand(
+    command: String?,
+    parameters: List<String>?,
+    shellEnv: Map<String, String>?,
+    executeThroughShell: Boolean,
+  ) = executeShellCommand(command, parameters, shellEnv, executeThroughShell, TIMEOUT_FOREVER)
+
+  private companion object {
+    const val TAG = "ShellExecutorLocalSocketImpl"
+    const val TIMEOUT_FOREVER = -1L
+  }
+}
diff --git a/services/shellexecutor/java/androidx/test/services/shellexecutor/local_socket_protocol.proto b/services/shellexecutor/java/androidx/test/services/shellexecutor/local_socket_protocol.proto
new file mode 100644
index 000000000..326befeea
--- /dev/null
+++ b/services/shellexecutor/java/androidx/test/services/shellexecutor/local_socket_protocol.proto
@@ -0,0 +1,50 @@
+//
+// Copyright (C) 2024 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package androidx.test.services.storage;
+
+option java_package = "androidx.test.services.shellexecutor";
+option java_outer_classname = 'LocalSocketProtocolProto';
+
+// Message sent from client to server to start a process.
+message RunCommandRequest {
+  // Secret to authenticate the request.
+  string secret = 1;
+
+  // argv of the command line to run.
+  repeated string argv = 2;
+
+  // Environment varialbes to provide.
+  map<string, string> environment = 3;
+
+  // Timeout for the command. Any value <= 0 is treated as "forever".
+  int64 timeout_ms = 4;
+}
+
+// Multiple responses can be streamed back to the client. The one that has an
+// exit code indicates the end of the stream.
+message RunCommandResponse {
+  // A buffer of the command's output (stdout and stderr combined by specifying
+  // redirectErrorStream(true) on ProcessBuilder).
+  bytes buffer = 1;
+
+  // The exit code of the command. While we're stuck on proto3, the magic value
+  // 0xCA7F00D indicates that the command is still running; once we can move to
+  // a newer version where we can test hasExitCode(), we will remove the magic
+  // value.
+  int32 exit_code = 2;
+}
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml
index 3b62f5610..5c8864775 100644
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.services.shellexecutor" >
 
   <uses-sdk
-      android:minSdkVersion="14"
-      android:targetSdkVersion="28" />
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34" />
 
   <application>
     <activity android:name="androidx.test.services.shellexecutor.DummyActivity" />
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest_opensource.xml b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest_opensource.xml
deleted file mode 100644
index dc1e78bc3..000000000
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest_opensource.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.shellexecutor" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-        <activity android:name="androidx.test.services.shellexecutor.DummyActivity" />
-    </application>
-
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.services.shellexecutor" />
-
-</manifest>
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest_opensource_stub.xml b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest_opensource_stub.xml
deleted file mode 100644
index 3a23c795c..000000000
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/AndroidManifest_opensource_stub.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.shellexecutor" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-</manifest>
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD
new file mode 100644
index 000000000..0e0b4e5b0
--- /dev/null
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD
@@ -0,0 +1,123 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "ShellCommandClientTest",
+    size = "small",
+    srcs = ["ShellCommandClientTest.java"],
+    deps = [
+        "//runner/android_junit_runner",
+        "//services/shellexecutor:exec_client",
+        "//services/shellexecutor:exec_server",
+        "@maven//:org_mockito_mockito_core",
+    ],
+)
+
+android_library(
+    name = "dummy_activity",
+    srcs = ["DummyActivity.java"],
+    deps = [],
+)
+
+axt_android_library_test(
+    name = "ShellCommandTest",
+    srcs = [
+        "ShellCommandTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        ":dummy_activity",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/shellexecutor:exec_client",
+        "//services/shellexecutor:exec_server",
+        "//services/shellexecutor/java/androidx/test/services/shellexecutor:local_socket_protocol",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_library_test(
+    name = "ShellCommandExecutorTest",
+    srcs = [
+        "ShellCommandExecutorTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        ":dummy_activity",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/shellexecutor:exec_client",
+        "//services/shellexecutor:exec_server",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
+
+axt_android_library_test(
+    name = "ShellCommandLocalSocketClientTest",
+    srcs = [
+        "ShellCommandLocalSocketClientTest.kt",
+    ],
+    deps = [
+        "//runner/monitor",
+        "//services/shellexecutor:exec_client",
+        "//services/shellexecutor/java/androidx/test/services/shellexecutor:local_socket_protocol",
+        "//services/shellexecutor/java/androidx/test/services/shellexecutor:local_socket_protocol_pb_java_proto_lite",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android",
+    ],
+)
+
+axt_android_library_test(
+    name = "ShellCommandLocalSocketExecutorServerTest",
+    srcs = [
+        "ShellCommandLocalSocketExecutorServerTest.kt",
+    ],
+    deps = [
+        "//runner/monitor",
+        "//services/shellexecutor:exec_server",
+        "//services/shellexecutor/java/androidx/test/services/shellexecutor:local_socket_protocol",
+        "//services/shellexecutor/java/androidx/test/services/shellexecutor:local_socket_protocol_pb_java_proto_lite",
+        "@com_google_protobuf//:protobuf_javalite",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_android",
+    ],
+)
+
+axt_android_library_test(
+    name = "ShellExecutorTest",
+    srcs = [
+        "ShellExecutorTest.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        ":dummy_activity",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/shellexecutor:exec_client",
+        "//services/shellexecutor:exec_server",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_guava_guava",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+    ],
+)
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD.bazel b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD.bazel
deleted file mode 100644
index 9c85b0b66..000000000
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/BUILD.bazel
+++ /dev/null
@@ -1,84 +0,0 @@
-# Description: Build rules for speak easy tests
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//services/speakeasy/javatests/androidx/test/services/shellexecutor:__subpackages__",
-    ],
-)
-
-android_local_test(
-    name = "ShellCommandClientTest",
-    size = "small",
-    srcs = ["ShellCommandClientTest.java"],
-    tags = ["robolectric"],
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [
-        "//runner/android_junit_runner",
-        "//services/shellexecutor:exec_client",
-        "//services/shellexecutor:exec_server",
-        "@maven//:junit_junit",
-        "@maven//:net_bytebuddy_byte_buddy",
-        "@maven//:net_bytebuddy_byte_buddy_agent",
-        "@maven//:org_mockito_mockito_core",
-        "@maven//:org_objenesis_objenesis",
-        "@maven//:org_robolectric_robolectric",
-        "@maven//:org_robolectric_shadowapi",
-        "@robolectric//bazel:android-all",
-    ],
-)
-
-android_library(
-    name = "shell_executor_test_lib",
-    testonly = 1,
-    srcs = [
-        "DummyActivity.java",
-        "ShellCommandTest.java",
-        "ShellExecutorTest.java",
-    ],
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [
-        "//runner/android_junit_runner",
-        "//ext/junit",
-        "//services/shellexecutor:exec_client",
-        "//services/shellexecutor:exec_server",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-        "@maven//:org_hamcrest_hamcrest_all",
-    ],
-)
-
-android_binary(
-    name = "shell_executor_binary",
-    testonly = 1,
-    manifest = "AndroidManifest_opensource_stub.xml",
-)
-
-android_binary(
-    name = "shell_executor_test_binary",
-    testonly = 1,
-    instruments = ":shell_executor_binary",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":shell_executor_test_lib"],
-)
-
-API_LEVELS = [
-    "19_x86",
-    "21_x86",
-    "22_x86",
-    "23_x86",
-]
-
-[android_instrumentation_test(
-    name = "shell_executor_test_%s" % api_level,
-    size = "large",
-    args = [
-        "--clear_package_data",
-        "--install_test_services=True",
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_%s_qemu2" % (api_level),
-    test_app = ":shell_executor_test_binary",
-) for api_level in API_LEVELS]
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandClientTest.java b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandClientTest.java
index 47978950e..1bd9accb0 100644
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandClientTest.java
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandClientTest.java
@@ -16,26 +16,24 @@
 
 package androidx.test.services.shellexecutor;
 
-import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static junit.framework.Assert.fail;
 
 import android.os.RemoteException;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.io.IOException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.annotation.internal.DoNotInstrument;
 
 /** Unit tests for {@link ShellCommandClient}. */
 @RunWith(AndroidJUnit4.class)
-@DoNotInstrument
 public class ShellCommandClientTest {
 
   @Test
   public void testBlankCommand()
       throws ClientNotConnected, IOException, RemoteException, InterruptedException {
     try {
-      ShellCommandClient.execOnServer(getTargetContext(), "secret", "", null, null, false, 0L);
+      ShellCommandClient.execOnServer(getApplicationContext(), "secret", "", null, null, false, 0L);
       fail("Passing blank command should throw IllegalArgumentException");
     } catch (IllegalArgumentException expected) {
       // Pass
@@ -46,7 +44,8 @@ public void testBlankCommand()
   public void testNullCommand()
       throws ClientNotConnected, IOException, RemoteException, InterruptedException {
     try {
-      ShellCommandClient.execOnServer(getTargetContext(), "secret", null, null, null, false, 0L);
+      ShellCommandClient.execOnServer(
+          getApplicationContext(), "secret", null, null, null, false, 0L);
       fail("Passing null command should throw IllegalArgumentException");
     } catch (IllegalArgumentException expected) {
       // Pass
@@ -58,7 +57,7 @@ public void testShellClientNoRunOnMainThread()
       throws ClientNotConnected, IOException, RemoteException, InterruptedException {
     try {
       ShellCommandClient.execOnServer(
-          getTargetContext(), "secret", "command", null, null, false, 0L);
+          getApplicationContext(), "secret", "command", null, null, false, 0L);
       fail("Calling execServer on main thread should throw exception");
     } catch (IllegalStateException expected) {
       // Pass
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandExecutorTest.java b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandExecutorTest.java
new file mode 100644
index 000000000..c46cc18ea
--- /dev/null
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandExecutorTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor;
+
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Test for {@link ShellCommandExecutor}. */
+@RunWith(AndroidJUnit4.class)
+public class ShellCommandExecutorTest {
+
+  private static final ExecutorService executor =
+      Executors.newCachedThreadPool(
+          new ThreadFactoryBuilder().setNameFormat("ShellCommandExecutorTest#%d").build());
+
+  private final ShellCommandExecutor shellCommandExecutor = new ShellCommandExecutor(executor);
+
+  @Test
+  public void shellCommandExecutorExecute_noTimeout() throws IOException, InterruptedException {
+    Map<String, String> env = ImmutableMap.of("name", "Shell Exec");
+    CountDownLatch closeLatch = new CountDownLatch(1);
+    ByteArrayOutputStream outputStream =
+        new ByteArrayOutputStream() {
+          @Override
+          public void close() throws IOException {
+            super.close();
+            closeLatch.countDown();
+          }
+        };
+    ShellCommand shellCommand =
+        new ShellCommand(
+            "echo Hello $name",
+            /* parameters= */ ImmutableList.of(),
+            /* shellEnv */ env,
+            /* executeThroughShell= */ true,
+            /* timeoutMs */ 0);
+
+    // Execute the command. This is asynchronous and may return before the command finishes.
+    shellCommandExecutor.execute(shellCommand, outputStream);
+
+    // Wait for command to finish by monitoring when the output stream gets closed by executor.
+    closeLatch.await(1, SECONDS);
+
+    assertThat(outputStream.toString("UTF-8")).containsMatch("Hello Shell Exec");
+  }
+}
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandLocalSocketClientTest.kt b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandLocalSocketClientTest.kt
new file mode 100644
index 000000000..018c355a9
--- /dev/null
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandLocalSocketClientTest.kt
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.services.shellexecutor
+
+import android.net.LocalServerSocket
+import android.net.LocalSocketAddress
+import androidx.test.services.shellexecutor.LocalSocketProtocol.addressFromBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.asBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.readRequest
+import androidx.test.services.shellexecutor.LocalSocketProtocol.secretFromBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocolProto.RunCommandRequest
+import com.google.common.truth.Truth.assertThat
+import kotlin.time.Duration.Companion.seconds
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class ShellCommandLocalSocketClientTest {
+
+  @Before fun setUp() {}
+
+  @Test
+  fun binderkey_success() {
+    val address = LocalSocketAddress("binderkey_success 12345")
+    val binderKey = address.asBinderKey(SECRET)
+    assertThat(addressFromBinderKey(binderKey).name).isEqualTo(address.name)
+    assertThat(addressFromBinderKey(binderKey).namespace).isEqualTo(address.namespace)
+    assertThat(secretFromBinderKey(binderKey)).isEqualTo(SECRET)
+  }
+
+  @Test
+  fun request_regular() {
+    val server = LocalServerSocket("request_regular")
+    val client = ShellCommandLocalSocketClient(server.localSocketAddress.asBinderKey(SECRET))
+
+    val request: RunCommandRequest
+
+    runBlocking {
+      val result = async {
+        val socket = server.accept()
+        socket.readRequest()
+      }
+
+      client.request(
+        "foo",
+        listOf("bar", "baz"),
+        mapOf("quem" to "quux", "potrzebie" to "furshlugginer"),
+        executeThroughShell = false,
+        timeout = 1.seconds,
+      )
+      request = result.await()
+    }
+
+    assertThat(request.secret).isEqualTo(SECRET)
+    assertThat(request.argvList).containsExactly("foo", "bar", "baz")
+    assertThat(request.environmentMap)
+      .containsExactlyEntriesIn(mapOf("quem" to "quux", "potrzebie" to "furshlugginer"))
+    // The overall timeout will have the connect time shaved off. This is usually quite low, but
+    // I've seen it as high as 61ms.
+    assertThat(request.timeoutMs).isGreaterThan(900)
+  }
+
+  @Test
+  fun request_executeThroughShell() {
+    val server = LocalServerSocket("request_executeThroughShell")
+    val client = ShellCommandLocalSocketClient(server.localSocketAddress.asBinderKey(SECRET))
+
+    val request: RunCommandRequest
+
+    runBlocking {
+      val result = async {
+        val socket = server.accept()
+        socket.readRequest()
+      }
+
+      client.request(
+        "foo",
+        listOf("bar", "baz"),
+        mapOf("quem" to "quux", "potrzebie" to "furshlugginer"),
+        executeThroughShell = true,
+        timeout = 1.seconds,
+      )
+      request = result.await()
+    }
+
+    assertThat(request.secret).isEqualTo(SECRET)
+    assertThat(request.argvList).containsExactly("sh", "-c", "foo bar baz")
+    assertThat(request.environmentMap)
+      .containsExactlyEntriesIn(mapOf("quem" to "quux", "potrzebie" to "furshlugginer"))
+    // The overall timeout will have the connect time shaved off.
+    assertThat(request.timeoutMs).isGreaterThan(900)
+  }
+
+  private companion object {
+    const val SECRET = "foo:bar"
+  }
+}
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServerTest.kt b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServerTest.kt
new file mode 100644
index 000000000..506ecc02a
--- /dev/null
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandLocalSocketExecutorServerTest.kt
@@ -0,0 +1,96 @@
+package androidx.test.services.shellexecutor
+
+import android.net.LocalSocket
+import androidx.test.services.shellexecutor.LocalSocketProtocol.addressFromBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.hasExited
+import androidx.test.services.shellexecutor.LocalSocketProtocol.readResponse
+import androidx.test.services.shellexecutor.LocalSocketProtocol.secretFromBinderKey
+import androidx.test.services.shellexecutor.LocalSocketProtocol.sendRequest
+import androidx.test.services.shellexecutor.LocalSocketProtocolProto.RunCommandResponse
+import com.google.common.truth.Truth.assertThat
+import kotlin.time.Duration.Companion.milliseconds
+import kotlinx.coroutines.runBlocking
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class ShellCommandLocalSocketExecutorServerTest {
+
+  @Test
+  fun success_simple() {
+    val responses = mutableListOf<RunCommandResponse>()
+    runBlocking {
+      val server = ShellCommandLocalSocketExecutorServer()
+      server.start()
+      val client = LocalSocket(LocalSocket.SOCKET_STREAM)
+      client.connect(addressFromBinderKey(server.binderKey()))
+      client.sendRequest(
+        secretFromBinderKey(server.binderKey()),
+        listOf("echo", "\${POTRZEBIE}"),
+        mapOf("POTRZEBIE" to "furshlugginer"),
+        1000.milliseconds,
+      )
+      do {
+        client.readResponse()?.let { responses.add(it) }
+      } while (!responses.last().hasExited())
+      server.stop(100.milliseconds)
+    }
+    // On rare occasions, the output of the command will come back in two packets! So to keep
+    // this test from being 1% flaky:
+    val stdout = buildString {
+      for (response in responses) {
+        if (response.buffer.size() > 0) append(response.buffer.toStringUtf8())
+      }
+    }
+    assertThat(stdout).isEqualTo("\${POTRZEBIE}\n")
+    assertThat(responses.last().hasExited()).isTrue()
+    assertThat(responses.last().exitCode).isEqualTo(0)
+  }
+
+  @Test
+  fun success_shell_expansion() {
+    val responses = mutableListOf<RunCommandResponse>()
+    runBlocking {
+      val server = ShellCommandLocalSocketExecutorServer()
+      server.start()
+      val client = LocalSocket(LocalSocket.SOCKET_STREAM)
+      client.connect(addressFromBinderKey(server.binderKey()))
+      client.sendRequest(
+        secretFromBinderKey(server.binderKey()),
+        listOf("sh", "-c", "echo \${POTRZEBIE}"),
+        mapOf("POTRZEBIE" to "furshlugginer"),
+        1000.milliseconds,
+      )
+      do {
+        client.readResponse()?.let { responses.add(it) }
+      } while (!responses.last().hasExited())
+      server.stop(100.milliseconds)
+    }
+    val stdout = buildString {
+      for (response in responses) {
+        if (response.buffer.size() > 0) append(response.buffer.toStringUtf8())
+      }
+    }
+    assertThat(stdout).isEqualTo("furshlugginer\n")
+    assertThat(responses.last().hasExited()).isTrue()
+    assertThat(responses.last().exitCode).isEqualTo(0)
+  }
+
+  @Test
+  fun failure_bad_secret() {
+    runBlocking {
+      val server = ShellCommandLocalSocketExecutorServer()
+      server.start()
+      val client = LocalSocket(LocalSocket.SOCKET_STREAM)
+      client.connect(addressFromBinderKey(server.binderKey()))
+      client.sendRequest(
+        "potrzebie!",
+        listOf("sh", "-c", "echo \${POTRZEBIE}"),
+        mapOf("POTRZEBIE" to "furshlugginer"),
+        1000.milliseconds,
+      )
+      assertThat(client.inputStream.read()).isEqualTo(-1)
+    }
+  }
+}
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandTest.java b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandTest.java
index 407a4bdfc..cbad25900 100644
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandTest.java
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellCommandTest.java
@@ -24,8 +24,10 @@
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
-import com.google.common.collect.Lists;
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
+import java.time.Duration;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,14 +50,52 @@ private static String getSecret() {
   private static String execShellCommand(
       String command, List<String> params, Map<String, String> env, boolean executeThroughShell)
       throws Exception {
-    return ShellCommandClient.execOnServerSync(
-        InstrumentationRegistry.getInstrumentation().getContext(),
-        getSecret(),
-        command,
-        params,
-        env,
-        executeThroughShell,
-        0L);
+    if (LocalSocketProtocol.isBinderKey(getSecret())) {
+      ShellCommandLocalSocketClient client = new ShellCommandLocalSocketClient(getSecret());
+      InputStream is =
+          client.request(command, params, env, executeThroughShell, Duration.ofSeconds(10));
+      ByteArrayOutputStream result = new ByteArrayOutputStream();
+      try {
+        byte[] buffer = new byte[ShellExecSharedConstants.BUFFER_SIZE];
+        int length;
+        while ((length = is.read(buffer)) != -1) {
+          result.write(buffer, 0, length);
+        }
+      } finally {
+        if (is != null) {
+          is.close();
+        }
+      }
+      return result.toString("UTF-8");
+
+    } else {
+      return ShellCommandClient.execOnServerSync(
+          InstrumentationRegistry.getInstrumentation().getContext(),
+          getSecret(),
+          command,
+          params,
+          env,
+          executeThroughShell,
+          0L);
+    }
+  }
+
+  private static InputStream execShellCommandAsync(
+      String command, List<String> params, Map<String, String> env, boolean executeThroughShell)
+      throws Exception {
+    if (LocalSocketProtocol.isBinderKey(getSecret())) {
+      ShellCommandLocalSocketClient client = new ShellCommandLocalSocketClient(getSecret());
+      return client.request(command, params, env, executeThroughShell, Duration.ofMinutes(2));
+    } else {
+      return ShellCommandClient.execOnServer(
+          InstrumentationRegistry.getInstrumentation().getContext(),
+          getSecret(),
+          command,
+          params,
+          env,
+          executeThroughShell,
+          0L);
+    }
   }
 
   @Test
@@ -80,7 +120,7 @@ public void testExecuteShellCommand_setEnvVar() throws Exception {
 
   @Test
   public void testExecuteShellCommand_setParams() throws Exception {
-    List<String> params = Lists.newArrayList("-c", "2", "localhost");
+    List<String> params = Arrays.asList("-c", "2", "localhost");
     String results = execShellCommand("ping", params, null, false);
     assertThat(results, containsString("127.0.0.1"));
   }
@@ -104,7 +144,7 @@ public void run() {
               }
             });
 
-    spinlock.run();
+    spinlock.start();
     execShellCommand("setprop testing 1", null, null, true);
 
     try {
@@ -123,14 +163,7 @@ public void testLargeFileDump() throws Exception {
     // handle. If the buffer blocks and overflows this test will timeout.
 
     InputStream stream =
-        ShellCommandClient.execOnServer(
-            InstrumentationRegistry.getInstrumentation().getContext(),
-            getSecret(),
-            "dd if=/dev/urandom bs=2048 count=16384",
-            null,
-            null,
-            true,
-            0L);
+        execShellCommandAsync("dd if=/dev/urandom bs=2048 count=16384", null, null, true);
 
     boolean weReadSomething = false;
 
diff --git a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellExecutorTest.java b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellExecutorTest.java
index 179d3a7bf..704c55573 100644
--- a/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellExecutorTest.java
+++ b/services/shellexecutor/javatests/androidx/test/services/shellexecutor/ShellExecutorTest.java
@@ -36,10 +36,11 @@ public class ShellExecutorTest {
 
   @Before
   public void initShellExec() {
-    this.shellExecutor =
-        new ShellExecutorImpl(
+    ShellExecutorFactory factory =
+        new ShellExecutorFactory(
             InstrumentationRegistry.getInstrumentation().getContext(),
             InstrumentationRegistry.getArguments().getString(ShellExecSharedConstants.BINDER_KEY));
+    this.shellExecutor = factory.create();
   }
 
   @Test
diff --git a/services/speakeasy/README.md b/services/speakeasy/README.md
new file mode 100644
index 000000000..21c31fed0
--- /dev/null
+++ b/services/speakeasy/README.md
@@ -0,0 +1,91 @@
+# SpeakEasy
+
+Android lacks a `sudo` command. SpeakEasy is a workaround that facilitates this
+for applications that need to run commands with root privileges:
+
+1.  `androidx.test.services` runs a service that can accept connections that
+    pass IBinder information
+1.  a top level `ShellMain` run with root privileges starts a server that
+    publishes an IBinder to `androidx.test.services`
+1.  other programs can connect to `androidx.test.services` and get the IBinder
+
+The SpeakEasy way to run an
+[Instrumentation](http://go/android-dev/reference/android/app/Instrumentation)
+test is to use `app_process` to start `ShellMain`, which then runs the `am
+instrument` command.
+
+A standard launch looks like `CLASSPATH=$(pm path androidx.test.services) app_process /
+androidx.test.services.shellexecutor.ShellMain am instrument -w
+--no-window-animation -e targetInstrumentation
+com.google.test.test/androidx.test.runner.AndroidJUnitRunner -e serverPort 64676
+-e orchestratorCollectDiagnostics false -e testDataDir /data -e appPackage
+com.google.test
+com.google.testing.platform.android.core/.AndroidTestOrchestrator`:
+
+1.  [`app_process`](https://cs.android.com/android/platform/superproject/+/master:frameworks/base/cmds/app_process/app_main.cpp)
+    launches ShellMain in the root directory. It is not an application and it
+    has no [Context](http://go/android-dev/reference/android/content/Context).
+    It figures out where to get ShellMain from the `CLASSPATH`. (ShellMain is
+    not present in `androidx.test.services`' manifest.)
+1.  [ShellMain](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellMain.java)
+    starts the ShellCommandExecutorServer.
+1.  The
+    [ShellCommandExecutorServer](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandExecutorServer.java):
+    1.  generates a *`binderKey`*.
+    1.  publishes an
+        [IBinder](http://go/android-dev/reference/android/os/IBinder) to the
+        SpeakEasy service running in `androidx.test.services` using a
+        [ToolConnection](http://google3/third_party/android/androidx_test/services/speakeasy/java/androidx/test/services/speakeasy/client/ToolConnection.java),
+        which has a variety of hacks for getting at the
+        [SpeakEasyContentProvider](http://google3/third_party/android/androidx_test/services/speakeasy/java/androidx/test/services/speakeasy/server/SpeakEasyContentProvider.java)
+        without a Context. (Different API levels use different hacks to get at
+        the [IActivityManager](https://cs.android.com/android/platform/superproject/+/refs/heads/master:frameworks/base/core/java/android/app/IActivityManager.aidl).)
+    1.  spawns a thread that waits for incoming
+        [Command](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/Command.aidl)s
+        and sends them to the
+        [ShellCommandExecutor](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandExecutor.java).
+    1.  returns the *`binderKey`* to ShellMain.
+1.  ShellMain passes `-e shellExecKey`*`binderKey`* to `am instrument` when it
+    spawns the AndroidTestOrchestrator.
+1.  The
+    [AndroidTestOrchestrator](http://google3/third_party/utp/android/java/com/google/testing/platform/android/core/AndroidTestOrchestrator.kt)
+    1.  passes its arguments to the
+        [InstrumentationRegistry](http://google3/third_party/android/androidx_test/runner/monitor/java/androidx/test/platform/app/InstrumentationRegistry.java)
+    1.  uses a
+        [ShellExecutor](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutor.java)
+        to send commands to the server.
+        1.  The
+            [ShellExecutorImpl](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellExecutorImpl.java)
+            constructor takes the *`binderKey`* retrieved from the
+            InstrumentationRegistry.
+        1.  It uses the
+            [ShellCommandClient](http://google3/third_party/android/androidx_test/services/shellexecutor/java/androidx/test/services/shellexecutor/ShellCommandClient.java)
+            to deliver the Command.
+            1.  This involves creating an
+                [Intent](http://go/android-dev/reference/android/content/Intent)
+                for package `androidx.test.services` and class
+                `androidx.test.services.speakeasy.server.SpeakEasyService`
+            1.  and passing it to
+                [Context.startForegroundService](http://go/android-dev/reference/android/content/Context#startForegroundService\(android.content.Intent\))
+                (on API >= 26) or
+                [Context.startService()](http://go/android-dev/reference/android/content/Context#startService\(android.content.Intent\)).
+            1.  It then blocks on a
+                [FindResultReceiver](http://google3/third_party/android/androidx_test/services/speakeasy/java/androidx/test/services/speakeasy/client/FindResultReceiver.java),
+                which extends
+                [ResultReceiver](http://go/android-dev/reference/android/os/ResultReceiver).
+1.  In
+    [`androidx.test.services`](http://google3/third_party/android/androidx_test/services/AndroidManifest.xml),
+    the
+    [SpeakEasyService](http://google3/third_party/android/androidx_test/services/speakeasy/java/androidx/test/services/speakeasy/server/SpeakEasyService.java)
+    receives the Intent in its `onStart` and sends it to a background thread,
+    where it's handed to SpeakEasy.
+    1.  [SpeakEasy](http://google3/third_party/android/androidx_test/services/speakeasy/java/androidx/test/services/speakeasy/server/SpeakEasy.java)
+        contains the core logic of pairing binders with identifiers. It uses a
+        [ResultReceiver](http://go/android-dev/reference/android/os/ResultReceiver)
+        to pass the message along.
+
+## Challenges
+
+IBinders cannot be persisted, so if `androidx.test.services` is killed by the
+lowmemorykiller, it cannot restore its state. When tests run under low memory
+conditions, dex2oat can gobble tons of memory while the test is getting set up.
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
new file mode 100644
index 000000000..958072e3e
--- /dev/null
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/BUILD
@@ -0,0 +1,16 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "protocol",
+    srcs = ["SpeakEasyProtocol.java"],
+    visibility = [
+        "//services:__subpackages__",
+    ],
+)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/BUILD.bazel b/services/speakeasy/java/androidx/test/services/speakeasy/BUILD.bazel
deleted file mode 100644
index a4429f7a1..000000000
--- a/services/speakeasy/java/androidx/test/services/speakeasy/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-licenses(["notice"])  # Apache 2.0
-
-android_library(
-    name = "protocol",
-    srcs = ["SpeakEasyProtocol.java"],
-    visibility = [
-        "//services:__subpackages__",
-    ],
-)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/SpeakEasyProtocol.java b/services/speakeasy/java/androidx/test/services/speakeasy/SpeakEasyProtocol.java
index 0a03438d3..0ccad0f30 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/SpeakEasyProtocol.java
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/SpeakEasyProtocol.java
@@ -16,14 +16,11 @@
 
 package androidx.test.services.speakeasy;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.ResultReceiver;
 import android.util.Log;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 
 /**
  * SpeakEasyProtocol abstracts away sending commands / interpreting responses from speakeasy via
@@ -59,8 +56,6 @@ public final class SpeakEasyProtocol {
   public final FindResult findResult;
 
   private static final String TYPE_KEY = "sep_type";
-  private static final Method GET_IBINDER;
-  private static final Method PUT_IBINDER;
 
   private SpeakEasyProtocol(Publish p) {
     this.type = PUBLISH_TYPE;
@@ -432,44 +427,14 @@ private static ResultReceiver marshableReceiver(ResultReceiver r) {
     }
   }
 
-  static {
-    Method getIBinder = null;
-    Method putIBinder = null;
-    if (Build.VERSION.SDK_INT < 18) {
-      try {
-        getIBinder = Bundle.class.getMethod("getIBinder", String.class);
-        putIBinder = Bundle.class.getMethod("putIBinder", String.class, IBinder.class);
-      } catch (NoSuchMethodException nsme) {
-        Log.e(TAG, "Cannot find methods for IBinders on bundle object", nsme);
-        throw new RuntimeException(nsme);
-      }
-    }
-    GET_IBINDER = getIBinder;
-    PUT_IBINDER = putIBinder;
-  }
 
   /** Gets an IBinder from a bundle safely. */
   private static IBinder getBinder(Bundle b, String key) {
-    if (null != GET_IBINDER) {
-      try {
-        return (IBinder) GET_IBINDER.invoke(b, key);
-      } catch (InvocationTargetException | IllegalAccessException ex) {
-        throw new RuntimeException(ex);
-      }
-    }
     return b.getBinder(key);
   }
 
   /** Puts an IBinder in a bundle safely. */
   private static void putBinder(Bundle b, String key, IBinder val) {
-    if (null != PUT_IBINDER) {
-      try {
-        PUT_IBINDER.invoke(b, key, val);
-        return;
-      } catch (InvocationTargetException | IllegalAccessException ex) {
-        throw new RuntimeException(ex);
-      }
-    }
     b.putBinder(key, val);
   }
 }
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
new file mode 100644
index 000000000..be9df7bdc
--- /dev/null
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD
@@ -0,0 +1,62 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "connection",
+    srcs = ["Connection.java"],
+    deps = [":receivers"],
+)
+
+android_library(
+    name = "tool_connection",
+    srcs = ["ToolConnection.java"],
+    visibility = [
+        "//services:__subpackages__",
+    ],
+    exports = [
+        ":connection",
+        ":receivers",
+    ],
+    deps = [
+        ":connection",
+        ":receivers",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api:ActivityManagerNative",
+    ],
+)
+
+android_library(
+    name = "receivers",
+    srcs = [
+        "FindResultReceiver.java",
+        "PublishResultReceiver.java",
+    ],
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+    ],
+)
+
+android_library(
+    name = "client",
+    srcs = [
+        "AppConnection.java",
+    ],
+    visibility = [
+        "//services:__subpackages__",
+    ],
+    exports = [
+        ":connection",
+        ":receivers",
+    ],
+    deps = [
+        ":connection",
+        ":receivers",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+    ],
+)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD.bazel b/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD.bazel
deleted file mode 100644
index 6fd0ec892..000000000
--- a/services/speakeasy/java/androidx/test/services/speakeasy/client/BUILD.bazel
+++ /dev/null
@@ -1,51 +0,0 @@
-licenses(["notice"])  # Apache 2.0
-
-android_library(
-    name = "connection",
-    srcs = ["Connection.java"],
-    deps = [":receivers"],
-)
-
-android_library(
-    name = "tool_connection",
-    srcs = ["ToolConnection.java"],
-    visibility = ["//visibility:public"],
-    exports = [
-        ":connection",
-        ":receivers",
-    ],
-    deps = [
-        ":connection",
-        ":receivers",
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-        "//services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api:ActivityManagerNative",
-    ],
-)
-
-android_library(
-    name = "receivers",
-    srcs = [
-        "FindResultReceiver.java",
-        "PublishResultReceiver.java",
-    ],
-    deps = [
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-    ],
-)
-
-android_library(
-    name = "client",
-    srcs = [
-        "AppConnection.java",
-    ],
-    visibility = ["//visibility:public"],
-    exports = [
-        ":connection",
-        ":receivers",
-    ],
-    deps = [
-        ":connection",
-        ":receivers",
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-    ],
-)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/client/ToolConnection.java b/services/speakeasy/java/androidx/test/services/speakeasy/client/ToolConnection.java
index 6ec950a3c..0b5b33442 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/client/ToolConnection.java
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/client/ToolConnection.java
@@ -18,7 +18,6 @@
 
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
-import android.content.Intent;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
@@ -37,8 +36,6 @@
 public abstract class ToolConnection implements Connection {
   private static final String PACKAGE_NAME = "androidx.test.services";
   private static final String CONTENT_PROVIDER = "androidx_test_services.speak_easy";
-  private static final String SERVICE =
-      "androidx.test.services.speakeasy.server.SpeakEasyService";
   private static final String ATTRIBUTON_SOURCE_CLASS_NAME = "android.content.AttributionSource";
   private static final String TAG = "ToolConnection";
 
@@ -52,9 +49,7 @@ public static Connection makeConnection() {
   }
 
   static Connection makeConnection(String packageName, String contentProvider) {
-    if (Build.VERSION.SDK_INT < 17) {
-      return new ToolConnectionCompat(packageName, contentProvider);
-    } else if (Build.VERSION.SDK_INT <= 25) {
+    if (Build.VERSION.SDK_INT <= 25) {
       return new ToolConnectionJBToN(packageName, contentProvider);
     } else {
       return new ToolConnectionO(packageName, contentProvider);
@@ -98,23 +93,6 @@ public void find(String key, FindResultReceiver rr) {
 
   protected abstract void doCall(Bundle b) throws RemoteException;
 
-  private static class ToolConnectionCompat extends ToolConnection {
-
-    ToolConnectionCompat(String packageName, String contentProvider) {
-      super(packageName, contentProvider);
-    }
-
-    @Override
-    protected final void doCall(Bundle b) throws RemoteException {
-      Intent intent = new Intent();
-      intent.setClassName(packageName, SERVICE);
-      intent.putExtras(b);
-      Log.i(TAG, "Invoking ActivityManagerNative.getDefault().startService(...)");
-      ActivityManagerNative.getDefault().startService(null, intent, null);
-      Log.i(TAG, "Intent sent!");
-    }
-  }
-
   private abstract static class ToolConnectionPostIcs extends ToolConnection {
 
     protected abstract Object getActivityManager();
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
new file mode 100644
index 000000000..87e87989c
--- /dev/null
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD
@@ -0,0 +1,32 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "IActivityManager",
+    srcs = ["IActivityManager.java"],
+    neverlink = 1,
+    deps = [
+        ":IApplicationThread",
+    ],
+)
+
+android_library(
+    name = "ActivityManagerNative",
+    srcs = ["ActivityManagerNative.java"],
+    neverlink = 1,
+    visibility = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy/client:__pkg__",
+    ],
+    deps = [":IActivityManager"],
+)
+
+android_library(
+    name = "IApplicationThread",
+    srcs = ["IApplicationThread.java"],
+)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD.bazel b/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD.bazel
deleted file mode 100644
index 3a039b9f7..000000000
--- a/services/speakeasy/java/androidx/test/services/speakeasy/compilehelp/hidden_api/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-licenses(["notice"])  # Apache 2.0
-
-android_library(
-    name = "IActivityManager",
-    srcs = ["IActivityManager.java"],
-    neverlink = 1,
-    deps = [
-        ":IApplicationThread",
-    ],
-)
-
-android_library(
-    name = "ActivityManagerNative",
-    srcs = ["ActivityManagerNative.java"],
-    neverlink = 1,
-    visibility = [
-        "//services/speakeasy/java/androidx/test/services/speakeasy/client:__pkg__",
-    ],
-    deps = [":IActivityManager"],
-)
-
-android_library(
-    name = "IApplicationThread",
-    srcs = ["IApplicationThread.java"],
-)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml b/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml
index 05b946a88..c405a1965 100644
--- a/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/server/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.services.speakeasy.server">
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application android:label="SpeakEasyService" android:directBootAware="true">
       <service
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD b/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
new file mode 100644
index 000000000..baf0a6841
--- /dev/null
+++ b/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD
@@ -0,0 +1,46 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//services:__subpackages__",
+        "//services/speakeasy/javatests/androidx/test/services/speakeasy/server:__pkg__",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "speak_easy_core",
+    srcs = ["SpeakEasy.java"],
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+android_library(
+    name = "speak_easy_service",
+    srcs = [
+        "SpeakEasyContentProvider.java",
+        "SpeakEasyService.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    visibility = [
+        "//services:__subpackages__",
+        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
+    ],
+    deps = [
+        ":speak_easy_core",
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "@maven//:androidx_core_core",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+android_library(
+    name = "server",
+    exports = [":speak_easy_service"],
+)
diff --git a/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD.bazel b/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD.bazel
deleted file mode 100644
index c246604ff..000000000
--- a/services/speakeasy/java/androidx/test/services/speakeasy/server/BUILD.bazel
+++ /dev/null
@@ -1,42 +0,0 @@
-package(
-    default_visibility = [
-        "//services:__subpackages__",
-        "//services/speakeasy/javatests/androidx/test/services/speakeasy/server:__pkg__",
-    ],
-)
-
-licenses(["notice"])  # Apache 2.0
-
-android_library(
-    name = "speak_easy_core",
-    srcs = ["SpeakEasy.java"],
-    deps = [
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "speak_easy_service",
-    srcs = [
-        "SpeakEasyContentProvider.java",
-        "SpeakEasyService.java",
-    ],
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    visibility = [
-        "//services:__subpackages__",
-        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
-    ],
-    deps = [
-        ":speak_easy_core",
-        "//:androidx_core",
-        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "server",
-    exports = [":speak_easy_service"],
-)
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/BUILD b/services/speakeasy/javatests/androidx/test/services/speakeasy/BUILD
new file mode 100644
index 000000000..ff8008780
--- /dev/null
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/BUILD
@@ -0,0 +1,18 @@
+load("//build_extensions:axt_android_local_test.bzl", "axt_android_local_test")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_local_test(
+    name = "SpeakEasyProtocolTest",
+    size = "small",
+    srcs = ["SpeakEasyProtocolTest.java"],
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "@maven//:com_google_truth_truth",
+    ],
+)
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/BUILD.bazel b/services/speakeasy/javatests/androidx/test/services/speakeasy/BUILD.bazel
deleted file mode 100644
index a4ab2e78b..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/BUILD.bazel
+++ /dev/null
@@ -1,36 +0,0 @@
-# Description: Build rules for speak easy tests
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
-    ],
-)
-
-## Robolectric tests
-SE_DEPS = [
-    "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-]
-
-EXTERNAL_DEPS = [
-    "@maven//:junit_junit",
-    "@maven//:com_google_truth_truth",
-    "@robolectric//bazel:android-all",
-    "@maven//:org_robolectric_robolectric",
-]
-
-java_library(
-    name = "test_deps",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = EXTERNAL_DEPS + SE_DEPS,
-)
-
-android_local_test(
-    name = "SpeakEasyProtocolTest",
-    size = "small",
-    srcs = ["SpeakEasyProtocolTest.java"],
-    tags = ["robolectric"],
-    deps = [":test_deps"],
-)
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml
index 4a12aaba5..82878c248 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.services.speakeasy.client" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application>
     </application>
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest_opensource.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest_opensource.xml
deleted file mode 100644
index 88e3b5b36..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/AndroidManifest_opensource.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.speakeasy.client" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-    </application>
-
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.services.speakeasy.server.testapp" />
-
-</manifest>
diff --git a/build_extensions/noJarJarRules.txt b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/BUILD
similarity index 100%
rename from build_extensions/noJarJarRules.txt
rename to services/speakeasy/javatests/androidx/test/services/speakeasy/client/BUILD
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/BUILD.bazel b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/BUILD.bazel
deleted file mode 100644
index dc37ca4e2..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/BUILD.bazel
+++ /dev/null
@@ -1,74 +0,0 @@
-# Description:
-#   Tests for speak easy client
-
-licenses(["notice"])  # Apache 2.0
-
-package(
-    default_visibility = [
-        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
-    ],
-)
-
-SE_CLIENT_TEST_SRCS = [
-    "SpeakEasyClientTest.java",
-    "Reverser.java",
-]
-
-SE_CLIENT_DEPS = [
-    "//runner/android_junit_runner",
-    "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-    "//services/speakeasy/java/androidx/test/services/speakeasy/client",
-    "//services/speakeasy/java/androidx/test/services/speakeasy/client:tool_connection",
-]
-
-EXTERNAL_DEPS = [
-    "@maven//:com_google_guava_guava",
-    "@maven//:com_google_code_findbugs_jsr305",
-    "@maven//:junit_junit",
-    "@maven//:com_google_truth_truth",
-]
-
-java_library(
-    name = "test_deps",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = EXTERNAL_DEPS + SE_CLIENT_DEPS,
-)
-
-android_library(
-    name = "se_client_test_lib",
-    testonly = 1,
-    srcs = SE_CLIENT_TEST_SRCS,
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":test_deps"],
-)
-
-android_binary(
-    name = "se_server_test_binary",
-    testonly = 1,
-    instruments = "//services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":se_client_test_lib"],
-)
-
-API_LEVELS = [
-    "19_x86",
-    "21_x86",
-    "22_x86",
-    "23_x86",
-]
-
-[android_instrumentation_test(
-    name = "client_tests_%s" % api_level,
-    size = "large",
-    args = [
-        "--fixture_scripts=services/speakeasy/javatests/androidx/test/services/speakeasy/client/reverser_deamon.sh",
-        "--clear_package_data",
-        "--install_test_services=True",
-    ],
-    data = [
-        ":reverser_deamon.sh",
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_%s_qemu2" % (api_level),
-    test_app = ":se_server_test_binary",
-) for api_level in API_LEVELS]
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/SpeakEasyClientTest.java b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/SpeakEasyClientTest.java
index 686a698f3..808940ed5 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/SpeakEasyClientTest.java
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/SpeakEasyClientTest.java
@@ -80,7 +80,6 @@ public void testPublishAndFind() throws Exception {
     assertWithMessage("Did we find the message?").that(found).isTrue();
   }
 
-
   private SpeakEasyProtocol.FindResult find(String key) {
     final CountDownLatch latch = new CountDownLatch(1);
     final AtomicReference<SpeakEasyProtocol.FindResult> fr = new AtomicReference<>(null);
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml
index 4931dcd44..38e7b1503 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/AndroidManifest.xml
@@ -20,8 +20,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidx.test.services.speakeasy.server.testapp">
     <uses-sdk
-      android:minSdkVersion="14"
-      android:targetSdkVersion="28" />
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34" />
 
     <application>
         <service
@@ -35,4 +35,6 @@
           android:authorities="testapp.androidx_test_services.speak_easy"
           android:grantUriPermissions="true" />
     </application>
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 </manifest>
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/BUILD b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/BUILD
new file mode 100644
index 000000000..4c9e85c38
--- /dev/null
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/BUILD
@@ -0,0 +1,19 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
+    ],
+)
+
+android_binary(
+    name = "testapp",
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy/server:speak_easy_service",
+    ],
+)
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/BUILD.bazel b/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/BUILD.bazel
deleted file mode 100644
index 0b7c827b7..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/client/testapp/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-# Description:
-#   Testsapp for speak easy client
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
-    ],
-)
-
-android_binary(
-    name = "testapp",
-    testonly = 1,
-    manifest = "AndroidManifest.xml",
-    deps = ["//services/speakeasy/java/androidx/test/services/speakeasy/server:speak_easy_service"],
-)
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml
index 535e97b1b..6a6e89b41 100644
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.services.speakeasy.server" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application>
     </application>
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest_opensource.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest_opensource.xml
deleted file mode 100644
index b134cf7fb..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest_opensource.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.speakeasy.server" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-    </application>
-
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.services.speakeasy.server" />
-
-</manifest>
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest_opensource_stub.xml b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest_opensource_stub.xml
deleted file mode 100644
index fe8c98bd4..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/AndroidManifest_opensource_stub.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.speakeasy.server" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-</manifest>
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/BUILD b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/BUILD
new file mode 100644
index 000000000..91caf75d5
--- /dev/null
+++ b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/BUILD
@@ -0,0 +1,24 @@
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "SpeakEasyTest",
+    srcs = ["SpeakEasyTest.java"],
+    args = [
+        "--install_test_services=True",
+    ],
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
+        "//services/speakeasy/java/androidx/test/services/speakeasy/server:speak_easy_core",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/BUILD.bazel b/services/speakeasy/javatests/androidx/test/services/speakeasy/server/BUILD.bazel
deleted file mode 100644
index 00abad7a0..000000000
--- a/services/speakeasy/javatests/androidx/test/services/speakeasy/server/BUILD.bazel
+++ /dev/null
@@ -1,73 +0,0 @@
-# Description:
-#   Tests for speak easy server
-
-licenses(["notice"])  # Apache License 2.0
-
-package(
-    default_visibility = [
-        "//services/speakeasy/javatests/androidx/test/services/speakeasy:__subpackages__",
-    ],
-)
-
-SE_SERVER_TEST_SRCS = [
-    "SpeakEasyTest.java",
-]
-
-SE_SERVER_DEPS = [
-    "//runner/android_junit_runner",
-    "//services/speakeasy/java/androidx/test/services/speakeasy:protocol",
-    "//services/speakeasy/java/androidx/test/services/speakeasy/server:speak_easy_core",
-]
-
-EXTERNAL_DEPS = [
-    "@maven//:com_google_code_findbugs_jsr305",
-    "@maven//:junit_junit",
-    "@maven//:com_google_truth_truth",
-]
-
-java_library(
-    name = "test_deps",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = EXTERNAL_DEPS + SE_SERVER_DEPS,
-)
-
-android_library(
-    name = "se_server_test_lib",
-    testonly = 1,
-    srcs = SE_SERVER_TEST_SRCS,
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":test_deps"],
-)
-
-android_binary(
-    name = "se_server_binary",
-    testonly = 1,
-    manifest = "AndroidManifest_opensource_stub.xml",
-)
-
-android_binary(
-    name = "se_server_test_binary",
-    testonly = 1,
-    instruments = ":se_server_binary",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":se_server_test_lib"],
-)
-
-API_LEVELS = [
-    "19_x86",
-    "21_x86",
-    "22_x86",
-    "23_x86",
-]
-
-[android_instrumentation_test(
-    name = "server_tests_%s" % api_level,
-    size = "large",
-    args = [
-        "--clear_package_data",
-        "--install_test_services=True",
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_%s_qemu2" % (api_level),
-    test_app = ":se_server_test_binary",
-) for api_level in API_LEVELS]
diff --git a/services/storage/BUILD b/services/storage/BUILD
new file mode 100644
index 000000000..734543de4
--- /dev/null
+++ b/services/storage/BUILD
@@ -0,0 +1,21 @@
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# AndroidX Test storage API.
+alias(
+    name = "storage",
+    actual = "//services/storage/java/androidx/test/services/storage",
+    visibility = ["//visibility:public"],
+)
+
+# Constants shared between on-device (android) and host-side (java code) testing
+# infrastructure for the storage service.
+alias(
+    name = "storage_constants",
+    actual = "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+    visibility = ["//visibility:public"],
+)
diff --git a/services/storage/BUILD.bazel b/services/storage/BUILD.bazel
deleted file mode 100644
index b21941e5c..000000000
--- a/services/storage/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-# Publicly visible alias to the test storage targets.
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-
-licenses(["notice"])
-
-# AndroidX Test storage API.
-android_library(
-    name = "storage",
-    visibility = ["//visibility:public"],
-    exports = ["//services/storage/java/androidx/test/services/storage"],
-)
-
-# Constants shared between on-device (android) and host-side (java code) testing
-# infrastructure for the storage service.
-java_library(
-    name = "storage_constants",
-    visibility = ["//visibility:public"],
-    exports = ["//services/storage/java/androidx/test/services/storage:test_storage_constants"],
-)
diff --git a/services/storage/java/androidx/test/services/storage/AndroidManifest.xml b/services/storage/java/androidx/test/services/storage/AndroidManifest.xml
index 32f9f779e..a8fe993fe 100644
--- a/services/storage/java/androidx/test/services/storage/AndroidManifest.xml
+++ b/services/storage/java/androidx/test/services/storage/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.services.storage" >
 
     <uses-sdk
-        android:minSdkVersion="14"
+        android:minSdkVersion="23"
         android:targetSdkVersion="30" />
 
 </manifest>
diff --git a/services/storage/java/androidx/test/services/storage/BUILD b/services/storage/java/androidx/test/services/storage/BUILD
new file mode 100644
index 000000000..236224451
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/BUILD
@@ -0,0 +1,95 @@
+# Description:
+#   Exposes sd card storage to tests regardless of permissions.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_java//java:defs.bzl", "java_library")
+load("//build_extensions:api_checks.bzl", "api_checks")
+load("//build_extensions/maven:axt_android_aar.bzl", "axt_android_aar")
+load("//build_extensions/maven:maven_artifact.bzl", "maven_artifact")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+licenses(["notice"])
+
+android_library(
+    name = "storage",
+    srcs = [
+        "TestStorage.java",
+        "TestStorageException.java",
+        "internal/TestStorageUtil.java",
+        "internal/package-info.java",
+    ],
+    manifest = "AndroidManifest.xml",
+    # TODO(b/323189093): remove when TestStorage -> PlatformTestStorage LSC is complete
+    exports = [
+        "//runner/monitor",
+    ],
+    deps = [
+        ":test_storage_constants",
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage/file",
+    ],
+)
+
+# Constants shared between on-device (android) and host-side (java code) testing
+# infrastructure for the storage service.
+java_library(
+    name = "test_storage_constants",
+    srcs = ["TestStorageConstants.java"],
+    deps = [
+        "//opensource/androidx:annotation",
+    ],
+)
+
+# Proto libs for the storage service.
+proto_library(
+    name = "storage_service_pb",
+    srcs = ["test_storage_service.proto"],
+)
+
+java_lite_proto_library(
+    name = "storage_service_pb_java_proto_lite",
+    deps = [":storage_service_pb"],
+)
+
+java_proto_library(
+    name = "storage_service_pb_java_proto",
+    deps = [":storage_service_pb"],
+)
+
+axt_android_aar(
+    name = "test_storage_aar",
+    expected_class_prefixes = [
+        "androidx.test.services.storage",
+    ],
+    included_dep = ":storage",
+)
+
+maven_artifact(
+    name = "test_storage_maven_artifact",
+    last_updated = "2020020700000",
+    target = ":test_storage_aar",
+)
+
+# no public documentation
+# dackka_test(
+#     name = "test_storage_doc",
+#     runtime_dep = ":storage",
+#     src_jar = ":test_storage_aar-src.jar",
+# )
+
+api_checks(
+    name = "storage_api",
+    runtime_dep = ":storage",
+    src_jar = ":test_storage_aar-src.jar",
+)
diff --git a/services/storage/java/androidx/test/services/storage/BUILD.bazel b/services/storage/java/androidx/test/services/storage/BUILD.bazel
deleted file mode 100644
index 2126ea5d9..000000000
--- a/services/storage/java/androidx/test/services/storage/BUILD.bazel
+++ /dev/null
@@ -1,89 +0,0 @@
-# Description:
-#   Exposes sd card storage to tests regardless of permissions.
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:release.bzl", "axt_release_lib")
-load("//build_extensions:axt_versions.bzl", "MONITOR_VERSION", "SERVICES_VERSION")
-
-package(
-    default_visibility = [
-        "//visibility:public",
-    ],
-    features = ["-android_resources_strict_deps"],
-)
-
-licenses(["notice"])
-
-java_library(
-    name = "experimental_storage_annotation",
-    srcs = ["ExperimentalTestStorage.java"],
-    deps = [
-        "@maven//:androidx_annotation_annotation_experimental",
-    ],
-)
-
-android_library(
-    name = "storage",
-    srcs = [
-        "TestStorage.java",
-        "TestStorageException.java",
-        "internal/TestStorageUtil.java",
-    ],
-    manifest = "AndroidManifest.xml",
-    deps = [
-        ":experimental_storage_annotation",
-        "//runner/monitor",
-        "//services/storage/java/androidx/test/services/storage/file",
-        "@maven//:com_google_code_findbugs_jsr305",
-    ],
-)
-
-# Constants shared between on-device (android) and host-side (java code) testing
-# infrastructure for the storage service.
-java_library(
-    name = "test_storage_constants",
-    srcs = ["TestStorageConstants.java"],
-    deps = [
-        ":experimental_storage_annotation",
-    ],
-)
-
-proto_library(
-    name = "storage_service_pb",
-    srcs = ["test_storage_service.proto"],
-)
-
-java_lite_proto_library(
-    name = "storage_service_pb_java_proto_lite",
-    deps = [":storage_service_pb"],
-)
-
-java_proto_library(
-    name = "storage_service_pb_java_proto",
-    deps = [":storage_service_pb"],
-)
-
-# Generate release artifacts for the test storage.
-axt_release_lib(
-    name = "test_storage_release",
-    keep_spec = "androidx/test/services/storage",
-    # remove the generated R class
-    remove_spec = "androidx/test/services/storage/R[$$\\.]",
-    deps = [
-        ":storage",
-    ],
-)
-
-maven_artifact(
-    name = "test_storage_maven_artifact",
-    src = ":test_storage_release.aar",
-    artifact_deps = [
-        "androidx.test:monitor:[%s]" % MONITOR_VERSION,
-        "com.google.code.findbugs:jsr305:2.0.1",
-    ],
-    artifact_id = "storage",
-    group_id = "androidx.test.services",
-    last_updated = "2020020700000",
-    src_jar = ":libstorage-src.jar",
-    version = "%s" % SERVICES_VERSION,
-)
diff --git a/services/storage/java/androidx/test/services/storage/ExperimentalTestStorage.java b/services/storage/java/androidx/test/services/storage/ExperimentalTestStorage.java
deleted file mode 100644
index 55ccfeb2c..000000000
--- a/services/storage/java/androidx/test/services/storage/ExperimentalTestStorage.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.services.storage;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-
-import androidx.annotation.experimental.Experimental;
-import androidx.annotation.experimental.Experimental.Level;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/** Annotation denoting this test storage library is experimental. */
-@Retention(RetentionPolicy.CLASS)
-@Target({TYPE, METHOD, CONSTRUCTOR, FIELD, PACKAGE})
-@Experimental(level = Level.ERROR)
-public @interface ExperimentalTestStorage {}
diff --git a/services/storage/java/androidx/test/services/storage/TestStorage.java b/services/storage/java/androidx/test/services/storage/TestStorage.java
index 9d45a0ecf..5be613ae7 100644
--- a/services/storage/java/androidx/test/services/storage/TestStorage.java
+++ b/services/storage/java/androidx/test/services/storage/TestStorage.java
@@ -21,6 +21,9 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.platform.io.PlatformTestStorage;
 import androidx.test.services.storage.file.HostedFile;
@@ -29,6 +32,7 @@
 import androidx.test.services.storage.file.PropertyFile.Authority;
 import androidx.test.services.storage.internal.TestStorageUtil;
 import java.io.BufferedOutputStream;
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -38,13 +42,22 @@
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Nonnull;
 
 /**
- * Provides convenient I/O operations for reading/writing testing relevant files, properties in a
- * test.
+ * An implementation of {@link PlatformTestStorage} that uses a content provider housed in the
+ * androidx.test.services apk.
+ *
+ * <p>As such, in order to use this implementation the test services apk must be installed on the
+ * device, and thus isn't supported in environments where test services is not installed such as
+ * Robolectric.
+ *
+ * <p>Users should ideally not reference this class directly, but rather retrieve the
+ * PlatformTestStorage implementation appropriate for their execution environment from {@link
+ * androidx.test.platform.io.PlatformTestStorageRegistry}.
+ *
+ * @hide
  */
-@ExperimentalTestStorage
+@RestrictTo(Scope.LIBRARY_GROUP)
 public final class TestStorage implements PlatformTestStorage {
   private static final String TAG = TestStorage.class.getSimpleName();
   private static final String PROPERTIES_FILE_NAME = "properties.dat";
@@ -68,7 +81,7 @@ public TestStorage() {
    * @param contentResolver the content resolver that shall be used to resolve a URI in the test
    *     storage service. Should not be null.
    */
-  public TestStorage(@Nonnull ContentResolver contentResolver) {
+  public TestStorage(@NonNull ContentResolver contentResolver) {
     this.contentResolver = contentResolver;
   }
 
@@ -86,7 +99,8 @@ public TestStorage(@Nonnull ContentResolver contentResolver) {
    *     "/sdcard/test_input_files/path/to/my_input.txt" on device.
    * @return a content Uri to the test file dependency.
    */
-  public static Uri getInputFileUri(@Nonnull String pathname) {
+  @Override
+  public Uri getInputFileUri(@NonNull String pathname) {
     checkNotNull(pathname);
     return HostedFile.buildUri(HostedFile.FileHost.TEST_FILE, pathname);
   }
@@ -104,11 +118,32 @@ public static Uri getInputFileUri(@Nonnull String pathname) {
    *     "/path/to/my_output.txt", the file will end up at
    *     "/sdcard/test_output_files/path/to/my_output.txt" on device.
    */
-  public static Uri getOutputFileUri(@Nonnull String pathname) {
+  @Override
+  public Uri getOutputFileUri(@NonNull String pathname) {
     checkNotNull(pathname);
     return HostedFile.buildUri(HostedFile.FileHost.OUTPUT, pathname);
   }
 
+  /**
+   * Returns true if {@code pathname} corresponds to a file or directory that is in a directory
+   * where the storage service stores files.
+   *
+   * @param pathname path to a file or directory. Should not be null. This is an absolute path to a
+   *     file that may be a part of the storage service.
+   */
+  @Override
+  public boolean isTestStorageFilePath(@NonNull String pathname) {
+    File onDevicePathRoot =
+        new File(
+            HostedFile.getOutputRootDirectory(
+                InstrumentationRegistry.getInstrumentation().getTargetContext()),
+            TestStorageConstants.ON_DEVICE_PATH_ROOT);
+    // Append a trailing slash because ON_DEVICE_PATH_ROOT has a trailing slash. If pathname already
+    // has a trailing slash or other suffix, this won't affect the startsWith() matching logic.
+    pathname = pathname + "/";
+    return pathname.startsWith(onDevicePathRoot.getAbsolutePath());
+  }
+
   /**
    * Provides an InputStream to a test file dependency.
    *
@@ -121,7 +156,7 @@ public static Uri getOutputFileUri(@Nonnull String pathname) {
    * @throws FileNotFoundException if pathname does not exist
    */
   @Override
-  public InputStream openInputFile(@Nonnull String pathname) throws FileNotFoundException {
+  public InputStream openInputFile(@NonNull String pathname) throws FileNotFoundException {
     Uri dataUri = getInputFileUri(pathname);
     return TestStorageUtil.getInputStream(dataUri, contentResolver);
   }
@@ -141,7 +176,7 @@ public InputStream openInputFile(@Nonnull String pathname) throws FileNotFoundEx
    * @param argName the argument name. Should not be null.
    */
   @Override
-  public String getInputArg(@Nonnull String argName) {
+  public String getInputArg(@NonNull String argName) {
     checkNotNull(argName);
 
     Uri testArgUri = PropertyFile.buildUri(Authority.TEST_ARGS, argName);
@@ -196,7 +231,7 @@ public Map<String, String> getInputArgs() {
    * @return an OutputStream to the given output file.
    */
   @Override
-  public OutputStream openOutputFile(@Nonnull String pathname) throws FileNotFoundException {
+  public OutputStream openOutputFile(@NonNull String pathname) throws FileNotFoundException {
     return openOutputFile(pathname, false);
   }
 
@@ -213,7 +248,7 @@ public OutputStream openOutputFile(@Nonnull String pathname) throws FileNotFound
    * @return an OutputStream to the given output file.
    */
   @Override
-  public OutputStream openOutputFile(@Nonnull String pathname, boolean append)
+  public OutputStream openOutputFile(@NonNull String pathname, boolean append)
       throws FileNotFoundException {
     checkNotNull(pathname);
     Uri outputUri = getOutputFileUri(pathname);
@@ -295,8 +330,10 @@ public Map<String, Serializable> getOutputProperties() {
    * @return an InputStream to the given test file.
    * @hide
    */
+  // TODO(b/335660740): remove this unused method
+  @RestrictTo(Scope.LIBRARY)
   @Override
-  public InputStream openInternalInputFile(String pathname) throws IOException {
+  public InputStream openInternalInputFile(String pathname) throws FileNotFoundException {
     checkNotNull(pathname);
     Uri outputUri = HostedFile.buildUri(FileHost.INTERNAL_USE_ONLY, pathname);
     return TestStorageUtil.getInputStream(outputUri, contentResolver);
@@ -312,8 +349,9 @@ public InputStream openInternalInputFile(String pathname) throws IOException {
    * @return an OutputStream to the given output file.
    * @hide
    */
+  @RestrictTo(Scope.LIBRARY)
   @Override
-  public OutputStream openInternalOutputFile(String pathname) throws IOException {
+  public OutputStream openInternalOutputFile(String pathname) throws FileNotFoundException {
     checkNotNull(pathname);
     Uri outputUri = HostedFile.buildUri(FileHost.INTERNAL_USE_ONLY, pathname);
     return TestStorageUtil.getOutputStream(outputUri, contentResolver);
diff --git a/services/storage/java/androidx/test/services/storage/TestStorageConstants.java b/services/storage/java/androidx/test/services/storage/TestStorageConstants.java
index 292acd1b5..e867c817e 100644
--- a/services/storage/java/androidx/test/services/storage/TestStorageConstants.java
+++ b/services/storage/java/androidx/test/services/storage/TestStorageConstants.java
@@ -15,8 +15,15 @@
  */
 package androidx.test.services.storage;
 
-/** Holds constants that are shared between on-device and host-side testing infrastructure. */
-@ExperimentalTestStorage
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Holds constants that are shared between on-device and host-side testing infrastructure.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public final class TestStorageConstants {
 
   /** The parent folder name for all the test related files. */
@@ -61,8 +68,5 @@ public final class TestStorageConstants {
   /** The name of the file where test arguments are stored. */
   public static final String TEST_ARGS_FILE_NAME = "test_args.dat";
 
-  /** The name of the test argument that indicates whether qemu ips should be used. */
-  public static final String USE_QEMU_IPS_IF_POSSIBLE_ARG_TAG = "infra_use_qemu_ips";
-
   private TestStorageConstants() {}
 }
diff --git a/services/storage/java/androidx/test/services/storage/TestStorageException.java b/services/storage/java/androidx/test/services/storage/TestStorageException.java
index 3f16509dc..5069e5408 100644
--- a/services/storage/java/androidx/test/services/storage/TestStorageException.java
+++ b/services/storage/java/androidx/test/services/storage/TestStorageException.java
@@ -15,7 +15,15 @@
  */
 package androidx.test.services.storage;
 
-/** A RuntimeException thrown out of the test storage service. */
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * A RuntimeException thrown out of the test storage service.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY_GROUP)
 public class TestStorageException extends RuntimeException {
 
   public TestStorageException(String message) {
diff --git a/services/storage/java/androidx/test/services/storage/api/1.4.0.txt b/services/storage/java/androidx/test/services/storage/api/1.4.0.txt
new file mode 100644
index 000000000..e69de29bb
diff --git a/services/storage/java/androidx/test/services/storage/api/1.4.1_internal.txt b/services/storage/java/androidx/test/services/storage/api/1.4.1_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.4.1_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/1.4.1_public.txt b/services/storage/java/androidx/test/services/storage/api/1.4.1_public.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.4.1_public.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/1.4.2_internal.txt b/services/storage/java/androidx/test/services/storage/api/1.4.2_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.4.2_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/1.5.0_internal.txt b/services/storage/java/androidx/test/services/storage/api/1.5.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.5.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/1.5.0_public.txt b/services/storage/java/androidx/test/services/storage/api/1.5.0_public.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.5.0_public.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/1.6.0_internal.txt b/services/storage/java/androidx/test/services/storage/api/1.6.0_internal.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.6.0_internal.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/1.6.0_public.txt b/services/storage/java/androidx/test/services/storage/api/1.6.0_public.txt
new file mode 100644
index 000000000..da4f6cc18
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/1.6.0_public.txt
@@ -0,0 +1 @@
+// Signature format: 3.0
diff --git a/services/storage/java/androidx/test/services/storage/api/current_internal.txt b/services/storage/java/androidx/test/services/storage/api/current_internal.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/current_internal.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/services/storage/java/androidx/test/services/storage/api/current_public.txt b/services/storage/java/androidx/test/services/storage/api/current_public.txt
new file mode 100644
index 000000000..331c39e46
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/api/current_public.txt
@@ -0,0 +1 @@
+// Signature format: 5.0
diff --git a/services/storage/java/androidx/test/services/storage/file/BUILD b/services/storage/java/androidx/test/services/storage/file/BUILD
new file mode 100644
index 000000000..3100f6ee4
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/file/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//services/storage:__subpackages__",
+    ],
+)
+
+licenses(["notice"])
+
+# Intended for internal use only.
+android_library(
+    name = "file",
+    srcs = glob(["*.java"]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+    ],
+)
diff --git a/services/storage/java/androidx/test/services/storage/file/BUILD.bazel b/services/storage/java/androidx/test/services/storage/file/BUILD.bazel
deleted file mode 100644
index c90cc99cc..000000000
--- a/services/storage/java/androidx/test/services/storage/file/BUILD.bazel
+++ /dev/null
@@ -1,18 +0,0 @@
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-
-package(
-    default_visibility = ["//services/storage:__subpackages__"],
-    features = ["-android_resources_strict_deps"],
-)
-
-licenses(["notice"])
-
-# Used by TestStorage to build URIs to the test file content providers.
-android_library(
-    name = "file",
-    srcs = glob(["*.java"]),
-    deps = [
-        "//runner/monitor",
-        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
-    ],
-)
diff --git a/services/storage/java/androidx/test/services/storage/file/HostedFile.java b/services/storage/java/androidx/test/services/storage/file/HostedFile.java
index 3c614e91f..2f331a290 100644
--- a/services/storage/java/androidx/test/services/storage/file/HostedFile.java
+++ b/services/storage/java/androidx/test/services/storage/file/HostedFile.java
@@ -15,13 +15,31 @@
  */
 package androidx.test.services.storage.file;
 
+import android.content.Context;
 import android.net.Uri;
+import android.os.Environment;
+import android.os.UserManager;
 import android.provider.OpenableColumns;
+import android.util.Log;
 import androidx.test.services.storage.TestStorageConstants;
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-/** Constants to access hosted file data and convenience methods for building Uris. */
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Constants to access hosted file data and convenience methods for building Uris.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public final class HostedFile {
 
+  private static final String TAG = "HostedFile";
+
+  private static final AtomicBoolean loggedOutputDir = new AtomicBoolean(false);
+
   /** An enum of the columns returned by the hosted file service. */
   public enum HostedFileColumn {
     NAME("name", String.class, 3 /* Cursor.FIELD_TYPE_STRING since api 11 */, 0),
@@ -128,6 +146,29 @@ public static Uri buildUri(FileHost host, String fileName) {
         .build();
   }
 
+  public static File getInputRootDirectory(Context context) {
+    // always use external storage dir for input
+    return Environment.getExternalStorageDirectory();
+  }
+
+  public static File getOutputRootDirectory(Context context) {
+    UserManager userManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+    if (userManager.isSystemUser()) {
+      return Environment.getExternalStorageDirectory();
+    } else {
+      // using legacy external storage for output in automotive devices where tests run as
+      // a secondary user has been flaky. So use local storage instead.
+      if (!loggedOutputDir.getAndSet(true)) {
+        // limit log spam by only logging choice once
+        Log.d(
+            TAG,
+            "Secondary user detected. Choosing local storage as output root dir: "
+                + context.getCacheDir().getAbsolutePath());
+      }
+      return context.getCacheDir();
+    }
+  }
+
   private static <T> T checkNotNull(T reference) {
     if (reference == null) {
       throw new NullPointerException();
diff --git a/services/storage/java/androidx/test/services/storage/file/PropertyFile.java b/services/storage/java/androidx/test/services/storage/file/PropertyFile.java
index c0b83eb7c..0f06af5b6 100644
--- a/services/storage/java/androidx/test/services/storage/file/PropertyFile.java
+++ b/services/storage/java/androidx/test/services/storage/file/PropertyFile.java
@@ -20,10 +20,16 @@
 import android.net.Uri;
 import androidx.test.services.storage.TestStorageConstants;
 
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
 /**
  * Constants to access property file data (holding name/value pairs) and convenience methods for
  * build URIs.
+ *
+ * @hide
  */
+@RestrictTo(Scope.LIBRARY)
 public final class PropertyFile {
 
   /** Represents columns returned by the property file service. */
diff --git a/services/storage/java/androidx/test/services/storage/internal/TestStorageUtil.java b/services/storage/java/androidx/test/services/storage/internal/TestStorageUtil.java
index ade343865..a44204dba 100644
--- a/services/storage/java/androidx/test/services/storage/internal/TestStorageUtil.java
+++ b/services/storage/java/androidx/test/services/storage/internal/TestStorageUtil.java
@@ -22,13 +22,20 @@
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
 import androidx.test.services.storage.TestStorageException;
 import java.io.BufferedInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-/** Helper methods for the test storage implementations. */
+/**
+ * Helper methods for the test storage implementations.
+ *
+ * @hide
+ */
+@RestrictTo(Scope.LIBRARY)
 public final class TestStorageUtil {
   /**
    * Gets the input stream for a given Uri.
@@ -86,7 +93,8 @@ public static OutputStream getOutputStream(
     ContentProviderClient providerClient = null;
     try {
       providerClient = makeContentProviderClient(contentResolver, uri);
-      String mode = append ? "wa" : "w";
+      // https://developer.android.com/reference/android/os/ParcelFileDescriptor#parseMode(java.lang.String)
+      String mode = append ? "wa" : "wt"; // t is "truncate", not "text".
       return new ParcelFileDescriptor.AutoCloseOutputStream(providerClient.openFile(uri, mode));
     } catch (RemoteException re) {
       throw new TestStorageException("Unable to access content provider: " + uri, re);
diff --git a/services/storage/java/androidx/test/services/storage/internal/package-info.java b/services/storage/java/androidx/test/services/storage/internal/package-info.java
new file mode 100644
index 000000000..be400bc4a
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/internal/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/** @hide */
+@RestrictTo(Scope.LIBRARY)
+package androidx.test.services.storage.internal;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
diff --git a/services/storage/java/androidx/test/services/storage/provider/AbstractFileContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/AbstractFileContentProvider.java
index c3fa31198..5081c2138 100644
--- a/services/storage/java/androidx/test/services/storage/provider/AbstractFileContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/AbstractFileContentProvider.java
@@ -19,6 +19,7 @@
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
+import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
@@ -43,52 +44,25 @@
 abstract class AbstractFileContentProvider extends ContentProvider {
   private static final String TAG = AbstractFileContentProvider.class.getSimpleName();
 
-  private final File hostedDirectory;
-  private final Access access;
+  private File hostedDirectory;
+  private Access access;
 
   enum Access {
     READ_ONLY,
     READ_WRITE
   }
 
-  /**
-   * Called during onCreate(). Subclasses should return true if they are ready to serve data and
-   * false if there is something wrong accessing their data. Such as the sdcard not being mounted.
-   */
-  protected abstract boolean onCreateHook();
+  /** Returns the root directory where this content provider should manage files from */
+  protected abstract File getHostedDirectory(Context context);
 
-  AbstractFileContentProvider(File hostedDirectory, Access access) {
-    super();
-    try {
-      this.hostedDirectory = checkNotNull(hostedDirectory).getCanonicalFile();
-    } catch (IOException ioe) {
-      throw new RuntimeException(ioe);
-    }
-    this.access = access;
-  }
+  /** Returns the access mode of this content provider */
+  protected abstract Access getAccess();
 
   @Override
   public boolean onCreate() {
-    if (onCreateHook()) {
-      if (!hostedDirectory.exists()) {
-        if (!hostedDirectory.mkdirs()) {
-          Log.e(TAG, "Cannot create hosted directory: " + hostedDirectory);
-          return false;
-        }
-      }
-      if (!hostedDirectory.isDirectory()) {
-        Log.e(TAG, "Hosted directory not a directory: " + hostedDirectory);
-        return false;
-      }
-      if ((Access.READ_WRITE == access) && !hostedDirectory.canWrite()) {
-        Log.e(TAG, "Hosted directory is not writable and write was requested: " + hostedDirectory);
-        return false;
-      }
-      return true;
-    } else {
-      Log.e(TAG, "Subclass claims hosted directory not ready: " + hostedDirectory);
-      return false;
-    }
+    hostedDirectory = getHostedDirectory(getContext());
+    access = getAccess();
+    return true;
   }
 
   @Override
@@ -107,10 +81,15 @@ public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundEx
       try {
         requestedFile.getParentFile().mkdirs();
         if (!requestedFile.getParentFile().exists()) {
+          Log.e(
+              TAG,
+              "Failed to create parent directory "
+                  + requestedFile.getParentFile().getAbsolutePath());
           throw new FileNotFoundException(String.format("No parent directory for '%s'", uri));
         }
 
         if (!requestedFile.createNewFile()) {
+          Log.e(TAG, "Failed to create file" + requestedFile.getAbsolutePath());
           throw new FileNotFoundException("Could not create file: " + uri);
         }
       } catch (IOException ioe) {
@@ -136,7 +115,6 @@ private File fromUri(Uri inUri) throws FileNotFoundException {
     }
 
     File checkFile = requestedFile.getAbsoluteFile();
-
     while (null != checkFile) {
       if (checkFile.equals(hostedDirectory)) {
         return requestedFile;
@@ -207,7 +185,23 @@ public int update(Uri uri, ContentValues values, String selection, String[] sele
 
   @Override
   public int delete(Uri uri, String selection, String[] selectionArgs) {
-    // not allowed.
+    Log.d(TAG, "Deleting hosted file " + uri);
+    try {
+      File requestedFile = fromUri(uri);
+      // Only deleting the entire hosted directory is supported. Also, the root hosted directory
+      // will be preserved to avoid recreating between test cases.
+      if (hostedDirectory.equals(requestedFile)) {
+        for (File child : hostedDirectory.listFiles()) {
+          deleteRecursively(child);
+        }
+      } else {
+        throw new StorageContentProviderException(
+            "Deleting file/directory other than the entire hosted directory is not supported!");
+      }
+    } catch (FileNotFoundException fnfe) {
+      Log.w(TAG, "Could not find file for query.", fnfe);
+      throw new StorageContentProviderException("Hosted file " + uri + " was not found!", fnfe);
+    }
     return 0;
   }
 
@@ -229,4 +223,14 @@ public Uri insert(Uri uri, ContentValues contentValues) {
   public void shutdown() {
     // no open services, this just suppresses a logger warning.
   }
+
+  /** Deletes the file or directory recursively. */
+  private void deleteRecursively(File fileOrDirectory) {
+    if (fileOrDirectory.isDirectory()) {
+      for (File child : fileOrDirectory.listFiles()) {
+        deleteRecursively(child);
+      }
+    }
+    fileOrDirectory.delete();
+  }
 }
diff --git a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml
index bd9d4998b..d0ad262a4 100644
--- a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml
+++ b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest.xml
@@ -25,7 +25,7 @@
   <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
 
-  <uses-sdk android:minSdkVersion="14"
+  <uses-sdk android:minSdkVersion="23"
             android:targetSdkVersion="30"/>
 
 </manifest>
diff --git a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
index c32f511f5..a661da6d4 100644
--- a/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
+++ b/services/storage/java/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
@@ -52,6 +52,6 @@
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-sdk
-      android:minSdkVersion="14" />
+      android:minSdkVersion="23" />
 
 </manifest>
diff --git a/services/storage/java/androidx/test/services/storage/provider/BUILD b/services/storage/java/androidx/test/services/storage/provider/BUILD
new file mode 100644
index 000000000..4bb3cc8ca
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/provider/BUILD
@@ -0,0 +1,22 @@
+load("@build_bazel_rules_android//android:rules.bzl", "android_library")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+    default_visibility = ["//services:__subpackages__"],
+)
+
+licenses(["notice"])
+
+# Content providers that provide read write or read only access to the SDCard.
+android_library(
+    name = "storage_content_providers",
+    srcs = glob(["*.java"]),
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//runner/monitor",
+        "//services/storage/java/androidx/test/services/storage:storage_service_pb_java_proto_lite",
+        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+        "//services/storage/java/androidx/test/services/storage/file",
+    ],
+)
diff --git a/services/storage/java/androidx/test/services/storage/provider/BUILD.bazel b/services/storage/java/androidx/test/services/storage/provider/BUILD.bazel
deleted file mode 100644
index 9ca76ee6c..000000000
--- a/services/storage/java/androidx/test/services/storage/provider/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-load("@build_bazel_rules_android//android:rules.bzl", "android_library")
-
-package(
-    default_visibility = ["//services:__subpackages__"],
-    features = ["-android_resources_strict_deps"],
-)
-
-licenses(["notice"])
-
-# Content providers that provide read write or read only access to the SDCard.
-android_library(
-    name = "storage_content_providers",
-    srcs = glob(["*.java"]),
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [
-        "//runner/monitor",
-        "//services/storage/java/androidx/test/services/storage:storage_service_pb_java_proto_lite",
-        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
-        "//services/storage/java/androidx/test/services/storage/file",
-        "@com_google_protobuf//:protobuf_javalite",
-    ],
-)
diff --git a/services/storage/java/androidx/test/services/storage/provider/ExportTestPropertiesContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/ExportTestPropertiesContentProvider.java
index 942d49f57..2b004d6ce 100644
--- a/services/storage/java/androidx/test/services/storage/provider/ExportTestPropertiesContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/ExportTestPropertiesContentProvider.java
@@ -20,9 +20,13 @@
 /** Hosts the properties file that are exported to the testing infrastructure for tests. */
 public final class ExportTestPropertiesContentProvider extends TestFileContentProvider {
 
-  public ExportTestPropertiesContentProvider() {
-    super(
-        TestStorageConstants.ON_DEVICE_PATH_TEST_PROPERTIES,
-        AbstractFileContentProvider.Access.READ_WRITE);
+  @Override
+  protected Access getAccess() {
+    return AbstractFileContentProvider.Access.READ_WRITE;
+  }
+
+  @Override
+  protected String getHostedRelativePath() {
+    return TestStorageConstants.ON_DEVICE_PATH_TEST_PROPERTIES;
   }
 }
diff --git a/services/storage/java/androidx/test/services/storage/provider/InternalUseOnlyFilesContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/InternalUseOnlyFilesContentProvider.java
index 0e29e8113..eab13bbb1 100644
--- a/services/storage/java/androidx/test/services/storage/provider/InternalUseOnlyFilesContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/InternalUseOnlyFilesContentProvider.java
@@ -15,42 +15,24 @@
  */
 package androidx.test.services.storage.provider;
 
-import android.os.Environment;
-import android.util.Log;
+import android.content.Context;
 import androidx.test.services.storage.TestStorageConstants;
+import androidx.test.services.storage.file.HostedFile;
 import java.io.File;
 
 /** Hosts an SD Card directory for the test framework to read/write internal files to. */
 public final class InternalUseOnlyFilesContentProvider extends AbstractFileContentProvider {
-  private static final String TAG = "InternalUseOnlyFilesContentProvider";
 
-  private final File outputDirectory;
-
-  public InternalUseOnlyFilesContentProvider() {
-    super(
-        new File(
-            Environment.getExternalStorageDirectory(),
-            TestStorageConstants.ON_DEVICE_PATH_INTERNAL_USE),
-        AbstractFileContentProvider.Access.READ_WRITE);
-    outputDirectory =
-        new File(
-            Environment.getExternalStorageDirectory(),
-            TestStorageConstants.ON_DEVICE_PATH_INTERNAL_USE);
+  @Override
+  protected File getHostedDirectory(Context context) {
+    // use input root directory here, as TestArgsContentProvider also uses this directory
+    return new File(
+        HostedFile.getInputRootDirectory(context),
+        TestStorageConstants.ON_DEVICE_PATH_INTERNAL_USE);
   }
 
   @Override
-  protected boolean onCreateHook() {
-    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-      Log.e(TAG, "sdcard in bad state: " + Environment.getExternalStorageState());
-      return false;
-    } else {
-      if (!outputDirectory.exists()) {
-        if (!outputDirectory.mkdirs()) {
-          Log.e(TAG, String.format("'%s': could not create output dir! ", outputDirectory));
-          return false;
-        }
-      }
-      return true;
-    }
+  protected Access getAccess() {
+    return AbstractFileContentProvider.Access.READ_WRITE;
   }
 }
diff --git a/services/storage/java/androidx/test/services/storage/provider/StorageContentProviderException.java b/services/storage/java/androidx/test/services/storage/provider/StorageContentProviderException.java
new file mode 100644
index 000000000..95888abfb
--- /dev/null
+++ b/services/storage/java/androidx/test/services/storage/provider/StorageContentProviderException.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package androidx.test.services.storage.provider;
+
+/** A runtime exception for errors that occurred in the test storage content provider. */
+public class StorageContentProviderException extends RuntimeException {
+
+  public StorageContentProviderException(String message) {
+    super(message);
+  }
+
+  public StorageContentProviderException(String message, Throwable t) {
+    super(message, t);
+  }
+}
diff --git a/services/storage/java/androidx/test/services/storage/provider/TestArgsContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/TestArgsContentProvider.java
index 1e0f17741..c3add1ad7 100644
--- a/services/storage/java/androidx/test/services/storage/provider/TestArgsContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/TestArgsContentProvider.java
@@ -19,20 +19,20 @@
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
+import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.net.Uri;
-import android.os.Environment;
 import android.util.Log;
 import androidx.test.services.storage.TestStorageConstants;
 import androidx.test.services.storage.TestStorageServiceProto.TestArgument;
 import androidx.test.services.storage.TestStorageServiceProto.TestArguments;
+import androidx.test.services.storage.file.HostedFile;
 import androidx.test.services.storage.file.PropertyFile;
 import androidx.test.services.storage.file.PropertyFile.Authority;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
 import java.util.Map;
@@ -60,38 +60,6 @@ void setSystemPropertyClassNameForTest(String className) {
     this.systemPropertyClassName = className;
   }
 
-  private String getQemuHost() {
-    try {
-      if (null == getString) {
-        if (null == systemPropertyClassName) {
-          systemPropertyClassName = SYSTEM_PROPERTY_CLAZZ;
-        }
-
-        Class<?> clazz = Class.forName(systemPropertyClassName);
-        getString = clazz.getMethod(GET_METHOD, String.class, String.class);
-      }
-      return (String) getString.invoke(null, "qemu.host.hostname", "");
-    } catch (ClassNotFoundException cnfe) {
-      Log.w(TAG, "Couldn't access SysProps for qemu hostname.", cnfe);
-      return "";
-    } catch (SecurityException se) {
-      Log.w(TAG, "Couldn't access SysProps for qemu hostname.", se);
-      return "";
-    } catch (NoSuchMethodException nsme) {
-      Log.w(TAG, "Couldn't access SysProps for qemu hostname.", nsme);
-      return "";
-    } catch (InvocationTargetException ite) {
-      Log.w(TAG, "Couldn't access SysProps for qemu hostname.", ite);
-      return "";
-    } catch (IllegalAccessException iae) {
-      Log.w(TAG, "Couldn't access SysProps for qemu hostname.", iae);
-      return "";
-    } catch (IllegalArgumentException iae) {
-      Log.w(TAG, "Couldn't access SysProps for qemu hostname.", iae);
-      return "";
-    }
-  }
-
   @Override
   public int delete(Uri arg0, String arg1, String[] arg2) {
     // Not allowed.
@@ -140,44 +108,28 @@ public Cursor query(
   }
 
   private Map<String, String> buildArgMapFromFile() {
-    Map<String, String> cleanArgMap = new HashMap<>();
-    Map<String, String> qemuArgMap = new HashMap<>();
-    String qemuHost = getQemuHost();
+    Map<String, String> argMap = new HashMap<>();
 
-    for (TestArgument testArg : readProtoFromFile().getArgList()) {
+    for (TestArgument testArg : readProtoFromFile(this.getContext()).getArgList()) {
       String key = testArg.getName();
       String val = testArg.getValue();
-      cleanArgMap.put(key, val);
-
-      if (!"".equals(qemuHost) && key.endsWith(ANDROID_TEST_SERVER_SPEC_FORMAT)) {
-        String serverHost = val.split(":")[0];
-        if (serverHost.startsWith(qemuHost)) {
-          // TODO: remove startswith check once the emulator launcher passes in FQDN.
-          // val.replace(qemuHost, "10.0.2.2");
-          // b/c the system property should be a FQDN (just like the test args are FQDN)
-          val = val.replace(serverHost, "10.0.2.2");
-        }
-      }
-      qemuArgMap.put(key, val);
-    }
-    if ("true"
-        .equalsIgnoreCase(cleanArgMap.get(TestStorageConstants.USE_QEMU_IPS_IF_POSSIBLE_ARG_TAG))) {
-      return qemuArgMap;
-    } else {
-      return cleanArgMap;
+      argMap.put(key, val);
     }
+    return argMap;
   }
 
-  private static TestArguments readProtoFromFile() {
+  private static TestArguments readProtoFromFile(Context context) {
     File testArgsFile =
         new File(
-            Environment.getExternalStorageDirectory(),
+            HostedFile.getInputRootDirectory(context),
             TestStorageConstants.ON_DEVICE_PATH_INTERNAL_USE
                 + TestStorageConstants.TEST_ARGS_FILE_NAME);
     if (!testArgsFile.exists()) {
+      Log.i(TAG, "Test args file not found at " + testArgsFile.getAbsolutePath());
       return TestArguments.getDefaultInstance();
     }
     try {
+      Log.i(TAG, "Parsing test args from " + testArgsFile.getAbsolutePath());
       return TestArguments.parseFrom(new FileInputStream(testArgsFile));
     } catch (IOException e) {
       throw new RuntimeException("Not able to read from file: " + testArgsFile.getName(), e);
diff --git a/services/storage/java/androidx/test/services/storage/provider/TestDataContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/TestDataContentProvider.java
index 3c603e4cf..73c7b5284 100644
--- a/services/storage/java/androidx/test/services/storage/provider/TestDataContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/TestDataContentProvider.java
@@ -15,30 +15,22 @@
  */
 package androidx.test.services.storage.provider;
 
-import android.os.Environment;
-import android.util.Log;
+import android.content.Context;
 import androidx.test.services.storage.TestStorageConstants;
+import androidx.test.services.storage.file.HostedFile;
 import java.io.File;
 
 /** Provides access to files in the test data section. */
 public final class TestDataContentProvider extends AbstractFileContentProvider {
-  private static final String TAG = TestDataContentProvider.class.getSimpleName();
 
-  public TestDataContentProvider() {
-    super(
-        new File(
-            Environment.getExternalStorageDirectory(),
-            TestStorageConstants.ON_DEVICE_TEST_RUNFILES),
-        AbstractFileContentProvider.Access.READ_ONLY);
+  @Override
+  protected File getHostedDirectory(Context context) {
+    return new File(
+        HostedFile.getInputRootDirectory(context), TestStorageConstants.ON_DEVICE_TEST_RUNFILES);
   }
 
   @Override
-  protected boolean onCreateHook() {
-    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-      Log.e(TAG, "sdcard in bad state: " + Environment.getExternalStorageState());
-      return false;
-    } else {
-      return true;
-    }
+  protected Access getAccess() {
+    return Access.READ_ONLY;
   }
 }
diff --git a/services/storage/java/androidx/test/services/storage/provider/TestDiagnosticsContentProvider.kt b/services/storage/java/androidx/test/services/storage/provider/TestDiagnosticsContentProvider.kt
deleted file mode 100644
index a2e01099f..000000000
--- a/services/storage/java/androidx/test/services/storage/provider/TestDiagnosticsContentProvider.kt
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.services.storage.provider
-
-import android.content.ContentProvider
-import android.content.ContentValues
-import android.database.Cursor
-import android.net.Uri
-import android.os.Environment
-import android.util.Log
-import androidx.test.services.storage.TestStorageConstants
-import androidx.test.services.storage.TestStorageServiceProto.TestArguments
-import com.google.testing.platform.android.core.orchestration.strategy.GrpcDiagnosticsOrchestrationStrategy
-import com.google.testing.platform.core.telemetry.android.opencensus.exporter.SpanDataWrapper
-import com.google.testing.platform.core.telemetry.opencensus.TraceProtoUtils
-import com.google.testing.platform.lib.coroutines.scope.JobScope
-import com.google.testing.platform.proto.api.android.DiagnosticEventProto
-import io.grpc.android.AndroidChannelBuilder
-import io.opencensus.trace.export.SpanData
-import java.io.ByteArrayInputStream
-import java.io.File
-import java.io.FileInputStream
-import java.io.IOException
-import java.io.ObjectInputStream
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.runBlocking
-
-/**
- * Enables streaming of diagnostics events by different applications on the device to a GRPC
- * server. Diagnostic events from different android applications emitted by [https://opencensus.io/]
- * use the [TestDiagnosticsContentProvider] as a single entry point to stream these messages off
- * the device.
- *
- * This provider supports only the insert api. Use [SpanDataWrapper] to bundle your [SpanData]
- * into [ContentValues] and insert it by calling
- * [contentResolver#insert(CONTENT_URI, contentValues)].
- */
-class TestDiagnosticsContentProvider : ContentProvider() {
-
-  private var serverPort: Lazy<String> = lazy { getServerPortFromTestArgs().toString() }
-  private lateinit var grpcDiagnosticsOrchestrationStrategy: GrpcDiagnosticsOrchestrationStrategy
-  private lateinit var serverJob: Job
-
-  companion object {
-    private const val INVALID_SERVER_PORT = -1
-    private const val PORT_ZERO = 0
-    private const val DEFAULT_SERVER_PORT = 64676
-    private const val TAG = "DiagnosticsCP"
-    private const val DIAGNOSTIC_SERVER_PORT_ARG = "diagnosticsServerPort"
-
-    /**
-     * Reads the [DIAGNOSTIC_SERVER_PORT_ARG] from the [TestArguments] proto present in the device
-     * and returns the appropriate port.
-     *
-     * @return [DEFAULT_SERVER_PORT] if [PORT_ZERO] is found in [TestArguments], if
-     * [DIAGNOSTIC_SERVER_PORT_ARG] is not set we return an [INVALID_SERVER_PORT].
-     */
-    private fun getServerPortFromTestArgs(): Int {
-      val testArgsFile = File(
-        Environment.getExternalStorageDirectory(),
-        TestStorageConstants.ON_DEVICE_PATH_INTERNAL_USE + TestStorageConstants.TEST_ARGS_FILE_NAME
-      )
-      if (!testArgsFile.exists()) {
-        return INVALID_SERVER_PORT
-      }
-      try {
-        val testArgs = TestArguments.parseFrom(FileInputStream(testArgsFile))
-
-        var serverPort: String? = testArgs.argList.find {
-          it.name == DIAGNOSTIC_SERVER_PORT_ARG
-        }?.value
-
-        // If we receive [PORT_ZERO], use the invalid port instead
-        serverPort?.let {
-          if (it == PORT_ZERO.toString()) {
-            INVALID_SERVER_PORT.toString()
-          } else {
-            serverPort
-          }
-        }
-
-        // If we receive no port, set it to the default port
-        serverPort = serverPort ?: DEFAULT_SERVER_PORT.toString()
-        return serverPort.toInt()
-      } catch (e: IOException) {
-        throw RuntimeException("Not able to read from file: " + testArgsFile.name, e)
-      }
-    }
-  }
-
-  override fun onCreate(): Boolean {
-    return false
-  }
-
-  override fun query(
-    uri: Uri,
-    strings: Array<String>?,
-    s: String?,
-    strings1: Array<String>?,
-    s1: String?
-  ): Cursor? {
-    return null
-  }
-
-  override fun getType(uri: Uri): String? {
-    return null
-  }
-
-  /**
-   * On receiving an `insert` request the content provider connects to the GRPC server
-   * using the [serverPort]. The [Span] proto is built from [SpanData] obtained from
-   * [ContentValues].
-   */
-  override fun insert(uri: Uri, contentValues: ContentValues?): Uri? {
-    if (contentValues!!.containsKey("FINISH")) {
-      if (::grpcDiagnosticsOrchestrationStrategy.isInitialized) {
-        grpcDiagnosticsOrchestrationStrategy.diagnosticsEvents.close()
-        runBlocking { serverJob.join() }
-      }
-      Log.i(TAG, "GRPC Channel closed by TestDiagnosticsContentProvider")
-      return null
-    }
-
-    ByteArrayInputStream(contentValues!!.getAsByteArray("span")).use {
-      ObjectInputStream(it).use { ois ->
-        val receivedSpans = SpanDataWrapper.readObject(ois)
-        Log.i(TAG, "Received diagnostics events")
-
-        if (!serverPort.isInitialized()) {
-          try {
-            connectToAtpServer()
-          } catch (e: Exception) {
-            Log.w(TAG, "Connecting to the diagnostics service resulted in an error: $e")
-            return null
-          }
-        }
-        sendDiagnosticsEvents(receivedSpans)
-      }
-    }
-    return null
-  }
-
-  override fun delete(uri: Uri, s: String?, strings: Array<String>?): Int {
-    return 0
-  }
-
-  override fun update(
-    uri: Uri,
-    contentValues: ContentValues?,
-    s: String?,
-    strings: Array<String>?
-  ): Int {
-    return 0
-  }
-
-  /**
-   * Connects to the GRPC server running the diagnostics service.
-   */
-  private fun connectToAtpServer() {
-    if (serverPort.value.toInt() == INVALID_SERVER_PORT) {
-      Log.i(TAG, "Invalid server port, will not connect to the diagnostics server!")
-      return
-    }
-    grpcDiagnosticsOrchestrationStrategy = GrpcDiagnosticsOrchestrationStrategy(
-      JobScope(Dispatchers.Default)
-    ) { target ->
-      AndroidChannelBuilder.forTarget(target).context(context)
-    }
-    serverJob = grpcDiagnosticsOrchestrationStrategy.start(serverPort.value.toInt())
-    Log.i(TAG, "Connected to server on port : ${serverPort.value.toInt()}")
-  }
-
-  /**
-   * Sends the diagnostics event to the GRPC service.
-   */
-  private fun sendDiagnosticsEvents(spans: List<SpanData>) {
-    if (serverPort.value.toInt() == INVALID_SERVER_PORT) {
-      Log.i(TAG, "Invalid server port, dropping diagnostic event!")
-      return
-    }
-    val diagnosticsEvent = DiagnosticEventProto.DiagnosticEvent.newBuilder().addAllSpans(
-      spans.map { TraceProtoUtils.toSpanProto(it) }
-    ).build()
-
-    try {
-      runBlocking {
-        grpcDiagnosticsOrchestrationStrategy.diagnosticsEvents.send(diagnosticsEvent)
-      }
-    } catch (e: Exception) {
-      Log.w(TAG, "Sending events to the diagnostics service resulted in an error: $e")
-    }
-  }
-}
diff --git a/services/storage/java/androidx/test/services/storage/provider/TestFileContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/TestFileContentProvider.java
index 3dd92ccf6..a4da2efad 100644
--- a/services/storage/java/androidx/test/services/storage/provider/TestFileContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/TestFileContentProvider.java
@@ -15,36 +15,19 @@
  */
 package androidx.test.services.storage.provider;
 
-import android.os.Environment;
-import android.util.Log;
+import android.content.Context;
+import androidx.test.services.storage.file.HostedFile;
 import java.io.File;
 
 /**
  * Content Provider that allows access to reading/writing files that were written to disk for tests.
  */
 abstract class TestFileContentProvider extends AbstractFileContentProvider {
-  private static final String TAG = TestFileContentProvider.class.getSimpleName();
 
-  private final File outputDirectory;
-
-  public TestFileContentProvider(String filePath, AbstractFileContentProvider.Access access) {
-    super(new File(Environment.getExternalStorageDirectory(), filePath), access);
-    outputDirectory = new File(Environment.getExternalStorageDirectory(), filePath);
-  }
+  protected abstract String getHostedRelativePath();
 
   @Override
-  protected boolean onCreateHook() {
-    if (!Environment.getExternalStorageState().equals(Environment.MEDIA_MOUNTED)) {
-      Log.e(TAG, "sdcard in bad state: " + Environment.getExternalStorageState());
-      return false;
-    } else {
-      if (!outputDirectory.exists()) {
-        if (!outputDirectory.mkdirs()) {
-          Log.e(TAG, String.format("'%s': could not create output dir! ", outputDirectory));
-          return false;
-        }
-      }
-      return true;
-    }
+  protected final File getHostedDirectory(Context context) {
+    return new File(HostedFile.getOutputRootDirectory(context), getHostedRelativePath());
   }
 }
diff --git a/services/storage/java/androidx/test/services/storage/provider/TestOutputFilesContentProvider.java b/services/storage/java/androidx/test/services/storage/provider/TestOutputFilesContentProvider.java
index 642917c4c..764fb9d61 100644
--- a/services/storage/java/androidx/test/services/storage/provider/TestOutputFilesContentProvider.java
+++ b/services/storage/java/androidx/test/services/storage/provider/TestOutputFilesContentProvider.java
@@ -20,9 +20,13 @@
 /** Hosts the output directory for tests. */
 public final class TestOutputFilesContentProvider extends TestFileContentProvider {
 
-  public TestOutputFilesContentProvider() {
-    super(
-        TestStorageConstants.ON_DEVICE_PATH_TEST_OUTPUT,
-        AbstractFileContentProvider.Access.READ_WRITE);
+  @Override
+  protected Access getAccess() {
+    return AbstractFileContentProvider.Access.READ_WRITE;
+  }
+
+  @Override
+  protected String getHostedRelativePath() {
+    return TestStorageConstants.ON_DEVICE_PATH_TEST_OUTPUT;
   }
 }
diff --git a/services/storage/javatests/androidx/test/services/storage/AndroidManifest.xml b/services/storage/javatests/androidx/test/services/storage/AndroidManifest.xml
deleted file mode 100644
index 39255a676..000000000
--- a/services/storage/javatests/androidx/test/services/storage/AndroidManifest.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.storage.tests">
-
-  <uses-sdk
-      android:minSdkVersion="15"
-      android:targetSdkVersion="29" />
-
-  <application android:requestLegacyExternalStorage="true">
-    <uses-library android:name="android.test.runner" />
-  </application>
-
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="androidx.test.services.storage.testapp" />
-</manifest>
diff --git a/services/storage/javatests/androidx/test/services/storage/AndroidManifest_opensource.xml b/services/storage/javatests/androidx/test/services/storage/AndroidManifest_opensource.xml
deleted file mode 100644
index 58d1e6f26..000000000
--- a/services/storage/javatests/androidx/test/services/storage/AndroidManifest_opensource.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.storage.tests">
-
-  <uses-sdk
-      android:minSdkVersion="15"
-      android:targetSdkVersion="29" />
-
-  <application>
-    <uses-library android:name="android.test.runner" />
-  </application>
-
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
-  <instrumentation
-      android:name="androidx.test.runner.AndroidJUnitRunner"
-      android:targetPackage="androidx.test.services.storage.testapp" />
-</manifest>
diff --git a/services/storage/javatests/androidx/test/services/storage/BUILD b/services/storage/javatests/androidx/test/services/storage/BUILD
new file mode 100644
index 000000000..c2f312d10
--- /dev/null
+++ b/services/storage/javatests/androidx/test/services/storage/BUILD
@@ -0,0 +1,39 @@
+# Description:
+#   Tests for the test storage.
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load("//build_extensions:phone_devices.bzl", "apis", "devices")
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "TestStorageTest",
+    size = "large",
+    srcs = [
+        "TestStorageTest.java",
+    ],
+    args = [
+        "--install_test_services=true",
+        "--test_args=arg1=value1,arg2=value2,arg3=value3",
+    ],
+    data = [
+        ":testinput.txt",
+    ],
+    device_list = devices(),
+    support_apps = [
+        "//services:test_services",
+    ],
+    deps = [
+        "//core/java/androidx/test/core",
+        "//runner/monitor/java/androidx/test:monitor",
+        "//services/storage/java/androidx/test/services/storage",
+        "//services/storage/java/androidx/test/services/storage/file",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/services/storage/javatests/androidx/test/services/storage/BUILD.bazel b/services/storage/javatests/androidx/test/services/storage/BUILD.bazel
deleted file mode 100644
index acff3ae33..000000000
--- a/services/storage/javatests/androidx/test/services/storage/BUILD.bazel
+++ /dev/null
@@ -1,72 +0,0 @@
-# Description:
-#   Tests for the test storage.
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_instrumentation_test", "android_library")
-
-licenses(["notice"])
-
-DEVICE_MODEL = [
-    "android_15_x86",
-    "android_16_x86",
-    "android_17_x86",
-    "android_19_x86",
-    "android_21_x86",
-    "android_23_x86",
-]
-
-android_library(
-    name = "dummy_app_lib",
-    testonly = 1,
-    srcs = ["testapp/DummyActivity.java"],
-    manifest = "testapp/AndroidManifest_stub.xml",
-)
-
-android_binary(
-    name = "dummy_app_binary",
-    testonly = 1,
-    manifest = "testapp/AndroidManifest_stub.xml",
-    deps = [
-        ":dummy_app_lib",
-    ],
-)
-
-android_library(
-    name = "test_lib",
-    testonly = 1,
-    srcs = [
-        "TestStorageTest.java",
-    ],
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [
-        ":dummy_app_lib",
-        "//core/java/androidx/test/core",
-        "//ext/junit",
-        "//runner/android_junit_runner",
-        "//services/storage/java/androidx/test/services/storage",
-        "//services/storage/java/androidx/test/services/storage/file",
-        "@androidsdk//:legacy_test-30",
-        "@maven//:com_google_guava_guava",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-android_binary(
-    name = "test_binary",
-    testonly = 1,
-    instruments = ":dummy_app_binary",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [
-        ":test_lib",
-    ],
-)
-
-[android_instrumentation_test(
-    name = "TestStorageTest_%s" % device_model,
-    size = "large",
-    args = [
-        "--clear_package_data",
-        "--install_test_services=True",
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:%s" % (device_model),
-    test_app = ":test_binary",
-) for device_model in DEVICE_MODEL]
diff --git a/services/storage/javatests/androidx/test/services/storage/TestStorageTest.java b/services/storage/javatests/androidx/test/services/storage/TestStorageTest.java
index 7809ddcab..66d7935f1 100644
--- a/services/storage/javatests/androidx/test/services/storage/TestStorageTest.java
+++ b/services/storage/javatests/androidx/test/services/storage/TestStorageTest.java
@@ -15,21 +15,20 @@
  */
 package androidx.test.services.storage;
 
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.TestCase.fail;
 import static org.junit.Assert.assertEquals;
 
 import android.net.Uri;
-import androidx.test.core.app.ActivityScenario;
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.services.storage.file.HostedFile;
 import androidx.test.services.storage.internal.TestStorageUtil;
-import androidx.test.services.storage.testapp.DummyActivity;
+import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
@@ -38,7 +37,6 @@
 import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.Map;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -51,9 +49,15 @@ public final class TestStorageTest {
 
   private final TestStorage testStorage = new TestStorage();
 
-  @Before
-  public void setUp() {
-    ActivityScenario.launch(DummyActivity.class);
+  @Test
+  public void readInputFile() throws IOException {
+    try (BufferedReader br =
+        new BufferedReader(
+            new InputStreamReader(
+                testStorage.openInputFile(
+                    "google3/third_party/android/androidx_test/services/storage/javatests/androidx/test/services/storage/testinput.txt")))) {
+      assertThat(br.readLine().trim()).isEqualTo("Hi I'm an input file");
+    }
   }
 
   @Test
@@ -92,8 +96,7 @@ public void addOutputProperties() throws Exception {
 
     Uri dataUri = HostedFile.buildUri(HostedFile.FileHost.EXPORT_PROPERTIES, "properties.dat");
     InputStream rawStream =
-        TestStorageUtil.getInputStream(
-            dataUri, getInstrumentation().getTargetContext().getContentResolver());
+        TestStorageUtil.getInputStream(dataUri, getApplicationContext().getContentResolver());
 
     ObjectInputStream in = null;
     try {
@@ -106,17 +109,35 @@ public void addOutputProperties() throws Exception {
   }
 
   @Test
-  public void readWriteInternalFile() throws IOException {
+  public void writeInternalFile() throws IOException {
     try (OutputStream output = testStorage.openInternalOutputFile("path/to/file")) {
       output.write(new byte[] {'h', 'e', 'l', 'l', 'o'});
     }
+  }
 
-    byte[] data = new byte[5];
-    try (InputStream input = testStorage.openInternalInputFile("path/to/file")) {
-      input.read(data);
+  @Test
+  public void readWriteOverwriteReadFile() throws IOException {
+    try (OutputStream output = testStorage.openOutputFile("path/to/file")) {
+      output.write(new byte[] {'h', 'e', 'l', 'l', 'o', '1', '2', '3'});
+    }
+
+    try (OutputStream output = testStorage.openOutputFile("path/to/file")) {
+      output.write(new byte[] {'w', 'o', 'r', 'l', 'd'}); // Strictly shorter
+    }
+
+    StringBuilder contents = new StringBuilder();
+    Uri outputFileUri = testStorage.getOutputFileUri("path/to/file");
+    try (InputStream input =
+        TestStorageUtil.getInputStream(
+            outputFileUri, getApplicationContext().getContentResolver())) {
+      int nextVal = input.read();
+      while (nextVal != -1) {
+        contents.append((char) nextVal);
+        nextVal = input.read();
+      }
     }
 
-    assertThat(new String(data, Charset.defaultCharset())).isEqualTo("hello");
+    assertThat(contents.toString()).isEqualTo("world");
   }
 
   @Test
@@ -130,11 +151,10 @@ public void writeFileInAppendMode() throws IOException {
     }
 
     byte[] data = new byte[11];
-    Uri outputFileUri = TestStorage.getOutputFileUri("path/to/file");
+    Uri outputFileUri = testStorage.getOutputFileUri("path/to/file");
     try (InputStream input =
         TestStorageUtil.getInputStream(
-            outputFileUri,
-            InstrumentationRegistry.getInstrumentation().getTargetContext().getContentResolver())) {
+            outputFileUri, getApplicationContext().getContentResolver())) {
       input.read(data);
     }
 
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml
index 098d49c22..251066e28 100644
--- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml
+++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest.xml
@@ -18,7 +18,7 @@
     package="androidx.test.services.storage.provider">
 
   <uses-sdk
-      android:minSdkVersion="15"
+      android:minSdkVersion="23"
       android:targetSdkVersion="29" />
 
   <application android:requestLegacyExternalStorage="true">
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
index 1b502f138..ae00e6baf 100644
--- a/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
+++ b/services/storage/javatests/androidx/test/services/storage/provider/AndroidManifest_opensource.xml
@@ -18,7 +18,7 @@
     package="androidx.test.services.storage.provider">
 
   <uses-sdk
-      android:minSdkVersion="15"
+      android:minSdkVersion="23"
       android:targetSdkVersion="29" />
 
   <application>
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/BUILD b/services/storage/javatests/androidx/test/services/storage/provider/BUILD
new file mode 100644
index 000000000..18d206983
--- /dev/null
+++ b/services/storage/javatests/androidx/test/services/storage/provider/BUILD
@@ -0,0 +1,56 @@
+# Description:
+#   Tests for the sdcard data content providers
+
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
+load(
+    "//build_extensions:phone_devices.bzl",
+    "devices",
+)
+
+package(
+    default_applicable_licenses = ["//services:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+axt_android_library_test(
+    name = "TestArgsContentProviderTest",
+    srcs = ["TestArgsContentProviderTest.java"],
+    args = [
+        "--install_test_services=True",
+    ],
+    device_list = devices(),
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/storage/java/androidx/test/services/storage:storage_service_pb_java_proto_lite",
+        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+        "//services/storage/java/androidx/test/services/storage/file",
+        "//services/storage/java/androidx/test/services/storage/provider:storage_content_providers",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+axt_android_library_test(
+    name = "TestFileContentProviderTest",
+    srcs = ["TestFileContentProviderTest.java"],
+    args = [
+        "--install_test_services=True",
+    ],
+    device_list = devices(),
+    manifest = "AndroidManifest.xml",
+    deps = [
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//services/storage/java/androidx/test/services/storage:storage_service_pb_java_proto_lite",
+        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
+        "//services/storage/java/androidx/test/services/storage/file",
+        "//services/storage/java/androidx/test/services/storage/provider:storage_content_providers",
+        "@androidsdk//:legacy_test-36",
+        "@maven//:com_google_guava_guava",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/BUILD.bazel b/services/storage/javatests/androidx/test/services/storage/provider/BUILD.bazel
deleted file mode 100644
index dc3f5291b..000000000
--- a/services/storage/javatests/androidx/test/services/storage/provider/BUILD.bazel
+++ /dev/null
@@ -1,55 +0,0 @@
-# Description:
-#   Tests for the sdcard data content providers
-load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_instrumentation_test", "android_library")
-
-licenses(["notice"])
-
-API_LEVELS = [
-    "android_15_x86",
-    "android_16_x86",
-    "android_17_x86",
-    "android_19_x86",
-    "android_21_x86",
-    "android_22_x86",
-    "android_23_x86",
-]
-
-android_library(
-    name = "storage_test_lib",
-    testonly = 1,
-    srcs = glob(["*.java"]),
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [
-        "//runner/android_junit_runner",
-        "//services/storage/java/androidx/test/services/storage:storage_service_pb_java_proto_lite",
-        "//services/storage/java/androidx/test/services/storage:test_storage_constants",
-        "//services/storage/java/androidx/test/services/storage/file",
-        "//services/storage/java/androidx/test/services/storage/provider:storage_content_providers",
-        "@androidsdk//:legacy_test-30",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_binary(
-    name = "storage_binary",
-    testonly = 1,
-    manifest = "AndroidManifest_stub.xml",
-)
-
-android_binary(
-    name = "storage_test_binary",
-    testonly = 1,
-    instruments = ":storage_binary",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":storage_test_lib"],
-)
-
-[android_instrumentation_test(
-    name = "storage_provider_test_%s" % api_level,
-    size = "large",
-    args = [
-        "--install_test_services=True",
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:%s" % (api_level),
-    test_app = ":storage_test_binary",
-) for api_level in API_LEVELS]
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/TestArgsContentProviderTest.java b/services/storage/javatests/androidx/test/services/storage/provider/TestArgsContentProviderTest.java
index 88dd1c802..70cb7e78e 100644
--- a/services/storage/javatests/androidx/test/services/storage/provider/TestArgsContentProviderTest.java
+++ b/services/storage/javatests/androidx/test/services/storage/provider/TestArgsContentProviderTest.java
@@ -115,36 +115,6 @@ public void testEmptyArgsDataFile() throws IOException {
     cursor.close();
   }
 
-  public void testServerSpecOverride_behavesWellWhenNotSet() throws IOException {
-    String localhost = "fake.machine.company.com";
-    FakeSystemProperties.props.put("qemu.host.hostname", "");
-    createTestArgsFile(makeSomeServerSpecArgs(localhost));
-
-    Uri uri = PropertyFile.buildUri(PropertyFile.Authority.TEST_ARGS);
-    Cursor cursor = getMockContentResolver().query(uri, null, null, null, null);
-    Map<String, String> argMap = getProperties(cursor);
-
-    assertEquals(localhost + ":12345", argMap.get("local_server_address"));
-    assertEquals(localhost + ":984", argMap.get("local_2_server_address"));
-    assertEquals("www.google.com:80", argMap.get("non_local_server_address"));
-    assertEquals("fake.machine.company.com:100", argMap.get("val_is_a_spec_but_not_key"));
-  }
-
-  public void testServerSpecOverride() throws IOException {
-    String localhost = "fake.machine.company.com";
-    FakeSystemProperties.props.put("qemu.host.hostname", localhost);
-    createTestArgsFile(makeSomeServerSpecArgs(localhost));
-
-    Uri uri = PropertyFile.buildUri(PropertyFile.Authority.TEST_ARGS);
-    Cursor cursor = getMockContentResolver().query(uri, null, null, null, null);
-    Map<String, String> argMap = getProperties(cursor);
-
-    assertEquals("10.0.2.2:12345", argMap.get("local_server_address"));
-    assertEquals("10.0.2.2:984", argMap.get("local_2_server_address"));
-    assertEquals("www.google.com:80", argMap.get("non_local_server_address"));
-    assertEquals("fake.machine.company.com:100", argMap.get("val_is_a_spec_but_not_key"));
-  }
-
   static class FakeSystemProperties {
     private static final Map<String, String> props =
         Collections.synchronizedMap(new HashMap<String, String>());
@@ -176,11 +146,6 @@ private static TestArguments makeSomeServerSpecArgs(String localhost) {
                 .setName("val_is_a_spec_but_not_key")
                 .setValue(localhost + ":100")
                 .build())
-        .addArg(
-            TestArgument.newBuilder()
-                .setName(TestStorageConstants.USE_QEMU_IPS_IF_POSSIBLE_ARG_TAG)
-                .setValue(String.valueOf(true))
-                .build())
         .build();
   }
 
diff --git a/services/storage/javatests/androidx/test/services/storage/provider/TestFileContentProviderTest.java b/services/storage/javatests/androidx/test/services/storage/provider/TestFileContentProviderTest.java
index d49a8afb0..e2c7dcc68 100644
--- a/services/storage/javatests/androidx/test/services/storage/provider/TestFileContentProviderTest.java
+++ b/services/storage/javatests/androidx/test/services/storage/provider/TestFileContentProviderTest.java
@@ -15,7 +15,10 @@
  */
 package androidx.test.services.storage.provider;
 
+import static org.junit.Assert.assertThrows;
+
 import android.content.ContentResolver;
+import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -24,7 +27,6 @@
 import android.test.suitebuilder.annotation.Suppress;
 import androidx.test.services.storage.file.HostedFile;
 import androidx.test.services.storage.provider.AbstractFileContentProvider.Access;
-import com.google.common.base.Charsets;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
@@ -37,13 +39,14 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.List;
 
 /**
  * Unit tests for {@link TestFileContentProvider}.
  *
- * TODO(b/145236542): Converts the tests to JUnit4.
+ * <p>TODO(b/145236542): Converts the tests to JUnit4.
  */
 public class TestFileContentProviderTest
     extends ProviderTestCase2<TestFileContentProviderTest.TestFileContentProvider> {
@@ -68,7 +71,7 @@ public TestFileContentProviderTest() {
   @Override
   public void setUp() throws Exception {
     hostedDirectory = new File(Environment.getExternalStorageDirectory(), "fcp_test/" + getName());
-    hostedDirectory.getParentFile().mkdirs();
+    hostedDirectory.mkdirs();
     access = Access.READ_ONLY;
     super.setUp();
     initResolver();
@@ -81,20 +84,20 @@ private Uri makeUri(String path) {
   public void testReadFile() throws Exception {
     File testFile = new File(hostedDirectory, "test-data.txt");
     assertTrue("Couldnt create test file.", testFile.createNewFile());
-    write("hello world", testFile, Charsets.UTF_8);
+    write("hello world", testFile, StandardCharsets.UTF_8);
     ParcelFileDescriptor providerFile = resolver.openFileDescriptor(makeUri("test-data.txt"), "r");
-    String contents = read(providerFile, Charsets.UTF_8);
+    String contents = read(providerFile, StandardCharsets.UTF_8);
     assertEquals("Unexpected file contents!", "hello world", contents);
   }
 
   public void testReadFile_WithNameThatNeedsEncoding() throws Exception {
     File testFile = new File(hostedDirectory, "oh wow & aren't modern day file-systems [SO] great");
     assertTrue("Couldnt create test file.", testFile.createNewFile());
-    write("8 ascii chars and a 3 letter extension", testFile, Charsets.UTF_8);
+    write("8 ascii chars and a 3 letter extension", testFile, StandardCharsets.UTF_8);
     ParcelFileDescriptor providerFile =
         resolver.openFileDescriptor(
             makeUri("oh wow & aren't modern day file-systems [SO] great"), "r");
-    String contents = read(providerFile, Charsets.UTF_8);
+    String contents = read(providerFile, StandardCharsets.UTF_8);
     assertEquals("Unexpected file contents!", "8 ascii chars and a 3 letter extension", contents);
   }
 
@@ -125,10 +128,10 @@ public void testWrite_FileInExistingDirectory() throws Exception {
     write(
         "hello world",
         new ParcelFileDescriptor.AutoCloseOutputStream(providerFile),
-        Charsets.UTF_8);
+        StandardCharsets.UTF_8);
     File expectedFile = new File(hostedDirectory, "test-data.txt");
     assertTrue("file not in expected place.", expectedFile.exists());
-    String fileContent = read(expectedFile, Charsets.UTF_8);
+    String fileContent = read(expectedFile, StandardCharsets.UTF_8);
     assertEquals("contents unexpected", "hello world", fileContent);
   }
 
@@ -141,11 +144,11 @@ public void testWriteFile_WithNameThatNeedsEncoding() throws Exception {
     write(
         "hello world",
         new ParcelFileDescriptor.AutoCloseOutputStream(providerFile),
-        Charsets.UTF_8);
+        StandardCharsets.UTF_8);
     File expectedFile =
         new File(hostedDirectory, "oh wow & aren't modern day file-systems [SO] great");
     assertTrue("file not in expected place.", expectedFile.exists());
-    String fileContent = read(expectedFile, Charsets.UTF_8);
+    String fileContent = read(expectedFile, StandardCharsets.UTF_8);
     assertEquals("contents unexpected", "hello world", fileContent);
   }
 
@@ -157,10 +160,10 @@ public void testWrite_FileInNewDirectory() throws Exception {
     write(
         "hello world",
         new ParcelFileDescriptor.AutoCloseOutputStream(providerFile),
-        Charsets.UTF_8);
+        StandardCharsets.UTF_8);
     File expectedFile = new File(hostedDirectory, "subdir/test-data.txt");
     assertTrue("file not in expected place.", expectedFile.exists());
-    String fileContent = read(expectedFile, Charsets.UTF_8);
+    String fileContent = read(expectedFile, StandardCharsets.UTF_8);
     assertEquals("contents unexpected", "hello world", fileContent);
   }
 
@@ -172,10 +175,10 @@ public void testWrite_RelativePath() throws Exception {
     write(
         "hello world",
         new ParcelFileDescriptor.AutoCloseOutputStream(providerFile),
-        Charsets.UTF_8);
+        StandardCharsets.UTF_8);
     File expectedFile = new File(hostedDirectory, "test-data.txt");
     assertTrue("file not in expected place.", expectedFile.exists());
-    String fileContent = read(expectedFile, Charsets.UTF_8);
+    String fileContent = read(expectedFile, StandardCharsets.UTF_8);
     assertEquals("contents unexpected", "hello world", fileContent);
   }
 
@@ -197,7 +200,7 @@ public void testRead_OutsideHostedDirectory() throws Exception {
     hostedDirectory = new File(hostedDirectory, "resolver_dir");
     hostedDirectory.mkdirs();
     initResolver();
-    write("secrets", new File(hostedDirectory.getParent(), "secret.dat"), Charsets.UTF_8);
+    write("secrets", new File(hostedDirectory.getParent(), "secret.dat"), StandardCharsets.UTF_8);
     try {
       resolver.openFileDescriptor(makeUri("../secrets.dat"), "w");
       fail("shouldnt be able to write outside of hosted directory.");
@@ -213,16 +216,44 @@ public void testReadAndWrite() throws Exception {
     write(
         "hello world",
         new ParcelFileDescriptor.AutoCloseOutputStream(providerFile),
-        Charsets.UTF_8);
+        StandardCharsets.UTF_8);
     ParcelFileDescriptor readInFile = resolver.openFileDescriptor(makeUri("test-data.txt"), "r");
-    String fileContent = read(readInFile, Charsets.UTF_8);
+    String fileContent = read(readInFile, StandardCharsets.UTF_8);
     assertEquals("cannot read content back", "hello world", fileContent);
   }
 
+  public void testDelete_deleteIndividualFile() {
+    StorageContentProviderException ex =
+        assertThrows(
+            StorageContentProviderException.class,
+            () -> resolver.delete(makeUri("test-data.txt"), null, null));
+    assertEquals(
+        "Runtime exception expected",
+        "Deleting file/directory other than the entire hosted directory is not supported!",
+        ex.getMessage());
+  }
+
+  public void testDelete_deleteHostedDirectory() throws IOException {
+    // Prepare test files
+    File testFile = new File(hostedDirectory, "test-data.txt");
+    testFile.createNewFile();
+    File testDirectory = new File(hostedDirectory, "test-dir");
+    testDirectory.mkdirs();
+    File testFile2 = new File(testDirectory.getAbsolutePath(), "test-data-2.txt");
+    testFile2.createNewFile();
+
+    resolver.delete(makeUri("/"), null, null);
+
+    assertTrue("The root hosted directory should be preserved.", hostedDirectory.exists());
+    assertTrue(
+        "All the files under the hosted directory should be deleted.",
+        hostedDirectory.list().length == 0);
+  }
+
   @Suppress
   public void testQueryDirectory() throws Exception {
-    write("file1 contents", new File(hostedDirectory, "file1.txt"), Charsets.UTF_8);
-    write("brown cow", new File(hostedDirectory, "file2.txt"), Charsets.UTF_8);
+    write("file1 contents", new File(hostedDirectory, "file1.txt"), StandardCharsets.UTF_8);
+    write("brown cow", new File(hostedDirectory, "file2.txt"), StandardCharsets.UTF_8);
     new File(hostedDirectory, "subdir").mkdirs();
 
     Cursor cursor =
@@ -254,13 +285,12 @@ private <T> void assertContents(Collection<T> collection, T... expectedItems) {
     for (T item : expectedItems) {
       assertTrue("missing: " + item + " from " + collection, collection.contains(item));
     }
-    assertEquals(
-        "size mismatch: " + collection, expectedItems.length, collection.size());
+    assertEquals("size mismatch: " + collection, expectedItems.length, collection.size());
   }
 
   @Suppress
   public void testQueryFile() throws Exception {
-    write("file1 contents", new File(hostedDirectory, "file1.txt"), Charsets.UTF_8);
+    write("file1 contents", new File(hostedDirectory, "file1.txt"), StandardCharsets.UTF_8);
     Cursor cursor =
         resolver.query(
             makeUri("file1.txt"),
@@ -276,7 +306,7 @@ public void testQueryFile() throws Exception {
       assertEquals("file1.txt", cursor.getString(nameIndex));
       assertEquals(
           HostedFile.FileType.FILE, HostedFile.FileType.fromTypeCode(cursor.getString(typeIndex)));
-      assertEquals("file1 contents".length(), cursor.getString(sizeIndex));
+      assertEquals("file1 contents", cursor.getString(sizeIndex));
     } finally {
       cursor.close();
     }
@@ -346,16 +376,15 @@ private void initResolver() throws Exception {
   }
 
   public static class TestFileContentProvider extends AbstractFileContentProvider {
-    private final Predicate<Void> onCreateHookResult;
 
-    public TestFileContentProvider() {
-      super(resolverHostedDirectory, resolverAccess);
-      this.onCreateHookResult = resolverOnCreateHookResult;
+    @Override
+    protected File getHostedDirectory(Context context) {
+      return resolverHostedDirectory;
     }
 
     @Override
-    public boolean onCreateHook() {
-      return onCreateHookResult.apply(null);
+    protected Access getAccess() {
+      return resolverAccess;
     }
   }
 }
diff --git a/services/storage/javatests/androidx/test/services/storage/testapp/AndroidManifest_stub.xml b/services/storage/javatests/androidx/test/services/storage/testapp/AndroidManifest_stub.xml
deleted file mode 100644
index 250ff4b21..000000000
--- a/services/storage/javatests/androidx/test/services/storage/testapp/AndroidManifest_stub.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2019 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.services.storage.testapp">
-
-  <application>
-    <activity android:name=".DummyActivity">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-  </application>
-
-  <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="29" />
-</manifest>
\ No newline at end of file
diff --git a/services/storage/javatests/androidx/test/services/storage/testapp/DummyActivity.java b/services/storage/javatests/androidx/test/services/storage/testapp/DummyActivity.java
deleted file mode 100644
index 19818ed48..000000000
--- a/services/storage/javatests/androidx/test/services/storage/testapp/DummyActivity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package androidx.test.services.storage.testapp;
-
-import android.app.Activity;
-
-/** A dummy activity for testing. */
-public class DummyActivity extends Activity {
-  /** just need this for some test methods. */
-}
diff --git a/services/storage/javatests/androidx/test/services/storage/testinput.txt b/services/storage/javatests/androidx/test/services/storage/testinput.txt
new file mode 100644
index 000000000..aabb3091d
--- /dev/null
+++ b/services/storage/javatests/androidx/test/services/storage/testinput.txt
@@ -0,0 +1 @@
+Hi I'm an input file
\ No newline at end of file
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml
new file mode 100644
index 000000000..ba202baa4
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+          tools:overrideLibrary="androidx.test.foldable.app.tests"
+    package="androidx.test.foldable.app">
+
+  <uses-sdk
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34"/>
+
+  <uses-permission android:name="android.permission.CALL_PHONE"/>
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <!-- Runtime permission APIs -->
+  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+  <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+  <application
+      android:allowBackup="true"
+      android:icon="@drawable/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true"
+      android:taskAffinity="">
+     <activity
+        android:label="foldable activity"
+        android:name=".FoldableActivity"
+        android:exported="true">
+       <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+    <activity
+        android:label="foldable activity with config handling"
+        android:name=".FoldableActivityWithConfigHandling"
+        android:configChanges="orientation|screenSize|screenLayout"
+        android:exported="true">
+    </activity>
+  </application>
+
+</manifest>
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml
new file mode 100644
index 000000000..cc4510fd8
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/AndroidManifest_opensource.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+          tools:overrideLibrary="androidx.test.foldable.app.tests"
+    package="androidx.test.foldable.app">
+
+  <uses-sdk
+      android:minSdkVersion="23"
+      android:targetSdkVersion="33"/>
+
+    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <!-- Runtime permission APIs -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+
+  <application
+      android:allowBackup="true"
+      android:icon="@drawable/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true"
+      android:taskAffinity="">
+     <activity
+        android:label="foldable activity"
+        android:name=".FoldableActivity"
+        android:exported="true">
+       <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+    <activity
+        android:label="foldable activity with config handling"
+        android:name=".FoldableActivityWithConfigHandling"
+        android:configChanges="orientation|screenSize|screenLayout"
+        android:exported="true">
+    </activity>
+  </application>
+
+</manifest>
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD b/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD
new file mode 100644
index 000000000..eb1cae331
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/BUILD
@@ -0,0 +1,53 @@
+# -*- mode: python; -*-
+#
+# Description:
+#  Test App used for foldable testing API integration tests.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
+load("//build_extensions:jetify.bzl", "jetify_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//opensource/visibility:testing_pkg",
+    ],
+)
+
+jetify_android_library(
+    name = "lib",
+    srcs = glob(
+        ["**/*.java"],
+    ),
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "@maven//:androidx_appcompat_appcompat",
+        "@maven//:androidx_window_window",
+        "@maven//:androidx_window_window_java",
+    ],
+)
+
+android_library(
+    name = "lib_exported",
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    exports = [":lib"],
+)
+
+android_binary(
+    name = "testapp",
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        ":lib",
+        "//core:manifest",
+    ],
+)
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/FoldableActivity.java b/testapps/foldable_testapp/java/androidx/test/foldable/app/FoldableActivity.java
new file mode 100644
index 000000000..7f5f4e9b6
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/FoldableActivity.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.foldable.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
+import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
+import androidx.window.layout.WindowInfoTracker;
+import androidx.window.layout.WindowLayoutInfo;
+import java.util.concurrent.Executor;
+
+/** Activity that updates a TextView with its device mode when it is folded or unfolded. */
+public class FoldableActivity extends Activity {
+  private static final String TAG = "FoldableActivity";
+
+  @Nullable private WindowInfoTrackerCallbackAdapter windowInfoTracker;
+  private Consumer<WindowLayoutInfo> stateContainer;
+  private final Handler handler = new Handler(Looper.getMainLooper());
+  private final Executor executor = command -> handler.post(() -> handler.post(command));
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.foldable_activity);
+
+    stateContainer = new WindowLayoutInfoConsumer(findViewById(R.id.current_fold_mode));
+    windowInfoTracker = new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this));
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+    windowInfoTracker.addWindowLayoutInfoListener(this, executor, stateContainer);
+  }
+
+  @Override
+  public void onStop() {
+    super.onStop();
+    windowInfoTracker.removeWindowLayoutInfoListener(stateContainer);
+  }
+}
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/FoldableActivityWithConfigHandling.java b/testapps/foldable_testapp/java/androidx/test/foldable/app/FoldableActivityWithConfigHandling.java
new file mode 100644
index 000000000..94cb5b2a1
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/FoldableActivityWithConfigHandling.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.foldable.app;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.core.util.Consumer;
+import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
+import androidx.window.layout.WindowInfoTracker;
+import androidx.window.layout.WindowLayoutInfo;
+import java.util.concurrent.Executor;
+
+/** Activity that updates a TextView with its device mode when it is folded or unfolded. */
+public class FoldableActivityWithConfigHandling extends Activity {
+  private static final String TAG = "FoldableActivity";
+
+  @Nullable private WindowInfoTrackerCallbackAdapter windowInfoTracker;
+  private Consumer<WindowLayoutInfo> stateContainer;
+  private final Handler handler = new Handler(Looper.getMainLooper());
+  private final Executor executor = command -> handler.post(() -> handler.post(command));
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.foldable_activity_with_config_handling);
+
+    stateContainer = new WindowLayoutInfoConsumer(findViewById(R.id.current_fold_mode));
+    windowInfoTracker = new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this));
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+    windowInfoTracker.addWindowLayoutInfoListener(this, executor, stateContainer);
+  }
+
+  @Override
+  public void onStop() {
+    super.onStop();
+    windowInfoTracker.removeWindowLayoutInfoListener(stateContainer);
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    Log.d(TAG, "onConfigurationChanged.");
+  }
+}
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/WindowLayoutInfoConsumer.java b/testapps/foldable_testapp/java/androidx/test/foldable/app/WindowLayoutInfoConsumer.java
new file mode 100644
index 000000000..0588fc85c
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/WindowLayoutInfoConsumer.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.foldable.app;
+
+import android.widget.TextView;
+import androidx.core.util.Consumer;
+import androidx.window.layout.DisplayFeature;
+import androidx.window.layout.FoldingFeature;
+import androidx.window.layout.WindowLayoutInfo;
+import java.util.List;
+
+/** Consumer that updates the provided text view when the device mode is changed. */
+class WindowLayoutInfoConsumer implements Consumer<WindowLayoutInfo> {
+  private final TextView textView;
+
+  public WindowLayoutInfoConsumer(TextView textView) {
+    this.textView = textView;
+  }
+
+  @Override
+  public void accept(WindowLayoutInfo windowLayoutInfo) {
+    List<DisplayFeature> displayFeatures = windowLayoutInfo.getDisplayFeatures();
+    if (displayFeatures.isEmpty()) {
+      textView.setText(R.string.no_display_features_found);
+    }
+    for (DisplayFeature displayFeature : displayFeatures) {
+      if (displayFeature instanceof FoldingFeature) {
+        FoldingFeature foldingFeature = (FoldingFeature) displayFeature;
+        if (foldingFeature.getState().equals(FoldingFeature.State.FLAT)) {
+          textView.setText(R.string.flat_mode);
+        } else if (foldingFeature.getState().equals(FoldingFeature.State.HALF_OPENED)
+            && foldingFeature.getOrientation().equals(FoldingFeature.Orientation.HORIZONTAL)) {
+          textView.setText(R.string.tabletop_mode);
+        } else if (foldingFeature.getState().equals(FoldingFeature.State.HALF_OPENED)
+            && foldingFeature.getOrientation().equals(FoldingFeature.Orientation.VERTICAL)) {
+          textView.setText(R.string.book_mode);
+        }
+      }
+    }
+  }
+}
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-hdpi/ic_launcher.png b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..3cfe8121d
Binary files /dev/null and b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-hdpi/ic_launcher.png differ
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-ldpi/ic_launcher.png b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 000000000..7f78eb919
Binary files /dev/null and b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-ldpi/ic_launcher.png differ
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-mdpi/ic_launcher.png b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..54fa3233e
Binary files /dev/null and b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-mdpi/ic_launcher.png differ
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-xhdpi/ic_launcher.png b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..1f6c23304
Binary files /dev/null and b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/layout/foldable_activity.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/layout/foldable_activity.xml
new file mode 100644
index 000000000..10122bb9b
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/layout/foldable_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/current_fold_mode"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/fold_mode_text" />
+
+</LinearLayout>
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/layout/foldable_activity_with_config_handling.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/layout/foldable_activity_with_config_handling.xml
new file mode 100644
index 000000000..10122bb9b
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/layout/foldable_activity_with_config_handling.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/current_fold_mode"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/fold_mode_text" />
+
+</LinearLayout>
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/colors.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/colors.xml
new file mode 100644
index 000000000..131a17584
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 The Android Open Source Project
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       https://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <color name="color_primary">#6200EE</color>
+    <color name="color_primary_dark">#3700B3</color>
+    <color name="color_accent">#03DAC5</color>
+</resources>
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/strings.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/strings.xml
new file mode 100644
index 000000000..93ef32189
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/strings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="app_name">Foldable Test App</string>
+    <string name="fold_mode_text"
+          description="Displays the current fold mode of the test device [CHAR_LIMIT=NONE]">
+    fold mode has not been set
+    </string>
+    <string name="flat_mode"
+            description="Displayed when the test device is in flat mode [CHAR_LIMIT=NONE]">
+      flatmode
+    </string>
+    <string name="tabletop_mode"
+            description="Displayed when the test device is in tabletop mode [CHAR_LIMIT=NONE]">
+      tabletopmode
+    </string>
+    <string name="book_mode"
+            description="Displayed when the test device is in book mode [CHAR_LIMIT=NONE]">
+      bookmode
+    </string>
+    <string name="no_display_features_found"
+            description="Displayed when no DisplayFeatures are found [CHAR_LIMIT=NONE]">
+      no display features found
+    </string>
+ </resources>
diff --git a/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/styles.xml b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/styles.xml
new file mode 100644
index 000000000..802774c3f
--- /dev/null
+++ b/testapps/foldable_testapp/java/androidx/test/foldable/app/res/values/styles.xml
@@ -0,0 +1,19 @@
+<!--
+  Copyright 2022 The Android Open Source Project
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       https://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
+    </style>
+</resources>
diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/AndroidManifest.xml b/testapps/multidex_testapp/java/androidx/test/multidex/app/AndroidManifest.xml
deleted file mode 100644
index da5fc99a5..000000000
--- a/testapps/multidex_testapp/java/androidx/test/multidex/app/AndroidManifest.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.multidex.app" >
-
-    <uses-sdk
-      android:minSdkVersion = "14"
-      android:targetSdkVersion= "30"/>
-
-    <application
-        android:label="@string/app_name"
-        android:supportsRtl="true">
-
-        <activity
-            android:label="@string/activity_name"
-            android:name=".MultiDexActivity" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-</manifest>
diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD.bazel b/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD.bazel
deleted file mode 100644
index 336d8a39a..000000000
--- a/testapps/multidex_testapp/java/androidx/test/multidex/app/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-# Genrule that creates a Java classes with 32768 methods
-[genrule(
-    name = "MultiDexTestClass%s" % s,
-    outs = ["MultiDexTestClass%s.java" % s],
-    cmd = "echo 'package androidx.test.multidex.app;'>$@;" +
-          "echo 'public class MultiDexTestClass%s {'>>$@;" % s +
-          "for i in `seq 1 32768`;" +
-          "do echo 'public static int method'$$i'() {return 42;}'>>$@;" +
-          "done;" +
-          "echo '}'>>$@",
-) for s in [
-    "A",
-    "B",
-    "C",
-    "D",
-]]
-
-android_library(
-    name = "src",
-    srcs = [
-        "MultiDexActivity.java",
-        "MultiDexApplication.java",
-        ":MultiDexTestClassA",
-        ":MultiDexTestClassB",
-        ":MultiDexTestClassC",
-        ":MultiDexTestClassD",
-    ],
-    deps = ["//:androidx_multidex"],
-)
-
-android_binary(
-    name = "multidex_testapp",
-    main_dex_list = "main_dex_list.txt",
-    manifest = "AndroidManifest.xml",
-    multidex = "manual_main_dex",
-    resource_files = glob(["res/**"]),
-    deps = [":src"],
-)
diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/MultiDexActivity.java b/testapps/multidex_testapp/java/androidx/test/multidex/app/MultiDexActivity.java
deleted file mode 100644
index 36122d3bc..000000000
--- a/testapps/multidex_testapp/java/androidx/test/multidex/app/MultiDexActivity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.multidex.app;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/** Launch of MultiDexActivity requires additional dex files on classpath. */
-public class MultiDexActivity extends Activity {
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-    TextView textView = new TextView(this);
-    String message =
-        String.format(
-            "The answer is: %d\nThe answer is: %d\nThe answer is: %d\nThe answer is: %d\n"
-                + "The answer is: %d\nThe answer is: %d\nThe answer is: %d\nThe answer is: %d",
-            MultiDexTestClassA.method1(),
-            MultiDexTestClassA.method32768(),
-            MultiDexTestClassB.method1(),
-            MultiDexTestClassB.method32768(),
-            MultiDexTestClassC.method1(),
-            MultiDexTestClassC.method32768(),
-            MultiDexTestClassD.method1(),
-            MultiDexTestClassD.method32768());
-    textView.setText(message);
-    setContentView(textView);
-  }
-}
diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/MultiDexApplication.java b/testapps/multidex_testapp/java/androidx/test/multidex/app/MultiDexApplication.java
deleted file mode 100644
index 47ea45f34..000000000
--- a/testapps/multidex_testapp/java/androidx/test/multidex/app/MultiDexApplication.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package androidx.test.multidex.app;
-
-import android.app.Application;
-import android.content.Context;
-import androidx.multidex.MultiDex;
-import android.util.Log;
-
-/** MultiDexApplication is necessary to install / extract additional dex files */
-public class MultiDexApplication extends Application {
-
-  private static final String TAG = MultiDexApplication.class.getSimpleName();
-
-  @Override
-  public void onCreate() {
-    super.onCreate();
-    Log.i(TAG, ("MultiDex TestApp created"));
-  }
-
-  @Override
-  protected void attachBaseContext(Context base) {
-    super.attachBaseContext(base);
-    MultiDex.install(this);
-  }
-}
diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/main_dex_list.txt b/testapps/multidex_testapp/java/androidx/test/multidex/app/main_dex_list.txt
deleted file mode 100644
index a33779d75..000000000
--- a/testapps/multidex_testapp/java/androidx/test/multidex/app/main_dex_list.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-android/support/multidex/MultiDexApplication.class
-androidx/test/multidex/app/MultiDexActivity.class
-candroidx/test/multidex/app/MultiDexApplication.class
\ No newline at end of file
diff --git a/testapps/multidex_testapp/java/androidx/test/multidex/app/res/values/strings.xml b/testapps/multidex_testapp/java/androidx/test/multidex/app/res/values/strings.xml
deleted file mode 100644
index 9e871e687..000000000
--- a/testapps/multidex_testapp/java/androidx/test/multidex/app/res/values/strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  ~
-  -->
-<resources>
-  <string name="app_name">MultiDex Test App</string>
-  <string name="activity_name">AndroidX MultiDex</string>
-</resources>
\ No newline at end of file
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml
index b0be6196f..dedd0b11e 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
     <uses-sdk
       android:minSdkVersion = "23"
-      android:targetSdkVersion= "23"/>
+      android:targetSdkVersion= "33"/>
 
     <application
         android:icon="@mipmap/ic_launcher"
@@ -30,7 +30,8 @@
 
         <activity
             android:label="Sample Multi Process"
-            android:name=".MainActivity" >
+            android:name=".MainActivity"
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/BUILD b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/BUILD
new file mode 100644
index 000000000..8aa395d24
--- /dev/null
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/BUILD
@@ -0,0 +1,51 @@
+# Description:
+#   Test App used for Multi-process UI Testing Lib integration tests
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary")
+load("//build_extensions:jetify.bzl", "jetify_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//opensource/visibility:testing_pkg",
+        "//testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app:__pkg__",
+    ],
+)
+
+# Libraries
+# =========================================================
+
+filegroup(
+    name = "resource_files",
+    srcs = glob(["res/**"]),
+)
+
+jetify_android_library(
+    name = "lib",
+    srcs =
+        # get .java files in this dir
+        glob(["**/*.java"]),
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    manifest = "AndroidManifest.xml",
+    # compile time requirements
+    resource_files = [":resource_files"],
+    deps = [
+        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
+        "//opensource/androidx:annotation",
+    ],
+)
+
+# Applications
+# =========================================================
+
+android_binary(
+    name = "testapp",
+    manifest = "AndroidManifest.xml",
+    deps = [
+        ":lib",
+    ],
+)
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/BUILD.bazel b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/BUILD.bazel
deleted file mode 100644
index bf392ec38..000000000
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/BUILD.bazel
+++ /dev/null
@@ -1,44 +0,0 @@
-# Description: Test App used for multiprocess testing lib integration tests.
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = [
-    "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-    "//testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app:__pkg__",
-])
-
-android_library(
-    name = "multiprocess_lib",
-    testonly = 1,
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    assets = glob(["assets/**"]),
-    assets_dir = "assets",
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    visibility = ["//visibility:private"],
-    deps = [
-        "//:androidx_annotation",
-        "//espresso/idling_resource/java/androidx/test/espresso:idling_resource_internal",
-    ],
-)
-
-android_library(
-    name = "multiprocess_neverlink_lib",
-    testonly = 1,
-    # No other libraries should depend on this one
-    neverlink = 1,
-    exports = [":multiprocess_lib"],
-)
-
-android_binary(
-    name = "multiprocess_testapp",
-    testonly = 1,
-    assets = glob(["assets/**"]),
-    assets_dir = "assets",
-    manifest = "AndroidManifest.xml",
-    resource_files = glob(["res/**"]),
-    deps = [
-        ":multiprocess_lib",
-    ],
-)
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/DefaultProcessActivity.java b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/DefaultProcessActivity.java
index 2e590f35f..eb5135728 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/DefaultProcessActivity.java
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/DefaultProcessActivity.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
+import android.widget.Button;
 import android.widget.TextView;
 
 /**
@@ -37,6 +38,9 @@ protected void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.activity_process_default);
     textView = (TextView) findViewById(R.id.textNamedProcess);
     setCurrentRunningProcess(textView, this);
+
+    Button buttonView = (Button) findViewById(R.id.startActivityBtn);
+    buttonView.setOnClickListener(this::onStartActivityBtnClick);
   }
 
   public void onStartActivityBtnClick(View view) {
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/IdlingActivity.java b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/IdlingActivity.java
index 47be2d797..aad475d29 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/IdlingActivity.java
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/IdlingActivity.java
@@ -20,14 +20,14 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.test.espresso.IdlingRegistry;
-import com.google.android.apps.common.testing.ui.multiprocess.testapp.idling.MessageDelayer;
-import com.google.android.apps.common.testing.ui.multiprocess.testapp.idling.SimpleIdlingResource;
+import androidx.test.multiprocess.app.idling.MessageDelayer;
+import androidx.test.multiprocess.app.idling.SimpleIdlingResource;
 
 /**
  * Gets a text String from the user and displays it back after a while.
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/PrivateProcessActivity.java b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/PrivateProcessActivity.java
index 11e563f21..fa9b1c477 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/PrivateProcessActivity.java
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/PrivateProcessActivity.java
@@ -24,6 +24,7 @@
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.TextView;
 
@@ -53,6 +54,9 @@ protected void onCreate(Bundle savedInstanceState) {
         new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, listItems);
     listView.setAdapter(adapter);
     listView.setOnItemClickListener(this);
+
+    Button displayButton = (Button) findViewById(R.id.displayBtn);
+    displayButton.setOnClickListener(this::onBtnClick);
   }
 
   public void onBtnClick(View view) {
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/WebViewActivity.java b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/WebViewActivity.java
index 5f21d8b96..4ef7a35a3 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/WebViewActivity.java
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/WebViewActivity.java
@@ -19,10 +19,10 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 
 /**
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/MessageDelayer.java b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/MessageDelayer.java
index d822de8a3..81925aa3e 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/MessageDelayer.java
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/MessageDelayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.apps.common.testing.ui.multiprocess.testapp.idling;
+package androidx.test.multiprocess.app.idling;
 
 import android.os.Handler;
 import androidx.annotation.Nullable;
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/SimpleIdlingResource.java b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/SimpleIdlingResource.java
index a67a85da1..add56345c 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/SimpleIdlingResource.java
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/idling/SimpleIdlingResource.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.android.apps.common.testing.ui.multiprocess.testapp.idling;
+package androidx.test.multiprocess.app.idling;
 
 import androidx.annotation.Nullable;
 import androidx.test.espresso.IdlingResource;
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_default.xml b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_default.xml
index 0ab2e2746..0c10f49f1 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_default.xml
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_default.xml
@@ -34,7 +34,6 @@
         android:id="@+id/startActivityBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/start_activity"
-        android:onClick="onStartActivityBtnClick"/>
+        android:text="@string/start_activity"/>
 
 </LinearLayout>
diff --git a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_private.xml b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_private.xml
index 76a0f7e5c..439f7c3b7 100644
--- a/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_private.xml
+++ b/testapps/multiprocess_testapp/java/androidx/test/multiprocess/app/res/layout/activity_process_private.xml
@@ -35,7 +35,6 @@
         android:id="@+id/displayBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:onClick="onBtnClick"
         android:text="@string/click_me"/>
 
     <TextView
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
index fd21fe3ec..3b9d8d388 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest.xml
@@ -19,11 +19,12 @@
 
   <uses-sdk
     android:minSdkVersion="23"
-    android:targetSdkVersion="28"/>
+    android:targetSdkVersion="34"/>
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="*">
     <meta-data
       android:name="remoteMethod"
       android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
index 7b5d08c3f..d8ca4704b 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_global.xml
@@ -24,16 +24,12 @@
 
   <instrumentation
     android:name="androidx.test.runner.AndroidJUnitRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="foo.bar.global">
 
-    <!-- explicitly instrument global process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="foo.bar.global"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess="foo.bar"-->
-
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
index 0e44dde93..49871ee25 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_idling.xml
@@ -23,17 +23,13 @@
     android:targetSdkVersion="28"/>
 
   <instrumentation
-    android:name="com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:name="androidx.test.runner.AndroidJUnitRunner"
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="androidx.test.multiprocess.app:idling">
 
-    <!-- explicitly instrument idling process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="androidx.test.multiprocess.app:idling"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess=":idling"-->
-
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
index 0f52d4aca..1a5f3a2d2 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/AndroidManifest_private.xml
@@ -23,16 +23,13 @@
     android:targetSdkVersion="28"/>
 
   <instrumentation
-    android:name="com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
-    android:targetPackage="androidx.test.multiprocess.app">
+    android:name="androidx.test.runner.AndroidJUnitRunner"
+    android:targetPackage="androidx.test.multiprocess.app"
+    android:targetProcesses="androidx.test.multiprocess.app:PID2">
 
-    <!-- explicitly instrument private process: -->
     <meta-data
-      android:name="targetProcess"
-      android:value="androidx.test.multiprocess.app:PID2"/>
-
-    <!-- TODO: change to the syntax after next emulator image update -->
-    <!--android:targetProcess=":PID2"-->
+      android:name="remoteMethod"
+      android:value="androidx.test.espresso.remote.EspressoRemote#remoteInit"/>
   </instrumentation>
 
 </manifest>
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
new file mode 100644
index 000000000..ea1115d0b
--- /dev/null
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD
@@ -0,0 +1,140 @@
+# Description:
+#   Sample multi-process tests.
+
+load("//build_extensions:axt_android_application_test.bzl", "axt_android_application_test")
+load(
+    "//build_extensions:phone_devices.bzl",
+    "devices",
+)
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+)
+
+licenses(["notice"])
+
+# Tests
+# =========================================================
+
+DEVICES = devices([28])
+
+axt_android_application_test(
+    name = "DefaultProcessActivityTest",
+    srcs =
+        ["DefaultProcessActivityTest.java"],
+    device_list = DEVICES,
+    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:testapp",
+    manifest = "AndroidManifest.xml",
+    tags = ["integration"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/core/java/androidx/test/espresso/remote:exceptions",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//ext/junit",
+        "//runner/android_junit_runner/java/androidx/test:runner",
+        "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:lib",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
+
+axt_android_application_test(
+    name = "GlobalProcessActivityTest",
+    srcs =
+        ["GlobalProcessActivityTest.java"],
+    device_list = DEVICES,
+    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:testapp",
+    manifest = "AndroidManifest_global.xml",
+    tags = ["integration"],
+    deps = [
+        "//core",
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:lib",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_application_test(
+    name = "IdlingActivityTest",
+    srcs =
+        ["IdlingActivityTest.java"],
+    device_list = DEVICES,
+    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:testapp",
+    manifest = "AndroidManifest_idling.xml",
+    tags = ["integration"],
+    deps = [
+        "//espresso/core",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//ext/junit",
+        "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:lib",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_application_test(
+    name = "MainActivityTest",
+    srcs =
+        ["MainActivityTest.java"],
+    device_list = DEVICES,
+    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:testapp",
+    manifest = "AndroidManifest.xml",
+    tags = ["integration"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//ext/junit",
+        "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:lib",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_application_test(
+    name = "PrivateProcessActivityTest",
+    srcs =
+        ["PrivateProcessActivityTest.java"],
+    device_list = DEVICES,
+    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:testapp",
+    manifest = "AndroidManifest_private.xml",
+    tags = ["integration"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//ext/junit",
+        "//runner/android_junit_runner",
+        "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:lib",
+        "@maven//:junit_junit",
+    ],
+)
+
+axt_android_application_test(
+    name = "WebViewActivityTest",
+    srcs =
+        ["WebViewActivityTest.java"],
+    device_list = DEVICES,
+    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:testapp",
+    manifest = "AndroidManifest.xml",
+    tags = ["integration"],
+    deps = [
+        "//espresso/core/java/androidx/test/espresso",
+        "//espresso/remote/java/androidx/test/espresso/remote",
+        "//espresso/web/java/androidx/test/espresso/web/action",
+        "//espresso/web/java/androidx/test/espresso/web/assertion",
+        "//espresso/web/java/androidx/test/espresso/web/matcher",
+        "//espresso/web/java/androidx/test/espresso/web/sugar",
+        "//espresso/web/java/androidx/test/espresso/web/webdriver",
+        "//ext/junit",
+        "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:lib",
+        "@maven//:junit_junit",
+        "@maven//:org_hamcrest_hamcrest_core",
+        "@maven//:org_hamcrest_hamcrest_library",
+    ],
+)
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD.bazel b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD.bazel
deleted file mode 100644
index 4d85c153b..000000000
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/BUILD.bazel
+++ /dev/null
@@ -1,59 +0,0 @@
-# Description:
-#   Sample multi-process tests.
-
-licenses(["notice"])  # Apache License 2.0
-
-MPE_ALL_DEPS = [
-    "//espresso/core/java/androidx/test/espresso",
-    "//espresso/core/java/androidx/test/espresso/remote",
-    "//espresso/core/java/androidx/test/espresso/remote:exceptions",
-    "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:multiprocess_neverlink_lib",
-    "//espresso/core/java/androidx/test/espresso/action",
-    "//espresso/core/java/androidx/test/espresso/assertion",
-    "//espresso/core/java/androidx/test/espresso/matcher",
-    "//runner/android_junit_runner/java/androidx/test:runner",
-    "//runner/rules/java/androidx/test:rules",
-    "@maven//:junit_junit",
-    "@maven//:org_hamcrest_hamcrest_all",
-]
-
-# Tests
-# =========================================================
-
-# Currently only API level 26+ is supported for multi process espresso tests
-DEVICE_TARGETS = [
-    ("26_x86", "MESA"),
-]
-
-TEST_SRCS = [
-    "DefaultProcessActivityTest.java",
-]
-
-java_library(
-    name = "test_deps",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = MPE_ALL_DEPS,
-)
-
-android_binary(
-    name = "espresso_mpe_tests",
-    testonly = 1,
-    srcs = TEST_SRCS,
-    instruments = "//testapps/multiprocess_testapp/java/androidx/test/multiprocess/app:multiprocess_testapp",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":test_deps"],
-)
-
-[android_instrumentation_test(
-    name = "espresso_mpe_tests_generic_phone_google_%s" % device_target[0],
-    size = "large",
-    args = [
-        "--open_gl_driver=%s" % device_target[1],
-        "--clear_package_data",
-        # Install test services, this is required as the services are not part of the image
-        "--install_test_services=True",  # Required for Bazel 0.11, can be removed in 0.12
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:google_%s_qemu2" % device_target[0],
-    test_app = ":espresso_mpe_tests",
-) for device_target in DEVICE_TARGETS]
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/DefaultProcessActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/DefaultProcessActivityTest.java
index 733a60ac6..52a174bbb 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/DefaultProcessActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/DefaultProcessActivityTest.java
@@ -31,23 +31,22 @@
 import android.util.Log;
 import androidx.test.espresso.action.ViewActions;
 import androidx.test.espresso.remote.RemoteEspressoException;
-import androidx.test.filters.SmallTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-@SmallTest
 public class DefaultProcessActivityTest {
   private static final String TAG = "DefaultProcActivityTest";
 
   private static final String DEFAULT_PROC_NAME = "androidx.test.multiprocess.app";
 
   @Rule
-  public ActivityTestRule<DefaultProcessActivity> rule =
-      new ActivityTestRule<>(DefaultProcessActivity.class);
+  public ActivityScenarioRule<DefaultProcessActivity> rule =
+      new ActivityScenarioRule<>(DefaultProcessActivity.class);
 
   @Test
   public void verifyAssertingOnViewInRemoteProcessIsSuccessful() {
@@ -96,6 +95,7 @@ public void verifyAssertingOnDataInRemoteProcessIsSuccessful() {
   }
 
   @Test
+  @Ignore // flaky b/264579367
   public void verifySwitchingBetweenTwoProcessesQuicklyWorks() {
     Log.d(TAG, "Checking main process name...");
     onView(withId(R.id.textNamedProcess)).check(matches(withText(is(DEFAULT_PROC_NAME))));
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
index 7129ed0b4..7d1d30ec4 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/GlobalProcessActivityTest.java
@@ -18,25 +18,24 @@
 
 package androidx.test.multiprocess.app;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-import junit.framework.Assert;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+import static org.junit.Assert.assertNotNull;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-@SmallTest
 public class GlobalProcessActivityTest {
 
   @Rule
-  public ActivityTestRule<GlobalProcessActivity> rule =
-      new ActivityTestRule<>(GlobalProcessActivity.class);
+  public ActivityScenarioRule<GlobalProcessActivity> rule =
+      new ActivityScenarioRule<>(GlobalProcessActivity.class);
 
   @Test
   public void sanityTest() {
-    Assert.assertNotNull(InstrumentationRegistry.getTargetContext());
+    assertNotNull(getApplicationContext());
   }
 }
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
index 04aaa2421..73e0cab7d 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/IdlingActivityTest.java
@@ -24,9 +24,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -35,15 +34,14 @@
  * Sample test to showcase Idling Resource in a multi-process environment.
  */
 @RunWith(AndroidJUnit4.class)
-@LargeTest
 public class IdlingActivityTest {
 
   private static final String STRING_TO_BE_TYPED = "Hello Multiprocess Espresso!";
   private static final String IDLING_PROC_NAME = "androidx.test.multiprocess.app:idling";
 
   @Rule
-  public ActivityTestRule<IdlingActivity> mActivityRule = new ActivityTestRule<>(
-      IdlingActivity.class);
+  public ActivityScenarioRule<IdlingActivity> activityRule =
+      new ActivityScenarioRule<>(IdlingActivity.class);
 
   @Test
   public void verifyChangingTextAsynchronously() {
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/MainActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/MainActivityTest.java
index 13ee63e00..57c98aa81 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/MainActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/MainActivityTest.java
@@ -25,9 +25,8 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import android.util.Log;
-import androidx.test.filters.SmallTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,19 +36,16 @@
  * {@link android.app.Activity Activities} defined in the manifest.
  */
 @RunWith(AndroidJUnit4.class)
-@SmallTest
 public class MainActivityTest {
   private static final String TAG = "MainActivityTest";
 
   private static final String MAIN_PROC_NAME = "androidx.test.multiprocess.app";
 
   @Rule
-  public ActivityTestRule<MainActivity> rule =
-      new ActivityTestRule<>(MainActivity.class);
+  public ActivityScenarioRule<MainActivity> rule = new ActivityScenarioRule<>(MainActivity.class);
 
   @Test
-  public void verifySynchronizingAgainstCustomIdlingResourceInRemoteProcessIsSuccessful()
-      throws InterruptedException {
+  public void verifySynchronizingAgainstCustomIdlingResourceInRemoteProcessIsSuccessful() {
 
     Log.i(TAG, "About to click on IdlingActivity..");
     onView(withText("IdlingActivity")).perform(click());
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
index a49e7af27..a91177ea2 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/PrivateProcessActivityTest.java
@@ -21,30 +21,21 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-import junit.framework.Assert;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(AndroidJUnit4.class)
-@SmallTest
 public class PrivateProcessActivityTest {
 
   private static final String PRIVATE_PROC_NAME = "androidx.test.multiprocess.app:PID2";
 
   @Rule
-  public ActivityTestRule<PrivateProcessActivity> rule =
-      new ActivityTestRule<>(PrivateProcessActivity.class);
+  public ActivityScenarioRule<PrivateProcessActivity> rule =
+      new ActivityScenarioRule<>(PrivateProcessActivity.class);
 
-  @Test
-  public void sanityTest() {
-    Assert.assertNotNull(InstrumentationRegistry.getTargetContext());
-  }
-  
   @Test
   public void verifyRunningInPrivateProcess() {
     onView(withId(R.id.textPrivateProcessName)).check(matches(withText(PRIVATE_PROC_NAME)));
diff --git a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/WebViewActivityTest.java b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/WebViewActivityTest.java
index 8cecf8e99..75c0b90cc 100644
--- a/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/WebViewActivityTest.java
+++ b/testapps/multiprocess_testapp/javatests/androidx/test/multiprocess/app/WebViewActivityTest.java
@@ -36,9 +36,8 @@
 import androidx.test.espresso.matcher.BoundedMatcher;
 import androidx.test.espresso.web.webdriver.DriverAtoms;
 import androidx.test.espresso.web.webdriver.Locator;
-import androidx.test.filters.LargeTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 import java.util.Map;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
@@ -52,7 +51,6 @@
  * <p>The sample has a simple layout which contains a single {@link WebView}. The HTML page displays
  * a form with an input tag and buttons to submit the form.
  */
-@LargeTest
 @RunWith(AndroidJUnit4.class)
 public class WebViewActivityTest {
   private static final String TAG = "WebViewActivityTest";
@@ -61,7 +59,8 @@ public class WebViewActivityTest {
 
   /** Note: That we're starting the MainActivity here in order to create a multi-process scenario */
   @Rule
-  public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class);
+  public ActivityScenarioRule<MainActivity> activityRule =
+      new ActivityScenarioRule<>(MainActivity.class);
 
   @SuppressWarnings("rawtypes")
   public static Matcher<Object> withItemContent(final Matcher<String> itemTextMatcher) {
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/AndroidManifest.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/AndroidManifest.xml
new file mode 100644
index 000000000..857fd17fa
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/AndroidManifest.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+          tools:overrideLibrary="androidx.test.multiwindow.app.tests"
+    package="androidx.test.multiwindow.app">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+  <uses-sdk
+      android:minSdkVersion="24"
+      android:targetSdkVersion="30"/>
+
+  <application
+      android:allowBackup="true"
+      android:icon="@drawable/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true"
+      android:taskAffinity="">
+    <activity
+        android:label="Multi-Window activity"
+        android:name=".MultiWindowActivity"
+        android:resizeableActivity="true"
+        android:minHeight="1dp"
+        android:minWidth="1dp"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+    <activity
+        android:label="Multi-Window with config changes activity"
+        android:name=".MultiWindowWithConfigChangesActivity"
+        android:resizeableActivity="true"
+        android:configChanges="screenSize | smallestScreenSize| screenLayout | orientation"
+        android:minHeight="1dp"
+        android:minWidth="1dp"
+        android:exported="false"/>
+  </application>
+</manifest>
\ No newline at end of file
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/AndroidManifest_opensource.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/AndroidManifest_opensource.xml
new file mode 100644
index 000000000..b0dd0892a
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/AndroidManifest_opensource.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+          tools:overrideLibrary="androidx.test.multiwindow.app.tests"
+    package="androidx.test.multiwindow.app">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+  <uses-sdk
+      android:minSdkVersion="24"
+      android:targetSdkVersion="30"/>
+
+  <application
+      android:allowBackup="true"
+      android:icon="@drawable/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme"
+      android:supportsRtl="true"
+      android:taskAffinity="">
+    <activity
+        android:label="Multi-Window activity"
+        android:name=".MultiWindowActivity"
+        android:resizeableActivity="true"
+        android:minHeight="1dp"
+        android:minWidth="1dp"
+        android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+    <activity
+        android:label="Multi-Window with config changes activity"
+        android:name=".MultiWindowWithConfigChangesActivity"
+        android:resizeableActivity="true"
+        android:configChanges="screenSize | smallestScreenSize| screenLayout | orientation"
+        android:minHeight="1dp"
+        android:minWidth="1dp"
+        android:exported="false"/>
+  </application>
+
+</manifest>
\ No newline at end of file
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD
new file mode 100644
index 000000000..c986c14b6
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/BUILD
@@ -0,0 +1,52 @@
+# -*- mode: python; -*-
+#
+# Description:
+#  Test App used for testing API integration tests in multi-window mode.
+
+load("@build_bazel_rules_android//android:rules.bzl", "android_binary", "android_library")
+load("//build_extensions:jetify.bzl", "jetify_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//opensource/visibility:testing_pkg",
+    ],
+)
+
+jetify_android_library(
+    name = "lib",
+    srcs = glob(
+        ["**/*.java"],
+    ),
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "@maven//:androidx_appcompat_appcompat",
+        "@maven//:androidx_window_window_core",
+    ],
+)
+
+android_library(
+    name = "lib_exported",
+    exports_manifest = 1,
+    manifest = "AndroidManifest.xml",
+    exports = ["lib"],
+)
+
+android_binary(
+    name = "testapp",
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        ":lib",
+        "//core:manifest",
+    ],
+)
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/MultiWindowActivity.java b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/MultiWindowActivity.java
new file mode 100644
index 000000000..1b8dfd0c4
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/MultiWindowActivity.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.multiwindow.app;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import androidx.window.core.layout.WindowHeightSizeClass;
+import androidx.window.core.layout.WindowSizeClass;
+import androidx.window.core.layout.WindowWidthSizeClass;
+
+/** Activity that updates a TextView when entering or exiting multi-window mode. */
+public class MultiWindowActivity extends Activity {
+  private static final String TAG = MultiWindowActivity.class.getSimpleName();
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.multiwindow_activity);
+
+    String multiWindowModeText;
+    if (this.isInMultiWindowMode()) {
+      multiWindowModeText = "Device is in multi-window mode.";
+    } else {
+      multiWindowModeText = "Device is not in multi-window mode.";
+    }
+    Log.d(TAG, "onCreate." + multiWindowModeText);
+    TextView textView = (TextView) findViewById(R.id.multi_window_mode);
+    textView.setText(multiWindowModeText);
+
+    ViewGroup container = (ViewGroup) getWindow().findViewById(android.R.id.content);
+    container.addView(
+        new View(this) {
+          @Override
+          protected void onConfigurationChanged(Configuration newConfig) {
+            super.onConfigurationChanged(newConfig);
+            computeWindowSizeClasses();
+          }
+        });
+    computeWindowSizeClasses();
+  }
+
+  private void computeWindowSizeClasses() {
+    TextView screenWidthTextView = (TextView) findViewById(R.id.screen_width_display_size);
+    TextView screenHeightTextView = (TextView) findViewById(R.id.screen_height_display_size);
+
+    float width =
+        this.getResources().getDisplayMetrics().widthPixels
+            / this.getResources().getDisplayMetrics().density;
+    float height =
+        this.getResources().getDisplayMetrics().heightPixels
+            / this.getResources().getDisplayMetrics().density;
+    WindowSizeClass sizeClass = WindowSizeClass.compute(width, height);
+    String screenWidthText;
+    WindowWidthSizeClass widthSizeClass = sizeClass.getWindowWidthSizeClass();
+    if (widthSizeClass.equals(WindowWidthSizeClass.COMPACT)) {
+      screenWidthText = "Compact width";
+    } else if (widthSizeClass.equals(WindowWidthSizeClass.MEDIUM)) {
+      screenWidthText = "Medium width";
+    } else {
+      screenWidthText = "Expanded width";
+    }
+
+    WindowHeightSizeClass heightSizeClass = sizeClass.getWindowHeightSizeClass();
+    String screenHeightText;
+    if (heightSizeClass.equals(WindowHeightSizeClass.COMPACT)) {
+      screenHeightText = "Compact height";
+    } else if (heightSizeClass.equals(WindowHeightSizeClass.MEDIUM)) {
+      screenHeightText = "Medium height";
+    } else {
+      screenHeightText = "Expanded height";
+    }
+
+    screenWidthTextView.setText(screenWidthText);
+    screenHeightTextView.setText(screenHeightText);
+  }
+}
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/MultiWindowWithConfigChangesActivity.java b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/MultiWindowWithConfigChangesActivity.java
new file mode 100644
index 000000000..c724a7ec3
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/MultiWindowWithConfigChangesActivity.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.multiwindow.app;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+/**
+ * Activity that updates a TextView when entering or exiting multi-window mode and implements
+ * onConfigurationChanged().
+ */
+public class MultiWindowWithConfigChangesActivity extends Activity {
+  private static final String TAG = MultiWindowWithConfigChangesActivity.class.getSimpleName();
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.multiwindow_with_config_changes_activity);
+
+    String multiWindowModeText = updateTextView();
+    Log.d(TAG, "onCreate. " + multiWindowModeText);
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+
+    String multiWindowModeText = updateTextView();
+    Log.d(TAG, "onConfigurationChanged. " + multiWindowModeText);
+  }
+
+  private String updateTextView() {
+    String multiWindowModeText;
+    if (this.isInMultiWindowMode()) {
+      multiWindowModeText = "Device is in multi-window mode.";
+    } else {
+      multiWindowModeText = "Device is not in multi-window mode.";
+    }
+    TextView textView = (TextView) findViewById(R.id.multi_window_mode_textview);
+    textView.setText(multiWindowModeText);
+    return multiWindowModeText;
+  }
+}
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-hdpi/ic_launcher.png b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 000000000..3cfe8121d
Binary files /dev/null and b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-hdpi/ic_launcher.png differ
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-ldpi/ic_launcher.png b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 000000000..7f78eb919
Binary files /dev/null and b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-ldpi/ic_launcher.png differ
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-mdpi/ic_launcher.png b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 000000000..54fa3233e
Binary files /dev/null and b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-mdpi/ic_launcher.png differ
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-xhdpi/ic_launcher.png b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 000000000..1f6c23304
Binary files /dev/null and b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/layout/multiwindow_activity.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/layout/multiwindow_activity.xml
new file mode 100644
index 000000000..cc1bef10b
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/layout/multiwindow_activity.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/multi_window_mode"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/multi_window_mode_text" />
+    <TextView
+        android:id="@+id/screen_width_display_size"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/screen_width_text" />
+    <TextView
+        android:id="@+id/screen_height_display_size"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/screen_height_text" />
+
+</LinearLayout>
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/layout/multiwindow_with_config_changes_activity.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/layout/multiwindow_with_config_changes_activity.xml
new file mode 100644
index 000000000..09b889d6e
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/layout/multiwindow_with_config_changes_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/multi_window_mode_textview"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/multi_window_mode_text" />
+
+</LinearLayout>
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/colors.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/colors.xml
new file mode 100644
index 000000000..131a17584
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/colors.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2022 The Android Open Source Project
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       https://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<resources>
+    <color name="color_primary">#6200EE</color>
+    <color name="color_primary_dark">#3700B3</color>
+    <color name="color_accent">#03DAC5</color>
+</resources>
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/strings.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/strings.xml
new file mode 100644
index 000000000..ff87dd06b
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/strings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <string name="app_name">MultiWindow Test App</string>
+    <string name="multi_window_mode_text"
+      description="Displayed when the test device is in multiwindow mode [CHAR_LIMIT=NONE]">
+      Multi-window mode text has not been set.
+    </string>
+    <string name="screen_height_text"
+            description="Displays the current display size class width [CHAR_LIMIT=NONE]">
+      Screen height text has not been set.
+    </string>
+    <string name="screen_width_text"
+            description="Displays the current display size class height [CHAR_LIMIT=NONE]">
+      Screen width text has not been set.
+    </string>
+ </resources>
diff --git a/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/styles.xml b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/styles.xml
new file mode 100644
index 000000000..802774c3f
--- /dev/null
+++ b/testapps/multiwindow_testapp/java/androidx/test/multiwindow/app/res/values/styles.xml
@@ -0,0 +1,19 @@
+<!--
+  Copyright 2022 The Android Open Source Project
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+       https://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorAccent">@color/color_accent</item>
+    </style>
+</resources>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarSearchActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarSearchActivity.java
index 76660ddf5..dcc642cdf 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarSearchActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarSearchActivity.java
@@ -19,12 +19,12 @@
 import android.app.SearchManager;
 import android.content.Context;
 import android.os.Bundle;
-import androidx.core.view.MenuItemCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.SearchView;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.core.view.MenuItemCompat;
 
 /** AppCompatActivity with the appcompat SearchView widget. */
 public class ActionBarSearchActivity extends AppCompatActivity {
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarTestActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarTestActivity.java
index 46bfcf9b2..eb90411e7 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarTestActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ActionBarTestActivity.java
@@ -17,14 +17,14 @@
 package androidx.test.ui.app;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.view.ActionMode;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
 
 /**
  * Shows ActionBar with a lot of items to get Action overflow on large displays. Click on item
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml
index 0e95a2367..8a90c0683 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest.xml
@@ -18,8 +18,8 @@
     package="androidx.test.ui.app">
 
   <uses-sdk
-      android:minSdkVersion="14"
-      android:targetSdkVersion="23"/>
+      android:minSdkVersion="23"
+      android:targetSdkVersion="34"/>
 
   <uses-permission android:name="android.permission.CALL_PHONE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
@@ -30,11 +30,16 @@
   <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
+  <queries>
+    <package android:name="com.android.contacts" />
+  </queries>
+
   <application
       android:icon="@drawable/ic_launcher"
       android:label="UI Test App"
-      android:name="android.support.multidex.MultiDexApplication">
-    <activity
+      android:supportsRtl="true"
+      android:usesCleartextTraffic="true" >
+    <activity android:exported="true"
         android:label="UI Test App"
         android:name=".MainActivity">
       <intent-filter>
@@ -53,26 +58,26 @@
             android:scheme="http"/>
       </intent-filter>
     </activity>
-    <activity
+    <activity android:exported="true"
         android:label="actionbar test activity"
         android:name=".ActionBarTestActivity"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="simple activity"
         android:name=".SimpleActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="send activity"
         android:name=".SendActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="pick activity"
         android:name=".PickActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="pickers activity"
         android:name=".PickersActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="display activity"
         android:name=".DisplayActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="drawer activity"
         android:name=".DrawerActivity"
         android:theme="@style/Theme.AppCompat.Light"/>
@@ -88,98 +93,114 @@
         android:exported="true"
         android:label="list activity"
         android:name=".LongListActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="very long list activity"
         android:name=".VeryLongListViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="cursor adapter activity"
         android:name=".CursorAdapterActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="menu activity"
         android:name=".MenuActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="fragment stack activity"
         android:name=".FragmentStack"/>
-    <activity
+    <activity android:exported="true"
         android:label="sync activity"
         android:name=".SyncActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="web view"
         android:name=".SimpleWebViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="web form"
         android:name=".WebFormActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="swipe activity"
         android:name=".SwipeActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="view pager activity"
         android:name=".ViewPagerActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="recyclerview activity"
         android:name=".RecyclerViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="vertical view pager activity"
         android:name=".VerticalViewPagerActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="large view activity"
         android:name=".LargeViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="padding activity"
         android:name=".PaddingActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="action bar with v7 search"
         android:name=".ActionBarSearchActivity"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="layout issues activity"
         android:name=".LayoutIssuesActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="tool bar activity"
         android:name=".ToolbarActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="task stack activity"
         android:name=".TaskStackActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="browse the assets"
         android:name=".DynamicWebViewActivity"
         android:windowSoftInputMode="adjustPan"/>
-    <activity
+    <activity android:exported="true"
         android:label="transition activity"
         android:name=".TransitionActivityMain"/>
-    <activity android:name=".TransitionDetailActivity"/>
-    <activity
+    <activity android:exported="true" android:name=".TransitionDetailActivity"/>
+    <activity android:exported="true"
         android:label="Keyboard Test Activity"
         android:name=".KeyboardTestActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="NavigationViewActivity"
         android:name=".NavigationViewActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="Test Activity for InterceptingActivityFactory"
         android:name=".InterceptingActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="Runtime Permissions"
         android:name=".RuntimePermissionsActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="Chat Head Activity"
         android:name=".ChatHeadActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="Delayed Dialog Activity"
         android:name=".DelayedDialogActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="Scaled View Activity"
         android:name=".ScaledViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="Idling UI Activity"
         android:name=".IdlingUIActivity" />
-    <activity
+    <activity android:exported="true"
         android:label="View With 'textAllCaps' Activity"
-        android:name=".ViewWithTextAllCapsActivity">
-    </activity>
+        android:name=".ViewWithTextAllCapsActivity" />
+    <activity
+        android:label="Duplicate View Activity"
+        android:name=".DuplicateViewActivity"
+        android:exported="false" />
+     <activity
+        android:label="screen orientation activity"
+        android:name=".ScreenOrientationActivity"
+        android:configChanges="orientation|screenSize"
+        android:exported="false"/>
+    <activity
+        android:label="screen orientation without onConfigurationChanged activity"
+        android:name=".ScreenOrientationWithoutOnConfigurationChangedActivity"
+        android:exported="false"/>
+    <activity
+        android:label="Truncated View Hierarchy Activity"
+        android:name=".TruncatedViewHierarchyActivity"
+        android:exported="false" />
     <service android:name=".ChatHeadService"/>
 
     <provider
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml
index bced6193d..826812b48 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/AndroidManifest_opensource.xml
@@ -18,8 +18,8 @@
     package="androidx.test.ui.app">
 
   <uses-sdk
-      android:minSdkVersion="14"
-      android:targetSdkVersion="23"/>
+      android:minSdkVersion="23"
+      android:targetSdkVersion="33"/>
 
   <uses-permission android:name="android.permission.CALL_PHONE"/>
   <uses-permission android:name="android.permission.INTERNET"/>
@@ -32,8 +32,9 @@
 
   <application
       android:icon="@drawable/ic_launcher"
-      android:label="UI Test App">
-    <activity
+      android:label="UI Test App"
+      android:supportsRtl="true">
+    <activity android:exported="true"
         android:label="UI Test App"
         android:name=".MainActivity">
       <intent-filter>
@@ -52,26 +53,26 @@
             android:scheme="http"/>
       </intent-filter>
     </activity>
-    <activity
+    <activity android:exported="true"
         android:label="actionbar test activity"
         android:name=".ActionBarTestActivity"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="simple activity"
         android:name=".SimpleActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="send activity"
         android:name=".SendActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="pick activity"
         android:name=".PickActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="pickers activity"
         android:name=".PickersActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="display activity"
         android:name=".DisplayActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="drawer activity"
         android:name=".DrawerActivity"
         android:theme="@style/Theme.AppCompat.Light"/>
@@ -87,91 +88,110 @@
         android:exported="true"
         android:label="list activity"
         android:name=".LongListActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="very long list activity"
         android:name=".VeryLongListViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="cursor adapter activity"
         android:name=".CursorAdapterActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="menu activity"
         android:name=".MenuActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="fragment stack activity"
         android:name=".FragmentStack"/>
-    <activity
+    <activity android:exported="true"
         android:label="sync activity"
         android:name=".SyncActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="web view"
         android:name=".SimpleWebViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="web form"
         android:name=".WebFormActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="swipe activity"
         android:name=".SwipeActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="view pager activity"
         android:name=".ViewPagerActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="recyclerview activity"
         android:name=".RecyclerViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="vertical view pager activity"
         android:name=".VerticalViewPagerActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="large view activity"
         android:name=".LargeViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="padding activity"
         android:name=".PaddingActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="action bar with v7 search"
         android:name=".ActionBarSearchActivity"
         android:theme="@style/Theme.AppCompat.Light.DarkActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="layout issues activity"
         android:name=".LayoutIssuesActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="tool bar activity"
         android:name=".ToolbarActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="task stack activity"
         android:name=".TaskStackActivity"/>
     <activity
         android:label="transition activity"
         android:name=".TransitionActivityMain"/>
-    <activity android:name=".TransitionDetailActivity"/>
-    <activity
+    <activity android:exported="true" android:name=".TransitionDetailActivity"/>
+    <activity android:exported="true"
         android:label="Keyboard Test Activity"
         android:name=".KeyboardTestActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="NavigationViewActivity"
         android:name=".NavigationViewActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="Test Activity for InterceptingActivityFactory"
         android:name=".InterceptingActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="Runtime Permissions"
         android:name=".RuntimePermissionsActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="Chat Head Activity"
         android:name=".ChatHeadActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="Delayed Dialog Activity"
         android:name=".DelayedDialogActivity"
         android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
-    <activity
+    <activity android:exported="true"
         android:label="Scaled View Activity"
         android:name=".ScaledViewActivity"/>
-    <activity
+    <activity android:exported="true"
         android:label="Idling UI Activity"
         android:name=".IdlingUIActivity" />
-
+    <activity android:exported="true"
+        android:label="View With 'textAllCaps' Activity"
+        android:name=".ViewWithTextAllCapsActivity" />
+    <activity
+        android:label="Duplicate View Activity"
+        android:name=".DuplicateViewActivity"
+        android:exported="false" />
+     <activity
+        android:label="screen orientation activity"
+        android:name=".ScreenOrientationActivity"
+        android:configChanges="orientation|screenSize"
+        android:exported="false"/>
+    <activity
+        android:label="screen orientation without onConfigurationChanged activity"
+        android:name=".ScreenOrientationWithoutOnConfigurationChangedActivity"
+        android:exported="false"/>
+    <activity
+        android:label="Truncated View Hierarchy Activity"
+        android:name=".TruncatedViewHierarchyActivity"
+        android:exported="false" />
     <service android:name=".ChatHeadService"/>
     <provider
         android:authorities="androidx.test.ui.app.flights"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/BUILD b/testapps/ui_testapp/java/androidx/test/ui/app/BUILD
new file mode 100644
index 000000000..da7314f64
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/BUILD
@@ -0,0 +1,68 @@
+# -*- mode: python; -*-
+#
+# Description:
+#  Test App used for UI Testing Lib integration tests.
+
+load("//build_extensions:jetify.bzl", "jetify_android_binary", "jetify_android_library")
+
+licenses(["notice"])
+
+package(
+    default_applicable_licenses = ["//:license"],
+    default_testonly = 1,
+    default_visibility = [
+        "//opensource/visibility:testing_pkg",
+        "//testapps/ui_testapp/javatests/androidx/test/ui/app:__pkg__",
+    ],
+)
+
+jetify_android_library(
+    name = "lib",
+    srcs = glob(
+        ["**/*.java"],
+    ),
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    jetify_sources = True,
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        "//opensource/androidx:annotation",
+        "@maven//:androidx_appcompat_appcompat",
+        "@maven//:androidx_recyclerview_recyclerview",
+        "@maven//:com_google_android_material_material",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+jetify_android_library(
+    name = "lib_exported",
+    exports_manifest = 1,
+    jetify_sources = True,
+    manifest = "AndroidManifest.xml",
+    exports = [
+        ":lib",
+    ],
+)
+
+jetify_android_library(
+    name = "lib_neverlink",
+    jetify_sources = True,
+    # No other libraries should depend on this one
+    neverlink = 1,
+    exports = [":lib"],
+)
+
+jetify_android_binary(
+    name = "testapp",
+    assets = glob(["assets/**"]),
+    assets_dir = "assets",
+    jetify_sources = True,
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res/**"]),
+    deps = [
+        ":lib",
+        "//core:manifest",
+        "@maven//:androidx_appcompat_appcompat",
+    ],
+)
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/BUILD.bazel b/testapps/ui_testapp/java/androidx/test/ui/app/BUILD.bazel
deleted file mode 100644
index 0c1200c97..000000000
--- a/testapps/ui_testapp/java/androidx/test/ui/app/BUILD.bazel
+++ /dev/null
@@ -1,60 +0,0 @@
-# Description: Test App used for UI Testing Lib integration tests.
-licenses(["notice"])  # Apache License 2.0
-
-package(default_visibility = [
-    "//espresso/core/java/androidx/test/espresso:espresso_pkg",
-    "//testapps/ui_testapp/javatests/androidx/test/ui/app:__pkg__",
-])
-
-android_library(
-    name = "lib",
-    srcs = glob(
-        ["**/*.java"],
-    ),
-    assets = glob(["assets/**"]),
-    assets_dir = "assets",
-    manifest = "AndroidManifest_opensource.xml",
-    resource_files = glob(["res/**"]),
-    deps = [
-        "//:androidx_annotation",
-        "//:androidx_appcompat",
-        "//:androidx_core",
-        "//:androidx_cursoradapter",
-        "//:androidx_drawerlayout",
-        "//:androidx_fragment",
-        "//:androidx_legacy_support_core_ui",
-        "//:androidx_legacy_support_core_utils",
-        "//:androidx_recyclerview",
-        "//:androidx_viewpager",
-        "//:google_android_material",
-        "@maven//:com_google_guava_guava",
-    ],
-)
-
-android_library(
-    name = "lib_neverlink",
-    testonly = 1,
-    # Don't export manifest. This lib is just for compile time dependency and it
-    # should never merged to other libraries manifest files.
-    exports_manifest = 0,
-    # This manifest is unused because this lib does not export the manifest but
-    # is required to make bazel happy.
-    manifest = "AndroidManifest_opensource.xml",
-    # No other libraries should depend on this one
-    neverlink = 1,
-    exports = [":lib"],
-)
-
-android_binary(
-    name = "testapp",
-    testonly = 1,
-    assets = glob(["assets/**"]),
-    assets_dir = "assets",
-    manifest = "AndroidManifest_opensource.xml",
-    multidex = "legacy",
-    resource_files = glob(["res/**"]),
-    deps = [
-        ":lib",
-        "//:androidx_multidex",
-    ],
-)
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadService.java b/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadService.java
index 54df42979..42c31ebdf 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadService.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ChatHeadService.java
@@ -23,7 +23,6 @@
 import android.graphics.PixelFormat;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.os.IBinder;
 import android.util.Log;
 import android.view.Gravity;
@@ -33,6 +32,7 @@
 import android.view.WindowManager;
 import android.view.WindowManager.LayoutParams;
 import android.widget.ImageView;
+import java.util.Locale;
 
 /**
  * Will use WindowManager to create a chat head button on the screen.
@@ -152,14 +152,12 @@ private String getColor(View view) {
     int color = Color.TRANSPARENT;
     Drawable background = view.getBackground();
     if (background instanceof ColorDrawable) {
-      if (Build.VERSION.SDK_INT >= 11) {
-        color = ((ColorDrawable) background).getColor();
-      }
+      color = ((ColorDrawable) background).getColor();
     }
     int red = (color >> 16) & 0xFF;
     int green = (color >> 8) & 0xFF;
     int blue = (color >> 0) & 0xFF;
-    return String.format("RGB(%d,%d,%d)", red, green, blue);
+    return String.format(Locale.ROOT, "RGB(%d,%d,%d)", red, green, blue);
   }
 
   @Override
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterActivity.java
index a29e52bd2..9595444a8 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterActivity.java
@@ -17,9 +17,9 @@
 package androidx.test.ui.app;
 
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
 import android.widget.AdapterView;
 import androidx.cursoradapter.widget.CursorAdapter;
+import androidx.fragment.app.FragmentActivity;
 
 /**
  * An activity displaying an {@link AdapterView} backed by a {@link CursorAdapter}.
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterListFragment.java b/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterListFragment.java
index a9f5d070e..0a820b9d8 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterListFragment.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/CursorAdapterListFragment.java
@@ -19,18 +19,17 @@
 import android.database.MatrixCursor;
 import android.database.MergeCursor;
 import android.os.Bundle;
-import androidx.fragment.app.ListFragment;
 import android.view.View;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import androidx.cursoradapter.widget.CursorAdapter;
 import androidx.cursoradapter.widget.SimpleCursorAdapter;
+import androidx.fragment.app.ListFragment;
 import com.google.common.annotations.VisibleForTesting;
 
-/**
- * A {@link ListFragment} which uses a {@link CursorAdapter} as a data source.
- */
+/** A {@link ListFragment} which uses a {@link CursorAdapter} as a data source. */
+@SuppressWarnings("SetTextI18n")
 public class CursorAdapterListFragment extends ListFragment {
 
   private static final String COLUMN_ID = "_id";
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/DelayedDialogActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/DelayedDialogActivity.java
index 81f2ce18b..c5fefb5a3 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/DelayedDialogActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/DelayedDialogActivity.java
@@ -20,13 +20,13 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.DialogFragment;
 
 /**
  * Displays a {@link DialogFragment} after a delay of {@code 3000} millis to check if {@link
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/DelegatingEditText.java b/testapps/ui_testapp/java/androidx/test/ui/app/DelegatingEditText.java
index a92efd0ec..a368ef263 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/DelegatingEditText.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/DelegatingEditText.java
@@ -27,9 +27,8 @@
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
 
-/**
- * Custom edit text widget.
- */
+/** Custom edit text widget. */
+@SuppressWarnings("SetTextI18n")
 public class DelegatingEditText extends LinearLayout {
 
   private final EditText delegateEditText;
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/DividerItemDecoration.java b/testapps/ui_testapp/java/androidx/test/ui/app/DividerItemDecoration.java
index ee46373bd..e66bd7c8d 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/DividerItemDecoration.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/DividerItemDecoration.java
@@ -21,13 +21,12 @@
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
+import android.view.View;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
-import android.view.View;
 
-/**
- * Simple Decorator which draws a line between each list item. Copied from AOSP.
- */
+/** Simple Decorator which draws a line between each list item. Copied from AOSP. */
+@SuppressWarnings("DuplicateDivider")
 public class DividerItemDecoration extends RecyclerView.ItemDecoration {
 
     private static final int[] ATTRS = new int[]{
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/DrawerActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/DrawerActivity.java
index 83b05b472..6f583205c 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/DrawerActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/DrawerActivity.java
@@ -18,8 +18,6 @@
 
 import android.content.res.Configuration;
 import android.os.Bundle;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
@@ -28,9 +26,12 @@
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.drawerlayout.widget.DrawerLayout;
 
 /** Activity to demonstrate actions on a {@link DrawerLayout}. */
+@SuppressWarnings("SetTextI18n")
 public class DrawerActivity extends AppCompatActivity {
 
   public static final String[] DRAWER_CONTENTS =
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/DuplicateViewActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/DuplicateViewActivity.java
new file mode 100644
index 000000000..5516c12e5
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/DuplicateViewActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.ui.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/** An activity displaying duplicate views for AmbiguousViewMatcher test. */
+public class DuplicateViewActivity extends Activity {
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.duplicate_view_activity);
+  }
+}
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/FragmentStack.java b/testapps/ui_testapp/java/androidx/test/ui/app/FragmentStack.java
index b56ff8a5d..72c351ae8 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/FragmentStack.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/FragmentStack.java
@@ -27,9 +27,8 @@
 import android.widget.Button;
 import android.widget.TextView;
 
-/**
- * Displays a counter using fragments.
- */
+/** Displays a counter using fragments. */
+@SuppressWarnings("SetTextI18n")
 public class FragmentStack extends Activity {
   int stackLevel = 1;
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ItemListAdapter.java b/testapps/ui_testapp/java/androidx/test/ui/app/ItemListAdapter.java
index 43d11b1b1..feb8ac2d8 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/ItemListAdapter.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ItemListAdapter.java
@@ -20,17 +20,15 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkPositionIndex;
 
-import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
 import java.util.List;
 
-/**
- * An {@link androidx.recyclerview.widget.RecyclerView.Adapter} with a list of String items.
- */
+/** An {@link androidx.recyclerview.widget.RecyclerView.Adapter} with a list of String items. */
 public class ItemListAdapter extends RecyclerView.Adapter<ItemListAdapter.ItemViewHolder> {
 
   private final LayoutInflater inflater;
@@ -63,7 +61,6 @@ public final int getItemViewType(int position) {
 
   @Override
   public void onBindViewHolder(ItemViewHolder itemHolder, int position) {
-    items.get(position);
     itemHolder.textView.setText(items.get(position));
   }
 
@@ -72,9 +69,7 @@ public int getItemCount() {
     return items.size();
   }
 
-  /**
-   * {@link androidx.recyclerview.widget.RecyclerView.ViewHolder} used for list items.
-   */
+  /** {@link androidx.recyclerview.widget.RecyclerView.ViewHolder} used for list items. */
   public static class ItemViewHolder extends RecyclerView.ViewHolder {
 
     public TextView textView;
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/LargeViewActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/LargeViewActivity.java
index 861830aca..317939dfa 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/LargeViewActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/LargeViewActivity.java
@@ -23,9 +23,8 @@
 import android.view.View;
 import android.widget.TextView;
 
-/**
- * Activity that contains a {@link TextView} larger than the display.
- */
+/** Activity that contains a {@link TextView} larger than the display. */
+@SuppressWarnings("SetTextI18n")
 public class LargeViewActivity extends Activity {
 
   @Override
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/LayoutIssuesActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/LayoutIssuesActivity.java
index 221b4e612..0a82b3144 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/LayoutIssuesActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/LayoutIssuesActivity.java
@@ -22,9 +22,8 @@
 import android.widget.Button;
 import android.widget.TextView;
 
-/**
- * Activity designed to have layout issues in it for testing purposes.
- */
+/** Activity designed to have layout issues in it for testing purposes. */
+@SuppressWarnings("SetTextI18n")
 public class LayoutIssuesActivity extends Activity {
 
   @Override
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/LongListActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/LongListActivity.java
index 6ece72352..8b832e144 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/LongListActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/LongListActivity.java
@@ -34,9 +34,8 @@
 import java.util.List;
 import java.util.Map;
 
-/**
- * An activity displaying a long list.
- */
+/** An activity displaying a long list. */
+@SuppressWarnings("SetTextI18n")
 public class LongListActivity extends Activity {
 
   @VisibleForTesting
@@ -62,37 +61,43 @@ public void onCreate(Bundle bundle) {
     int[] to = new int[] {R.id.item_content, R.id.item_size};
     layoutInflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-    ListAdapter adapter = new SimpleAdapter(this, data, R.layout.list_item, from, to) {
-      @Override
-      public View getView(final int position, View convertView, ViewGroup parent) {
-        if (convertView == null) {
-          convertView = layoutInflater.inflate(R.layout.list_item, null);
-        }
+    ListAdapter adapter =
+        new SimpleAdapter(this, data, R.layout.list_item, from, to) {
+          @Override
+          @SuppressWarnings("InflateParams")
+          public View getView(final int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+              convertView = layoutInflater.inflate(R.layout.list_item, null);
+            }
 
-        TextView textViewOne = (TextView) convertView.findViewById(R.id.item_content);
-        if (textViewOne != null) {
-          textViewOne.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-              ((TextView) findViewById(R.id.selection_row_value)).setText(String.valueOf(position));
-              ((TextView) findViewById(R.id.selection_column_value)).setText("1");
+            TextView textViewOne = (TextView) convertView.findViewById(R.id.item_content);
+            if (textViewOne != null) {
+              textViewOne.setOnClickListener(
+                  new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                      ((TextView) findViewById(R.id.selection_row_value))
+                          .setText(String.valueOf(position));
+                      ((TextView) findViewById(R.id.selection_column_value)).setText("1");
+                    }
+                  });
             }
-          });
-        }
 
-        TextView textViewTwo = (TextView) convertView.findViewById(R.id.item_size);
-        if (textViewTwo != null) {
-          textViewTwo.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-              ((TextView) findViewById(R.id.selection_row_value)).setText(String.valueOf(position));
-              ((TextView) findViewById(R.id.selection_column_value)).setText("2");
+            TextView textViewTwo = (TextView) convertView.findViewById(R.id.item_size);
+            if (textViewTwo != null) {
+              textViewTwo.setOnClickListener(
+                  new OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                      ((TextView) findViewById(R.id.selection_row_value))
+                          .setText(String.valueOf(position));
+                      ((TextView) findViewById(R.id.selection_column_value)).setText("2");
+                    }
+                  });
             }
-          });
-        }
-        return super.getView(position, convertView, parent);
-      }
-    };
+            return super.getView(position, convertView, parent);
+          }
+        };
 
     View footerView = layoutInflater.inflate(R.layout.list_item, listView, false);
     ((TextView) footerView.findViewById(R.id.item_content)).setText("count:");
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/MenuActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/MenuActivity.java
index ad37573e6..9929fb21d 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/MenuActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/MenuActivity.java
@@ -17,7 +17,6 @@
 package androidx.test.ui.app;
 
 import android.app.Activity;
-import android.os.Build;
 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
@@ -71,15 +70,10 @@ public boolean onContextItemSelected(MenuItem item) {
   }
 
   public void showPopup(View view) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-      TextView text = (TextView) findViewById(R.id.text_menu_result);
-      text.setText("Not supported in API " + Build.VERSION.SDK_INT);
-    } else {
-      PopupMenu popup = new PopupMenu(this, view);
-      popup.setOnMenuItemClickListener(new PopupMenuListener());
-      popup.getMenuInflater().inflate(R.menu.popupmenu, popup.getMenu());
-      popup.show();
-    }
+    PopupMenu popup = new PopupMenu(this, view);
+    popup.setOnMenuItemClickListener(new PopupMenuListener());
+    popup.getMenuInflater().inflate(R.menu.popupmenu, popup.getMenu());
+    popup.show();
   }
 
   @Override
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/NavigationViewActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/NavigationViewActivity.java
index 750e7e98d..003c89143 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/NavigationViewActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/NavigationViewActivity.java
@@ -18,12 +18,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.core.view.GravityCompat;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.MenuItem;
 import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import com.google.android.material.navigation.NavigationView;
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/PickersActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/PickersActivity.java
index f593d41d8..fa52d93a0 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/PickersActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/PickersActivity.java
@@ -22,16 +22,17 @@
 import android.app.TimePickerDialog;
 import android.app.TimePickerDialog.OnTimeSetListener;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.FragmentActivity;
 import android.text.TextUtils;
 import android.text.format.Time;
 import android.view.View;
 import android.widget.DatePicker;
 import android.widget.TextView;
 import android.widget.TimePicker;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.FragmentActivity;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
+import java.util.Locale;
 
 /**
  * An activity that let's you pick a date {@link DatePicker} and time {@link TimePicker} and
@@ -147,7 +148,8 @@ public void onTimeSet(TimePicker view, int hourOfDay, int minuteOfHour) {
    */
   public static class PickerHelper {
 
-    private static final SimpleDateFormat DATE_FORMAT_MMDDyyyy = new SimpleDateFormat("MM/dd/yyyy");
+    private static final SimpleDateFormat DATE_FORMAT_MMDDyyyy =
+        new SimpleDateFormat("MM/dd/yyyy", Locale.US);
     private static final String TIME_FORMAT_HM = "%H:%M";
 
     private PickerHelper() {
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewActivity.java
index 4292f66c7..404d082ce 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewActivity.java
@@ -17,14 +17,14 @@
 package androidx.test.ui.app;
 
 import android.os.Bundle;
+import android.util.Log;
+import android.util.SparseArray;
+import android.view.ViewGroup;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
-import 	androidx.recyclerview.widget.StaggeredGridLayoutManager;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.ViewGroup;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import androidx.test.ui.app.RecyclerViewFragment.LayoutManagerType;
 import androidx.viewpager.widget.ViewPager;
 import com.google.common.annotations.VisibleForTesting;
@@ -66,8 +66,8 @@ public void addItems(String newItem) {
   }
 
   /**
-   * The {@link androidx.fragment.app.FragmentPagerAdapter} to display the different
-   * {@link androidx.test.ui.app.RecyclerViewFragment}s
+   * The {@link androidx.fragment.app.FragmentPagerAdapter} to display the different {@link
+   * androidx.test.ui.app.RecyclerViewFragment}s
    */
   private static class RecyclerViewPagerAdapter extends FragmentPagerAdapter {
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewFragment.java b/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewFragment.java
index 7ca73daec..f08ec6b64 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewFragment.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/RecyclerViewFragment.java
@@ -19,20 +19,20 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.core.view.GestureDetectorCompat;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.RecyclerView.LayoutManager;
-import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
-import 	androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.GestureDetector.SimpleOnGestureListener;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.LayoutManager;
+import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import com.google.common.collect.Lists;
 import java.util.List;
 
@@ -55,8 +55,8 @@ public class RecyclerViewFragment extends Fragment implements OnItemTouchListene
   private ItemListAdapter adapter;
 
   /**
-   * The type of {@link androidx.recyclerview.widget.RecyclerView.LayoutManager} that will be used to
-   * render the content of the {@link androidx.recyclerview.widget.RecyclerView}
+   * The type of {@link androidx.recyclerview.widget.RecyclerView.LayoutManager} that will be used
+   * to render the content of the {@link androidx.recyclerview.widget.RecyclerView}
    */
   public enum LayoutManagerType {
     LINEAR(R.layout.rv_llm_fragment, R.id.rv_llm_item_list, R.id.rv_llm_selected_item),
@@ -98,9 +98,8 @@ public int getSelectedItemId() {
   ;
 
   /**
-   * Factory method to create an instance of
-   * {@link androidx.test.ui.app.RecyclerViewFragment}
-   * with a particular {@link androidx.recyclerview.widget.RecyclerView.LayoutManager}
+   * Factory method to create an instance of {@link androidx.test.ui.app.RecyclerViewFragment} with
+   * a particular {@link androidx.recyclerview.widget.RecyclerView.LayoutManager}
    *
    * @param layoutManagerType the layout manager to render the content
    * @return fragment instance
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/RuntimePermissionsActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/RuntimePermissionsActivity.java
index ca9d349b4..08e45b08e 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/RuntimePermissionsActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/RuntimePermissionsActivity.java
@@ -20,15 +20,16 @@
 
 import android.Manifest;
 import android.accounts.AccountManager;
+import android.annotation.SuppressLint;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.telephony.TelephonyManager;
 import android.view.View;
 import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 
@@ -117,16 +118,17 @@ private boolean checkPermissionOrRequest(String permission, int requestCode, Run
 
   /**
    * This method purely serves the purpose of using an API which is guarded by a dangerous runtime
-   * permission. In this case {@link TelephonyManager#getDeviceId()} requires {@link
+   * permission. In this case {@link TelephonyManager#getVoiceMailNumber()} requires {@link
    * Manifest.permission#READ_PHONE_STATE}
    */
-  private void getDeviceId() {
+  @SuppressLint("MissingPermission")
+  private void getVoiceMailNumber() {
     ((TelephonyManager) getSystemService(RuntimePermissionsActivity.TELEPHONY_SERVICE))
-        .getDeviceId();
+        .getVoiceMailNumber();
   }
 
   private void updateReadPhoneStatePermissionsGranted() {
-    getDeviceId();
+    getVoiceMailNumber();
     updateGrantedUi(mPhoneStatePermissionStatus);
   }
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ScreenOrientationActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/ScreenOrientationActivity.java
new file mode 100644
index 000000000..c184e74c3
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ScreenOrientationActivity.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.ui.app;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+/** Activity that updates a TextView when its screen orientation is changed. */
+public class ScreenOrientationActivity extends Activity {
+  private static final String TAG = "ScreenOrientActivity";
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.screen_orientation_activity);
+
+    // Set orientation in onCreate the first time it's called.
+    TextView textView = (TextView) findViewById(R.id.current_screen_orientation);
+    if (textView
+        .getText()
+        .toString()
+        .equals(getResources().getString(R.string.screen_orientation_text))) {
+      String orientation = setOrientationString(getResources().getConfiguration().orientation);
+      Log.d(TAG, "onCreate. Orientation set to " + orientation);
+    }
+  }
+
+  @Override
+  public void onConfigurationChanged(Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    String newOrientation = setOrientationString(newConfig.orientation);
+    Log.d(TAG, "onConfigurationChanged. New orientation is " + newOrientation);
+  }
+
+  private String setOrientationString(int orientation) {
+    String orientationString;
+    if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      orientationString = "landscape";
+    } else {
+      orientationString = "portrait";
+    }
+
+    TextView textView = (TextView) findViewById(R.id.current_screen_orientation);
+    textView.setText(orientationString);
+    return orientationString;
+  }
+}
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ScreenOrientationWithoutOnConfigurationChangedActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/ScreenOrientationWithoutOnConfigurationChangedActivity.java
new file mode 100644
index 000000000..906fc5032
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ScreenOrientationWithoutOnConfigurationChangedActivity.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.ui.app;
+
+import android.app.Activity;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.TextView;
+
+/** Activity that updates a TextView when its screen orientation is changed. */
+public class ScreenOrientationWithoutOnConfigurationChangedActivity extends Activity {
+  private static final String TAG =
+      ScreenOrientationWithoutOnConfigurationChangedActivity.class.getSimpleName();
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.screen_orientation_without_onconfigurationchanged_activity);
+
+    String orientation = setOrientationString(getResources().getConfiguration().orientation);
+    Log.d(TAG, "onCreate. Orientation set to " + orientation);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    String orientation = setOrientationString(getResources().getConfiguration().orientation);
+    Log.d(TAG, "onResume. Orientation set to " + orientation);
+  }
+
+  private String setOrientationString(int orientation) {
+    String orientationString;
+    if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+      orientationString = "landscape";
+    } else {
+      orientationString = "portrait";
+    }
+
+    TextView textView = (TextView) findViewById(R.id.screen_orientation);
+    textView.setText(orientationString);
+    return orientationString;
+  }
+}
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/SendActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/SendActivity.java
index 5165b4b59..5b96434e4 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/SendActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/SendActivity.java
@@ -22,7 +22,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.view.Gravity;
@@ -30,6 +29,7 @@
 import android.view.MenuInflater;
 import android.view.View;
 import android.view.View.OnKeyListener;
+import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputMethodManager;
@@ -40,9 +40,8 @@
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
-/**
- * Simple activity used for validating intent sending and UI behavior.
- */
+/** Simple activity used for validating intent sending and UI behavior. */
+@SuppressWarnings("SetTextI18n")
 public class SendActivity extends Activity {
 
   private static final int PICK_CONTACT_REQUEST = 1;  // The request code
@@ -172,7 +171,8 @@ public void onClick(DialogInterface dialog, int choice) {
   }
 
   public boolean showPopupView(View view) {
-    View content = getLayoutInflater().inflate(R.layout.popup_window, null, false);
+    View content =
+        getLayoutInflater().inflate(R.layout.popup_window, (ViewGroup) view.getRootView(), false);
     popupWindow = new PopupWindow(content, LayoutParams.WRAP_CONTENT,
         LayoutParams.WRAP_CONTENT, true);
     content.setOnClickListener(new View.OnClickListener() {
@@ -188,10 +188,6 @@ public void onClick(View view) {
   }
 
   public boolean showPopupMenu(View view) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
-      return false;
-    }
-
     PopupMenu popup = new PopupMenu(this, view);
     MenuInflater inflater = popup.getMenuInflater();
     inflater.inflate(R.menu.popup_menu, popup.getMenu());
@@ -200,8 +196,10 @@ public boolean showPopupMenu(View view) {
   }
 
   public void pickContact(@SuppressWarnings("unused") View view) {
-    Intent pickContactIntent = new Intent(Intent.ACTION_PICK, Uri.parse("content://contacts"));
-    pickContactIntent.setType(Phone.CONTENT_TYPE); // Show user only contacts w/ phone numbers
+    Intent pickContactIntent = new Intent(Intent.ACTION_PICK);
+    pickContactIntent.setDataAndType(
+        Uri.parse("content://contacts"),
+        Phone.CONTENT_TYPE); // Show user only contacts w/ phone numbers
     startActivityForResult(pickContactIntent, PICK_CONTACT_REQUEST);
   }
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/SimplePagerAdapter.java b/testapps/ui_testapp/java/androidx/test/ui/app/SimplePagerAdapter.java
index 744b3fdd9..4b865c053 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/SimplePagerAdapter.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/SimplePagerAdapter.java
@@ -23,6 +23,7 @@
 import android.widget.TextView;
 import androidx.viewpager.widget.PagerAdapter;
 
+@SuppressWarnings("SetTextI18n")
 class SimplePagerAdapter extends PagerAdapter {
 
   private static final int[] COLORS = {
@@ -49,6 +50,7 @@ public int getItemPosition(Object object) {
   }
 
   @Override
+  @SuppressWarnings("InflateParams")
   public Object instantiateItem(ViewGroup container, int position) {
     LayoutInflater inflater = LayoutInflater.from(container.getContext());
     View view = inflater.inflate(R.layout.pager_view, null);
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabLayout.java b/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabLayout.java
index 6e1287c56..3e4ecdd8d 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabLayout.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabLayout.java
@@ -33,14 +33,19 @@
 
 /**
  * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
- * the user's scroll progress. <p> To use the component, simply add it to your view hierarchy. Then
- * in your {@link android.app.Activity} or {@link androidx.fragment.app.Fragment} call {@link
- * #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for. <p> The
- * colors can be customized in two ways. The first and simplest is to provide an array of colors via
- * {@link #setSelectedIndicatorColors(int...)}. The alternative is via the {@link TabColorizer}
- * interface which provides you complete control over which color is used for any individual
- * position. <p> The views used as tabs can be customized by calling {@link #setCustomTabView(int,
- * int)}, providing the layout ID of your custom layout.
+ * the user's scroll progress.
+ *
+ * <p>To use the component, simply add it to your view hierarchy. Then in your {@link
+ * android.app.Activity} or {@link androidx.fragment.app.Fragment} call {@link
+ * #setViewPager(ViewPager)} providing it the ViewPager this layout is being used for.
+ *
+ * <p>The colors can be customized in two ways. The first and simplest is to provide an array of
+ * colors via {@link #setSelectedIndicatorColors(int...)}. The alternative is via the {@link
+ * TabColorizer} interface which provides you complete control over which color is used for any
+ * individual position.
+ *
+ * <p>The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
+ * providing the layout ID of your custom layout.
  */
 public class SlidingTabLayout extends HorizontalScrollView {
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabStrip.java b/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabStrip.java
index 838854ff1..845a9f582 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabStrip.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/SlidingTabStrip.java
@@ -17,7 +17,6 @@
 
 package androidx.test.ui.app;
 
-import android.R;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ -59,7 +58,7 @@ class SlidingTabStrip extends LinearLayout {
         final float density = getResources().getDisplayMetrics().density;
 
         TypedValue outValue = new TypedValue();
-        context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
+    context.getTheme().resolveAttribute(android.R.attr.colorForeground, outValue, true);
         final int themeForegroundColor =  outValue.data;
 
         mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/ToolbarActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/ToolbarActivity.java
index 4eb6416e9..86021d514 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/ToolbarActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/ToolbarActivity.java
@@ -17,11 +17,11 @@
 package androidx.test.ui.app;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 /**
  * Shows Toolbar as ActionBar with action items, including an overflow. Shows second toolbar with
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/TransitionActivityMain.java b/testapps/ui_testapp/java/androidx/test/ui/app/TransitionActivityMain.java
index 6251413b3..a23f51862 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/TransitionActivityMain.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/TransitionActivityMain.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.core.util.Pair;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -30,6 +29,7 @@
 import android.widget.Toast;
 import androidx.core.app.ActivityCompat;
 import androidx.core.app.ActivityOptionsCompat;
+import androidx.core.util.Pair;
 
 /**
  * Our main Activity in this sample. Displays a transition_grid of items whith an image and title.
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java
index 5b7d41876..d76a11020 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/TransitionDetailActivity.java
@@ -19,10 +19,10 @@
 import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
-import androidx.core.view.ViewCompat;
 import android.transition.Transition;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.core.view.ViewCompat;
 
 /**
  * Our secondary Activity which is launched from {@link TransitionActivityMain}.
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/TruncatedViewHierarchyActivity.java b/testapps/ui_testapp/java/androidx/test/ui/app/TruncatedViewHierarchyActivity.java
new file mode 100644
index 000000000..0ac616e02
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/TruncatedViewHierarchyActivity.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.ui.app;
+
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.FrameLayout;
+import android.widget.FrameLayout.LayoutParams;
+import android.widget.TextView;
+import java.util.Locale;
+
+/** An activity displaying many views, enough to truncate view hierarchy during tests. */
+public class TruncatedViewHierarchyActivity extends Activity {
+
+  public static final String LEVEL_INTENT_KEY =
+      "androidx.test.ui.app.TruncatedViewHierarchyActivity.LEVEL";
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.truncated_view_activity);
+
+    int level = 3;
+    Intent intent = getIntent();
+    if (intent != null) {
+      level = intent.getIntExtra(LEVEL_INTENT_KEY, level);
+    }
+
+    FrameLayout container = findViewById(R.id.container);
+    insertGroup(container, level, 800, 0, 0);
+  }
+
+  private void insertGroup(FrameLayout container, int level, int size, int offsetX, int offsetY) {
+    FrameLayout group = new FrameLayout(container.getContext());
+    LayoutParams params = new LayoutParams(size, size);
+    params.leftMargin = offsetX;
+    params.topMargin = offsetY;
+    int id = Integer.parseInt(String.format(Locale.US, "%d%03d%03d", level, offsetX, offsetY));
+    group.setId(id);
+    container.addView(group, params);
+
+    TextView text = new TextView(container.getContext());
+    LayoutParams paramsTxt = new LayoutParams(WRAP_CONTENT, WRAP_CONTENT);
+    paramsTxt.leftMargin = level;
+    paramsTxt.topMargin = level;
+    text.setText(String.format(Locale.US, "%d - %d - %dx%d", level, size, offsetX, offsetY));
+    text.setId(id + 1);
+    group.addView(text, paramsTxt);
+
+    if (level > 0) {
+      int size2 = size / 2;
+      int level1 = level - 1;
+      insertGroup(group, level1, size2, offsetX, offsetY);
+      insertGroup(group, level1, size2, offsetX + size2, offsetY);
+      insertGroup(group, level1, size2, offsetX + size2, offsetY);
+      insertGroup(group, level1, size2, offsetX, offsetY + size2);
+    }
+  }
+}
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/provider/FlightsContentProvider.java b/testapps/ui_testapp/java/androidx/test/ui/app/provider/FlightsContentProvider.java
index 9b3730f6d..76b05d443 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/provider/FlightsContentProvider.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/provider/FlightsContentProvider.java
@@ -30,10 +30,10 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;
 import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.test.ui.app.provider.FlightsDatabaseContract.FlightsColumns;
 
 /**
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/provider/SimpleFileContentProvider.java b/testapps/ui_testapp/java/androidx/test/ui/app/provider/SimpleFileContentProvider.java
index dc44db392..d7b68f68d 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/provider/SimpleFileContentProvider.java
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/provider/SimpleFileContentProvider.java
@@ -24,15 +24,14 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.ParcelFileDescriptor;
-import androidx.annotation.NonNull;
 import android.util.Log;
 import android.webkit.MimeTypeMap;
+import androidx.annotation.NonNull;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Locale;
 
 /**
  * A ContentProvider to provide read/write access to files in a hosted directory.
@@ -81,7 +80,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode)
       throws FileNotFoundException {
     checkNotNull(uri);
     checkNotNull(mode);
-    String lowerMode = mode.toLowerCase();
+    String lowerMode = mode.toLowerCase(Locale.ROOT);
     boolean withWriteAccess = lowerMode.contains("w") || lowerMode.contains("t");
     if (withWriteAccess) {
       // Requires caller has WRITE_EXTERNAL_STORAGE permission for "w" or "t"
@@ -101,7 +100,7 @@ public ParcelFileDescriptor openFile(@NonNull Uri uri, @NonNull String mode)
           String.format("error happened creating parent dir for file %s", requestedFile));
     }
 
-    return ParcelFileDescriptor.open(requestedFile, parseMode(mode));
+    return ParcelFileDescriptor.open(requestedFile, ParcelFileDescriptor.parseMode(mode));
   }
 
   @Override
@@ -145,32 +144,4 @@ private File getFileFromUri(Uri uri) throws FileNotFoundException {
         String.format("Uri %s refers to a file not managed by this provider", uri));
   }
 
-  private static int parseMode(String mode) {
-    if (VERSION.SDK_INT >= VERSION_CODES.KITKAT) {
-      return ParcelFileDescriptor.parseMode(mode);
-    } else {
-      final int modeBits;
-      if ("r".equals(mode)) {
-        modeBits = ParcelFileDescriptor.MODE_READ_ONLY;
-      } else if ("w".equals(mode) || "wt".equals(mode)) {
-        modeBits = ParcelFileDescriptor.MODE_WRITE_ONLY
-            | ParcelFileDescriptor.MODE_CREATE
-            | ParcelFileDescriptor.MODE_TRUNCATE;
-      } else if ("wa".equals(mode)) {
-        modeBits = ParcelFileDescriptor.MODE_WRITE_ONLY
-            | ParcelFileDescriptor.MODE_CREATE
-            | ParcelFileDescriptor.MODE_APPEND;
-      } else if ("rw".equals(mode)) {
-        modeBits = ParcelFileDescriptor.MODE_READ_WRITE
-            | ParcelFileDescriptor.MODE_CREATE;
-      } else if ("rwt".equals(mode)) {
-        modeBits = ParcelFileDescriptor.MODE_READ_WRITE
-            | ParcelFileDescriptor.MODE_CREATE
-            | ParcelFileDescriptor.MODE_TRUNCATE;
-      } else {
-        throw new IllegalArgumentException("Bad mode '" + mode + "'");
-      }
-      return modeBits;
-    }
-  }
 }
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/activity_runtime_permissions.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/activity_runtime_permissions.xml
index 1f0c8abc1..45465cc82 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/activity_runtime_permissions.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/activity_runtime_permissions.xml
@@ -23,7 +23,7 @@
     android:orientation="vertical"
     tools:context="androidx.test.ui.app.RuntimePermissionsActivity">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/duplicate_view_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/duplicate_view_activity.xml
new file mode 100644
index 000000000..60a2cb31d
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/duplicate_view_activity.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/text_hello"
+      android:text="@string/hello_world"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+
+  <TextView
+      android:id="@+id/duplicate_view_text_1"
+      android:text="@string/text_simple"
+      android:layout_below="@id/text_hello"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+
+  <TextView
+      android:id="@+id/duplicate_view_text_2"
+      android:text="@string/text_simple"
+      android:layout_below="@id/duplicate_view_text_1"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/dynamic_web_view_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/dynamic_web_view_activity.xml
index 071ed19ae..59524912a 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/dynamic_web_view_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/dynamic_web_view_activity.xml
@@ -16,112 +16,111 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:layout_alignParentRight="true"
     android:layout_alignParentTop="true"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
-    <LinearLayout
+  <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content">
-      <Button
+    <Button
         android:id="@+id/go_dyn_url"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="GOTO"/>
-      <EditText
+        android:text="GOTO" />
+    <EditText
         android:id="@+id/dyn_url"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:imeOptions="actionDone"
-        android:text=""/>
-    </LinearLayout>
+        android:inputType="textUri"
+        android:text="" />
+  </LinearLayout>
 
-    <LinearLayout
+  <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content">
-      <TextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-        android:text="Redirect Count"/>
-      <Button
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Redirect Count" />
+    <Button
         android:id="@+id/redirect_increment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="+"/>
-      <TextView
+        android:text="+" />
+    <TextView
         android:id="@+id/redirect_val"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="0"/>
-      <Button
+        android:text="0" />
+    <Button
         android:id="@+id/redirect_decrement"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:enabled="false"
-        android:text="-"/>
-    </LinearLayout>
-    <LinearLayout
+        android:text="-" />
+  </LinearLayout>
+  <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Delay (Secs)"/>
+        android:text="Delay (Secs)" />
     <Button
         android:id="@+id/delay_increment"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="+"/>
-      <TextView
+        android:text="+" />
+    <TextView
         android:id="@+id/delay_val"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="0"/>
-      <Button
+        android:text="0" />
+    <Button
         android:id="@+id/delay_decrement"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:enabled="false"
-        android:text="-"/>
-    </LinearLayout>
+        android:text="-" />
+  </LinearLayout>
 
-    <LinearLayout
+  <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content">
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Override url"
-        />
+        android:text="Override url" />
     <CheckBox
+        android:id="@+id/naive_override"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-      android:id="@+id/naive_override"/>
-    </LinearLayout>
+        android:layout_height="wrap_content" />
+  </LinearLayout>
 
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:id="@+id/override_message"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:id="@+id/page_change_message"/>
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:id="@+id/progress_value"/>
-    <WebView
-        android:id="@+id/dynamic_web_view"
-        android:layout_width="fill_parent"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:layout_height="fill_parent"/>
+  <TextView
+      android:id="@+id/override_message"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="?android:attr/textAppearanceSmall" />
+  <TextView
+      android:id="@+id/page_change_message"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="?android:attr/textAppearanceSmall" />
+  <TextView
+      android:id="@+id/progress_value"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:textAppearance="?android:attr/textAppearanceSmall" />
+  <WebView
+      android:id="@+id/dynamic_web_view"
+      android:layout_width="fill_parent"
+      android:layout_height="fill_parent"
+      android:focusable="true"
+      android:focusableInTouchMode="true" />
 </LinearLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/gesture_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/gesture_activity.xml
index d2bf3f709..d8b0db2cb 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/gesture_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/gesture_activity.xml
@@ -74,6 +74,7 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:clickable="true"
+        android:focusable="true"
         android:gravity="top"
         android:onClick="areaClicked" />
 
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/keyboard_test_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/keyboard_test_activity.xml
index d1b720dc0..aeda80383 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/keyboard_test_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/keyboard_test_activity.xml
@@ -38,6 +38,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
+        android:inputType="text"
         android:hint="@string/type_something"/>
 
     <RelativeLayout
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/largeview_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/largeview_activity.xml
index 735afbd59..0ec27edf3 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/largeview_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/largeview_activity.xml
@@ -26,6 +26,7 @@
         android:layout_height="94105dp"
         android:onClick="largeViewClicked"
         android:clickable="true"
+        android:focusable="true"
         android:text="large view" />
 
 </LinearLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/layout_issues_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/layout_issues_activity.xml
index 101f6bcea..d0031dec2 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/layout_issues_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/layout_issues_activity.xml
@@ -73,6 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:ems="10"
+            android:inputType="text"
             android:text="text on the left" />
 
         <Button
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/navigation_view_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/navigation_view_activity.xml
index 6c5852ce5..15210da96 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/navigation_view_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/navigation_view_activity.xml
@@ -29,7 +29,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
       android:id="@+id/toolbar"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/padding_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/padding_activity.xml
index 723056afa..033a99854 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/padding_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/padding_activity.xml
@@ -33,6 +33,7 @@
             android:layout_marginTop="2000dp"
             android:padding="120dp"
             android:layout_marginBottom="20dp"
+            android:inputType="text"
             android:text="test_data" />
     </LinearLayout>
 </ScrollView>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_glm_fragment.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_glm_fragment.xml
index 7e0963afb..53835568c 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_glm_fragment.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_glm_fragment.xml
@@ -28,7 +28,7 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="@string/selected_item_default_text"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_glm_item_list"
             android:scrollbars="vertical"
             android:layout_width="match_parent"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_llm_fragment.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_llm_fragment.xml
index 905e1575c..f3302e1eb 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_llm_fragment.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_llm_fragment.xml
@@ -28,7 +28,7 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="@string/selected_item_default_text"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_llm_item_list"
             android:scrollbars="vertical"
             android:layout_width="match_parent"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_sglm_fragment.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_sglm_fragment.xml
index a2726a133..e212d3cd5 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_sglm_fragment.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/rv_sglm_fragment.xml
@@ -28,7 +28,7 @@
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:text="@string/selected_item_default_text"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_sglm_item_list"
             android:scrollbars="vertical"
             android:layout_width="match_parent"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/scaledview_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/scaledview_activity.xml
index 667944c42..40b81b3a9 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/scaledview_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/scaledview_activity.xml
@@ -25,6 +25,7 @@
         android:layout_width="100dp"
         android:layout_height="100dp"
         android:background="#0594ED"
-        android:clickable="true" />
+        android:clickable="true"
+        android:focusable="true" />
 
 </LinearLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/screen_orientation_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/screen_orientation_activity.xml
new file mode 100644
index 000000000..be6b9fd54
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/screen_orientation_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/current_screen_orientation"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/screen_orientation_text" />
+
+</LinearLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/screen_orientation_without_onconfigurationchanged_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/screen_orientation_without_onconfigurationchanged_activity.xml
new file mode 100644
index 000000000..805fbc8e2
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/screen_orientation_without_onconfigurationchanged_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/screen_orientation"
+        android:layout_width="fill_parent"
+        android:layout_height="94105dp"
+        android:text="@string/screen_orientation_text" />
+
+</LinearLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/send_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/send_activity.xml
index b71d31354..c764039a3 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/send_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/send_activity.xml
@@ -39,6 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:clickable="true"
+            android:focusable="true"
             android:onClick="sendData"
             android:text="@string/send_title"
             android:textAppearance="?android:attr/textAppearanceLarge" />
@@ -49,6 +50,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:ems="10"
+            android:inputType="text"
             android:hint="@string/send_hint" />
 
         <Button
@@ -64,6 +66,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
+            android:inputType="text"
             android:ems="10"
             android:hint="@string/enter_hint" />
 
@@ -89,6 +92,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:ems="10"
+            android:inputType="textMultiLine"
             android:hint="@string/send_hint_for_call" />
 
         <Button
@@ -113,6 +117,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:ems="10"
+            android:inputType="text"
             android:hint="@string/send_hint"
             android:text="@string/send_data_to_message_edit_text" />
 
@@ -138,6 +143,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:ems="10"
+            android:inputType="text"
             android:hint="@string/send_hint" />
 
         <Button
@@ -184,6 +190,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
             android:ems="10"
+            android:inputType="text"
             android:hint="@string/send_hint_to_market" />
 
         <Button
@@ -314,6 +321,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="1000dp"
             android:clickable="true"
+            android:focusable="true"
             android:onClick="sendData"
             android:text="@string/send_title" />
     </LinearLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/simple_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/simple_activity.xml
index 5b1dfe0ad..6e8f89220 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/simple_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/simple_activity.xml
@@ -69,6 +69,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:ems="10"
+            android:inputType="text"
             android:hint="@string/send_hint" />
 
         <Button
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/toolbar_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/toolbar_activity.xml
index ca02942a1..b317a19e8 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/toolbar_activity.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/toolbar_activity.xml
@@ -19,7 +19,7 @@
               android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent">
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
@@ -32,12 +32,12 @@
             android:layout_height="match_parent"
             android:padding="12dp"
             android:background="@color/background_material_light"
-            android:layout_below="@id/toolbar">
+           >
         <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar_over_text"
                     android:layout_height="wrap_content"
                     android:layout_width="match_parent"
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/truncated_view_activity.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/truncated_view_activity.xml
new file mode 100644
index 000000000..b543b3f88
--- /dev/null
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/layout/truncated_view_activity.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+  <TextView
+      android:id="@+id/text_hello"
+      android:text="@string/hello_world"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="bottom|center"/>
+
+</FrameLayout>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/menu/actionbar_search_actions.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/menu/actionbar_search_actions.xml
index 6f1325f21..ee5659b23 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/menu/actionbar_search_actions.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/menu/actionbar_search_actions.xml
@@ -16,14 +16,14 @@
   -->
 
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:yourapp="http://schemas.android.com/apk/res-auto" >
+    xmlns:app="http://schemas.android.com/apk/res-auto" >
 
     <item
         android:id="@+id/menu_search"
         android:title="Search"
         android:icon="@drawable/ic_action_search"
-        android:showAsAction="ifRoom|collapseActionView"
-        yourapp:actionViewClass="android.support.v7.widget.SearchView"
-        yourapp:showAsAction="ifRoom|collapseActionView"/>
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="ifRoom|collapseActionView"
+        />
 
 </menu>
diff --git a/testapps/ui_testapp/java/androidx/test/ui/app/res/values/strings.xml b/testapps/ui_testapp/java/androidx/test/ui/app/res/values/strings.xml
index 1bfc2f178..fb2fbb745 100644
--- a/testapps/ui_testapp/java/androidx/test/ui/app/res/values/strings.xml
+++ b/testapps/ui_testapp/java/androidx/test/ui/app/res/values/strings.xml
@@ -33,6 +33,10 @@
   <string name="enter_hint">Type text and press Enter</string>
   <string name="launch_list_activity">Launch list_activity</string>
   <string name="launch_scroll_activity">Launch scroll_activity</string>
+  <string name="screen_orientation_text"
+          description="Displays the current orientation of the test device [CHAR_LIMIT=NONE]">
+    screen orientation has not been set
+  </string>
   <string name="send_data_to_message_edit_text">send_data_to_message_edit_text</string>
   <string name="send_hint">Enter text here</string>
   <string name="send_hint_for_call">Enter number here</string>
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/AccessibilityChecksTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/AccessibilityChecksTest.java
index 50cec00bc..1c5d4327e 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/AccessibilityChecksTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/AccessibilityChecksTest.java
@@ -25,7 +25,6 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
-import android.os.Build;
 import android.view.View;
 import android.widget.LinearLayout.LayoutParams;
 import androidx.test.core.app.ActivityScenario;
@@ -81,7 +80,7 @@ public void testRunAccessibilityChecks_usingPressMenuKey() {
     // accessibility checks will be run, so there will be an error thrown for a small touch target
     AccessibilityChecks.enable();
     try {
-      onView(withId(R.id.large_view)).perform(actionWithAssertions(pressMenuKey()));
+      onView(withId(R.id.large_view)).perform(pressMenuKey());
       fail("Should have thrown an exception for a small touch target");
     } catch (AccessibilityViewCheckException e) {
       assertEquals(1, e.getResults().size());
@@ -137,12 +136,9 @@ public void testRunAccessibilityChecks_usingCustomConfiguration() {
     // set the checks to check the whole screen, not just the view being acted upon
         .setRunChecksFromRootView(true);
     try {
-      onView(withId(R.id.large_view)).perform(actionWithAssertions(pressMenuKey()));
+      onView(withId(R.id.large_view)).perform(pressMenuKey());
     } catch (AccessibilityViewCheckException e) {
-      // There are framework bugs for APIs 16 and below that cause extra errors.
-      if (Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN) {
-        fail(String.format("Exception should have been suppressed. %1$s", e.toString()));
-      }
+      fail(String.format("Exception should have been suppressed. %1$s", e.toString()));
     }
   }
 
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml
index 9ab282b51..1ee68b853 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest.xml
@@ -19,8 +19,8 @@
     package="androidx.test.ui.app.tests" >
 
     <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
+        android:minSdkVersion="23"
+        android:targetSdkVersion="34" />
 
     <application>
         <uses-library android:name="android.test.runner" />
@@ -28,7 +28,7 @@
 
 
     <instrumentation
-        android:name="com.google.android.apps.common.testing.testrunner.GoogleInstrumentationTestRunner"
+        android:name="androidx.test.runner.AndroidJUnitRunner"
         android:targetPackage="androidx.test.ui.app" />
 
 </manifest>
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest_opensource.xml b/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest_opensource.xml
deleted file mode 100644
index b12fc6962..000000000
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/AndroidManifest_opensource.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="androidx.test.ui.app.tests" >
-
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="28" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="androidx.test.ui.app" />
-
-</manifest>
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD b/testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD
new file mode 100644
index 000000000..c6aa0acad
--- /dev/null
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD
@@ -0,0 +1,5 @@
+# Description:
+#   Sample UI tests.
+
+load("//build_extensions:android_app_instrumentation_tests.bzl", "android_app_instrumentation_tests")
+load("//build_extensions:android_library_test.bzl", "axt_android_library_test")
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD.bazel b/testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD.bazel
deleted file mode 100644
index 87d131afa..000000000
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/BUILD.bazel
+++ /dev/null
@@ -1,90 +0,0 @@
-# Description:
-#   Ui testapp tests.
-
-licenses(["notice"])  # Apache License 2.0
-
-TESTAPP_TEST_SRCS = glob(
-    ["**/*.java"],
-)
-
-TESTAPP_DEPS = [
-    "//testapps/ui_testapp/java/androidx/test/ui/app:lib_neverlink",
-    "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks",
-    "//espresso/contrib/java/androidx/test/espresso/contrib:activity_result_matchers",
-    "//espresso/contrib/java/androidx/test/espresso/contrib:drawer_actions",
-    "//espresso/contrib/java/androidx/test/espresso/contrib:picker_actions",
-    "//espresso/core/java/androidx/test/espresso",
-    "//espresso/idling_resource/java/androidx/test/espresso:counting_idling_resource",
-    "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:uri_idling_resource",
-    "//espresso/intents/java/androidx/test/espresso/intent:intents",
-    "//espresso/intents/java/androidx/test/espresso/intent/matcher",
-    "//espresso/web/java/androidx/test/espresso/web/action",
-    "//espresso/web/java/androidx/test/espresso/web/assertion",
-    "//espresso/web/java/androidx/test/espresso/web/matcher",
-    "//espresso/web/java/androidx/test/espresso/web/model",
-    "//espresso/web/java/androidx/test/espresso/web/sugar",
-    "//espresso/web/java/androidx/test/espresso/web/webdriver",
-    "//runner/android_junit_runner",
-    "//runner/rules",
-    "//core",
-    "//ext/junit",
-]
-
-EXTERNAL_DEPS = [
-    "@maven//:com_google_android_apps_common_testing_accessibility_framework_accessibility_test_framework",
-    "//:androidx_annotation",
-    "@maven//:javax_inject_javax_inject",
-    "@maven//:org_hamcrest_hamcrest_all",
-    "@maven//:com_google_code_findbugs_jsr305",
-    "@maven//:com_google_guava_guava",
-    "@maven//:junit_junit",
-]
-
-ALL_DEPS = EXTERNAL_DEPS + TESTAPP_DEPS
-
-java_library(
-    name = "test_deps",
-    testonly = 1,
-    visibility = ["//visibility:public"],
-    exports = ALL_DEPS,
-)
-
-android_library(
-    name = "espresso_ui_testapp_test_lib",
-    testonly = 1,
-    srcs = TESTAPP_TEST_SRCS,
-    assets = glob(["assets/**"]),
-    assets_dir = "assets",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":test_deps"],
-)
-
-android_binary(
-    name = "espresso_ui_testapp_tests",
-    testonly = 1,
-    instruments = "//testapps/ui_testapp/java/androidx/test/ui/app:testapp",
-    manifest = "AndroidManifest_opensource.xml",
-    deps = [":espresso_ui_testapp_test_lib"],
-)
-
-API_LEVELS = [
-    "19_x86",
-    "21_x86",
-    "22_x86",
-    "23_x86",
-]
-
-[android_instrumentation_test(
-    name = "espresso_ui_testapp_tests_%s" % api_level,
-    size = "large",
-    # Increase timeout, as all tests run in one test target, see:
-    # https://docs.bazel.build/versions/master/test-encyclopedia.html#role-of-the-test-runner
-    timeout = "eternal",
-    args = [
-        "--clear_package_data",
-        # Install test services, this is required as the services are not part of the image
-        "--install_test_services=True",  # Required for Bazel 0.11, can be removed in 0.12
-    ],
-    target_device = "//tools/android/emulated_devices/generic_phone:android_%s_qemu2" % (api_level),
-    test_app = ":espresso_ui_testapp_tests",
-) for api_level in API_LEVELS]
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/ChatHeadActivityTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/ChatHeadActivityTest.java
index bd1ece4f4..bd5625131 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/ChatHeadActivityTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/ChatHeadActivityTest.java
@@ -17,13 +17,10 @@
 package androidx.test.ui.app;
 
 import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.Espresso.pressBackUnconditionally;
 import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
 import static androidx.test.espresso.matcher.RootMatchers.withDecorView;
 import static androidx.test.espresso.matcher.ViewMatchers.isFocusable;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withTagValue;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
 import static org.hamcrest.Matchers.allOf;
@@ -35,11 +32,9 @@
 import android.util.Log;
 import android.view.View;
 import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SdkSuppress;
 import androidx.test.filters.SmallTest;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
-import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -67,73 +62,6 @@ public void setUp() {
   public void tearDown() {
   }
 
-  @SdkSuppress(maxSdkVersion = 22) // Requires special permission to draw over other apps
-  @Test
-  public void testFindingRootViewWithNotFocusableFlagSetOnTheWindowManager()
-      throws InterruptedException {
-    // Create a chat head
-    onView(withId(R.id.create_chat_head_btn)).perform(click());
-
-    // Verify chat head changed color
-    onView(withId(R.id.chat_head_btn_id))
-        .inRoot(withDecorView(not(is(activity.getWindow().getDecorView()))))
-        .check(matches(withTagValue((Matchers.is((Object) "red")))));
-
-    // Preform a click on the chat head button
-    Log.d(TAG, "click on chat chat head...");
-    clickOnChatHead();
-    Log.d(TAG, "click on chat chat head...");
-    clickOnChatHead();
-    Log.d(TAG, "click on chat chat head...");
-    clickOnChatHead();
-
-    // Verify chat head changed color
-    onView(withId(R.id.chat_head_btn_id))
-        .inRoot(withDecorView(not(is(activity.getWindow().getDecorView()))))
-        .check(matches(withTagValue((Matchers.is((Object) "blue")))));
-
-
-    // Preform a click on the chat head button
-    Log.d(TAG, "click on chat chat head...");
-    clickOnChatHead();
-
-    // Verify chat head changed color
-    onView(withId(R.id.chat_head_btn_id))
-        .inRoot(withDecorView(not(is(activity.getWindow().getDecorView()))))
-        .check(matches(withTagValue((Matchers.is((Object) "red")))));
-
-    // Destroy chat head
-    onView(withId(R.id.destroy_chat_head_btn)).perform(click());
-  }
-
-  @SdkSuppress(maxSdkVersion = 22) // Requires special permission to draw over other apps
-  @Test
-  public void testNoActivityApi() throws InterruptedException {
-    // Create a chat head
-    onView(withId(R.id.create_chat_head_btn)).perform(click());
-
-    // Verify chat head changed color
-    Log.d(TAG, "Varying chat head color is red");
-    onView(withId(R.id.chat_head_btn_id))
-        .inRoot(withDecorView(not(is(activity.getWindow().getDecorView()))))
-        .check(matches(withTagValue((Matchers.is((Object) "red")))));
-
-    Log.d(TAG, "click on chat chat head...");
-    clickOnChatHead();
-
-    Log.d(TAG, "pressBack");
-    pressBackUnconditionally();
-
-    Log.d(TAG, "click on chat chat head...");
-    onView(withId(R.id.chat_head_btn_id)).noActivity().perform(click());
-
-    // Verify chat head changed color
-    Log.d(TAG, "Varying chat head color is red");
-    onView(withId(R.id.chat_head_btn_id))
-        .noActivity()
-        .check(matches(withTagValue((Matchers.is((Object) "red")))));
-  }
-
   /** Helper method to click on the chat head */
   private void clickOnChatHead() {
     onView(withId(R.id.chat_head_btn_id))
@@ -147,5 +75,4 @@ private void clickOnChatHead() {
         )
         .perform(click());
   }
-
 }
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/DrawerActionsTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/DrawerActionsTest.java
index f9664ba73..c09fb5b8f 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/DrawerActionsTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/DrawerActionsTest.java
@@ -34,7 +34,6 @@
 import androidx.test.espresso.contrib.DrawerActions;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -50,7 +49,6 @@ public void setUp() throws Exception {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 20) // b/26957451
   public void testOpenAndCloseDrawer() {
     // Drawer should not be open to start.
     onView(withId(R.id.drawer_layout)).check(matches(isClosed()));
@@ -67,7 +65,6 @@ public void testOpenAndCloseDrawer() {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 20) // b/26957451
   public void testDrawerOpenAndClick() {
     openDrawer(R.id.drawer_layout);
 
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/DuplicateViewActivityTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/DuplicateViewActivityTest.java
new file mode 100644
index 000000000..644a240d9
--- /dev/null
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/DuplicateViewActivityTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.ui.app;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test cases that generates {@link androidx.test.espresso.NoMatchingViewException} and {@link
+ * androidx.test.espresso.AmbiguousViewMatcherException}. The tests fails and must be run with a
+ * test_result_assertion_plugin that validate expected failure, see BUILD for details.
+ */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class DuplicateViewActivityTest {
+
+  @Rule
+  public ActivityScenarioRule<DuplicateViewActivity> activityScenarioRule =
+      new ActivityScenarioRule<>(DuplicateViewActivity.class);
+
+  @Test
+  public void testNoMatchingViewException() {
+    // The requested withId() is not in the layout.
+    // This fails with NoMatchingViewException.
+    onView(withId(android.R.id.list)).check(matches(withText("Hello world!")));
+  }
+
+  @Test
+  public void testAmbiguousViewMatcherException() {
+    // There are 2 views with the requested string.
+    // This fails with AmbiguousViewMatcherException.
+    onView(withText("Message"))
+        .check(matches(withText("Ambiguous match due to views with same text.")));
+  }
+}
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/MainActivityTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/MainActivityTest.java
index ffdc44f92..45b5a454a 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/MainActivityTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/MainActivityTest.java
@@ -25,8 +25,6 @@
 import static org.hamcrest.Matchers.hasEntry;
 import static org.hamcrest.Matchers.instanceOf;
 
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.view.View;
 import android.widget.ListView;
 import androidx.test.espresso.UiController;
@@ -76,9 +74,6 @@ public void perform(UiController uiController, View view) {
             || "TransitionActivityMain".equals(title)
             || "SimpleActivity".equals(title)) {
           continue;
-        } else if ("FragmentStack".equals(title)
-            && VERSION.SDK_INT < VERSION_CODES.ICE_CREAM_SANDWICH) {
-          continue;
         }
         contents.add(title);
       }
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/MenuTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/MenuTest.java
index 01e685b8d..aa5ea8e3b 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/MenuTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/MenuTest.java
@@ -30,7 +30,6 @@
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,9 +44,7 @@ public void setUp() throws Exception {
     ActivityScenario.launch(MenuActivity.class);
   }
 
-  // popup menus are post honeycomb.
   @Test
-  @SdkSuppress(minSdkVersion = 11)
   public void testPopupMenu() {
     onView(withText(R.string.popup_item_1_text)).check(doesNotExist());
     onView(withId(R.id.popup_button)).perform(click());
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/SwipeTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/SwipeTest.java
index f99e6c051..2426b8d98 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/SwipeTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/SwipeTest.java
@@ -17,6 +17,7 @@
 package androidx.test.ui.app;
 
 import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.slowSwipeLeft;
 import static androidx.test.espresso.action.ViewActions.swipeLeft;
 import static androidx.test.espresso.action.ViewActions.swipeRight;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
@@ -32,7 +33,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-/** Demonstrates use of {@link ViewActions#swipeLeft()} and {@link ViewActions#swipeRight()}. */
+/**
+ * Demonstrates use of {@link ViewActions#swipeLeft()}, {@link ViewActions#slowSwipeLeft()}, and
+ * {@link ViewActions#swipeRight()}.
+ */
 @RunWith(AndroidJUnit4.class)
 @LargeTest
 public class SwipeTest {
@@ -54,6 +58,18 @@ public void testSwipingThroughViews() {
     onView(withText("Position #2")).check(matches(isDisplayed()));
   }
 
+  @Test
+  public void testSwipingSlowlyThroughViews() {
+    // Should be on position 0 to start with.
+    onView(withText("Position #0")).check(matches(isDisplayed()));
+
+    onView(withId(R.id.pager_layout)).perform(slowSwipeLeft());
+    onView(withText("Position #1")).check(matches(isDisplayed()));
+
+    onView(withId(R.id.pager_layout)).perform(slowSwipeLeft());
+    onView(withText("Position #2")).check(matches(isDisplayed()));
+  }
+
   @Test
   public void testSwipingBackAndForward() {
     // Should be on position 0 to start with.
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/TaskStackTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/TaskStackTest.java
index ead6c7f33..384ed22f1 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/TaskStackTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/TaskStackTest.java
@@ -54,7 +54,6 @@ public void testTaskStack() {
     onView(withText("drawer activity")).check(matches(isDisplayed()));
   }
 
-
   @Test
   public void testBackUnconditionallyExitsAppAndDoesNotThrow() {
     onView(withText("display activity")).check(matches(isDisplayed()));
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/TransitionActivityMainTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/TransitionActivityMainTest.java
index 7321edade..8f34e117b 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/TransitionActivityMainTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/TransitionActivityMainTest.java
@@ -30,7 +30,6 @@
 import androidx.test.core.app.ActivityScenario.ActivityAction;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
-import androidx.test.filters.SdkSuppress;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,10 +47,7 @@ public void setUp() throws Exception {
     activityScenario = ActivityScenario.launch(TransitionActivityMain.class);
   }
 
-  // This test only applies to Lollipop+
-  // b/29833613
   @Test
-  @SdkSuppress(minSdkVersion = 21)
   public void testTransition() throws InterruptedException {
     onView(withId(R.id.grid)).check(matches(isDisplayed()));
     onData(Matchers.anything()).atPosition(0).perform(click());
@@ -62,7 +58,6 @@ public void testTransition() throws InterruptedException {
   }
 
   @Test
-  @SdkSuppress(minSdkVersion = 21)
   public void testInterruptedBackDoesntExit() {
     // Set a flag in the activity to intercept the back button.
     activityScenario.onActivity(
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/TruncatedViewHierarchyActivityTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/TruncatedViewHierarchyActivityTest.java
new file mode 100644
index 000000000..15aab5b10
--- /dev/null
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/TruncatedViewHierarchyActivityTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package androidx.test.ui.app;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+import static org.junit.Assert.assertNotNull;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Test cases generates a large view hierarchy, enough for it to be truncated. */
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class TruncatedViewHierarchyActivityTest {
+
+  /**
+   * Creates an activity with 2 levels of views such that the view hierarchy dump is fairly long yet
+   * does not get truncated.
+   *
+   * <p>This fails with NoMatchingViewException and dumps the view hierarchy as well as the stack
+   * trace of where the view matcher failed.
+   */
+  @Test
+  public void testViewHierarchyNotTruncated() {
+    Intent intent =
+        Intent.makeMainActivity(
+            new ComponentName(
+                getInstrumentation().getTargetContext(), TruncatedViewHierarchyActivity.class));
+    intent.putExtra(TruncatedViewHierarchyActivity.LEVEL_INTENT_KEY, 2);
+    try (ActivityScenario<Activity> scenario = ActivityScenario.launch(intent)) {
+      assertNotNull(scenario);
+      // The requested withId() is not in the layout.
+      // This fails with NoMatchingViewException and dumps the view hierarchy.
+      onView(withId(android.R.id.list)).check(matches(withText("Hello world!")));
+    }
+  }
+
+  /**
+   * Creates an activity with 3 levels of views such that the view hierarchy dump is long enough to
+   * be truncated in the log output.
+   *
+   * <p>This fails with NoMatchingViewException and dumps the view hierarchy as well as the stack
+   * trace of where the view matcher failed.
+   */
+  @Test
+  public void testViewHierarchyIsTruncated() {
+    Intent intent =
+        Intent.makeMainActivity(
+            new ComponentName(
+                getInstrumentation().getTargetContext(), TruncatedViewHierarchyActivity.class));
+    intent.putExtra(TruncatedViewHierarchyActivity.LEVEL_INTENT_KEY, 3);
+    try (ActivityScenario<Activity> scenario = ActivityScenario.launch(intent)) {
+      assertNotNull(scenario);
+      // The requested withId() is not in the layout.
+      // This fails with NoMatchingViewException and dumps the view hierarchy.
+      onView(withId(android.R.id.list)).check(matches(withText("Hello world!")));
+    }
+  }
+
+}
diff --git a/testapps/ui_testapp/javatests/androidx/test/ui/app/VerticalSwipeTest.java b/testapps/ui_testapp/javatests/androidx/test/ui/app/VerticalSwipeTest.java
index 27450937e..a1eb03c4f 100644
--- a/testapps/ui_testapp/javatests/androidx/test/ui/app/VerticalSwipeTest.java
+++ b/testapps/ui_testapp/javatests/androidx/test/ui/app/VerticalSwipeTest.java
@@ -24,23 +24,20 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
-import androidx.test.core.app.ActivityScenario;
 import androidx.test.espresso.action.ViewActions;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.filters.LargeTest;
-import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 /** Demonstrates use of {@link ViewActions#swipeUp()} and {@link ViewActions#swipeDown()}. */
 @RunWith(AndroidJUnit4.class)
-@LargeTest
 public class VerticalSwipeTest {
 
-  @Before
-  public void setUp() throws Exception {
-    ActivityScenario.launch(VerticalViewPagerActivity.class);
-  }
+  @Rule
+  public ActivityScenarioRule<VerticalViewPagerActivity> activityScenarioRule =
+      new ActivityScenarioRule<>(VerticalViewPagerActivity.class);
 
   @Test
   public void testSwipingThroughViews() {
diff --git a/tools/device_broker/proto/BUILD.bazel b/tools/device_broker/proto/BUILD.bazel
index 35a6472fc..4354f2fd4 100644
--- a/tools/device_broker/proto/BUILD.bazel
+++ b/tools/device_broker/proto/BUILD.bazel
@@ -29,6 +29,5 @@ proto_library(
 
 java_proto_library(
     name = "test_info_pb_java_proto",
-    strict_deps = 0,
     deps = [":test_info_pb"],
 )
diff --git a/tools/release/androidx_import_generator.py b/tools/release/androidx_import_generator.py
new file mode 100644
index 000000000..37f803106
--- /dev/null
+++ b/tools/release/androidx_import_generator.py
@@ -0,0 +1,150 @@
+"""Script to update the androidx repo with the released axt versions."""
+
+from collections.abc import Sequence
+import fileinput
+import os
+
+from absl import app
+
+from tools.release import release_versions
+
+
+def main(argv: Sequence[str]) -> None:
+  if len(argv) > 1:
+    raise app.UsageError('Too many command-line arguments.')
+
+  _edit_gradle_versions()
+  _edit_docs_versions()
+  _output_import_command()
+
+
+def _edit_gradle_versions():
+  """Edit the gradle versions in the androidx repo."""
+  androidx_home = os.environ['ANDROIDX_HOME']
+  gradle_versions_path = os.path.join(
+      androidx_home, 'frameworks/support/gradle/libs.versions.toml'
+  )
+  print('Modifying ' + gradle_versions_path)
+  print('')
+  with fileinput.input(files=[gradle_versions_path], inplace=True) as file:
+    for line in file:
+      if line.startswith('espresso = "'):
+        print(
+            'espresso = "{Espresso}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('espressoDevice = "'):
+        print(
+            'espressoDevice = "{Espresso Device}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('androidxTestRunner = "'):
+        print(
+            'androidxTestRunner = "{Runner}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('androidxTestRules = "'):
+        print(
+            'androidxTestRules = "{Rules}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('androidxTestMonitor = "'):
+        print(
+            'androidxTestMonitor = "{Monitor}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('androidxTestCore = "'):
+        print(
+            'androidxTestCore = "{Core}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('androidxTestExtJunit = "'):
+        print(
+            'androidxTestExtJunit = "{JUnit Extensions}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      elif line.startswith('androidxTestExtTruth = "'):
+        print(
+            'androidxTestExtTruth = "{Truth Extensions}"'.format(
+                **release_versions.RELEASED_VERSIONS_DICT
+            )
+        )
+      else:
+        print(line.rstrip())
+
+
+def _edit_docs_versions():
+  """Edit the axt versions used in docs-public build in androidx repo."""
+  androidx_home = os.environ['ANDROIDX_HOME']
+  docs_version_path = os.path.join(
+      androidx_home, 'frameworks/support/docs-public/build.gradle'
+  )
+  print('Modifying ' + docs_version_path)
+  print('')
+
+  output = True
+  with fileinput.input(files=[docs_version_path], inplace=True) as file:
+    for line in file:
+      if 'docsWithoutApiSince("androidx.test' in line:
+        if output:
+          print(
+              """    docsWithoutApiSince("androidx.test:core:{Core}")
+    docsWithoutApiSince("androidx.test:core-ktx:{Core}")
+    docsWithoutApiSince("androidx.test:monitor:{Monitor}")
+    docsWithoutApiSince("androidx.test:rules:{Rules}")
+    docsWithoutApiSince("androidx.test:runner:{Runner}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-accessibility:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-contrib:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-core:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-device:{Espresso Device}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-idling-resource:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-intents:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-remote:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso:espresso-web:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso.idling:idling-concurrent:{Espresso}")
+    docsWithoutApiSince("androidx.test.espresso.idling:idling-net:{Espresso}")
+    docsWithoutApiSince("androidx.test.ext:junit:{JUnit Extensions}")
+    docsWithoutApiSince("androidx.test.ext:junit-ktx:{JUnit Extensions}")
+    docsWithoutApiSince("androidx.test.ext:truth:{Truth Extensions}")
+    docsWithoutApiSince("androidx.test.services:storage:{Services}")""".format(
+                  **release_versions.RELEASED_VERSIONS_DICT
+              )
+          )
+        output = False
+      else:
+        print(line.rstrip())
+
+
+def _output_import_command():
+  """Output the command to download the maven artifacts in androidx repo."""
+  print('Run this command:')
+  print(
+      """
+        development/importMaven/importMaven.sh \\
+        androidx.test.espresso:espresso-accessibility:{Espresso} \\
+        androidx.test.espresso:espresso-device:{Espresso Device} \\
+        androidx.test.espresso:espresso-remote:{Espresso} \\
+        androidx.test.espresso.idling:idling-concurrent:{Espresso} \\
+        androidx.test.espresso.idling:idling-net:{Espresso} \\
+        androidx.test.espresso:espresso-contrib:{Espresso}  \\
+        androidx.test.ext:truth:{Truth Extensions} \\
+        androidx.test.ext:junit-ktx:{JUnit Extensions} \\
+        androidx.test:monitor:{Monitor} \\
+        androidx.test:rules:{Rules} \\
+        androidx.test:runner:{Runner} \\
+        androidx.test.espresso:espresso-intents:{Espresso} \\
+        androidx.test:core-ktx:{Core}""".format(
+          **release_versions.RELEASED_VERSIONS_DICT
+      )
+  )
+
+
+if __name__ == '__main__':
+  app.run(main)
diff --git a/tools/release/cherrypick_to_release_branch.sh b/tools/release/cherrypick_to_release_branch.sh
new file mode 100755
index 000000000..492bcac98
--- /dev/null
+++ b/tools/release/cherrypick_to_release_branch.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Script to cherry pick a commit to a 'in progress' release branch
+#
+#
+# Usage:
+# export RELEASE_BRANCH=axt_XXX_release_branch # if not already defined
+# bash tools/release/cherrypick_to_release_branch.sh commit_hash
+
+set -e
+
+if [[ -n $(git status -s) ]]; then
+    echo "Error: git directory is not clean; check 'git status'"
+    exit 1
+fi
+
+if [ "$#" -ne 1 ]; then
+    echo "Error: Unexpected number of parameters: Usage: cherrypick_to_release_branch.sh commit_hash"
+    exit 1
+fi
+
+if [[ ! "$RELEASE_BRANCH" =~ "release_branch" ]]; then
+    echo "Error: RELEASE_BRANCH env var is undefined or does not contain 'release_branch'"
+    exit 1
+fi
+
+echo "Syncing main branch"
+git remote update
+git checkout main
+git pull
+
+echo "Checking out ${RELEASE_BRANCH}_in_progress and syncing"
+git checkout ${RELEASE_BRANCH}_in_progress
+git pull
+
+echo "Cherrypicking $1 and pushing upstream"
+git cherry-pick $1
+git push --set-upstream origin ${RELEASE_BRANCH}_in_progress
+
+echo "Navigate to https://github.com/android/android-test/compare/${RELEASE_BRANCH}...${RELEASE_BRANCH}_in_progress to create a PR"
+
diff --git a/tools/release/create_release_branch.sh b/tools/release/create_release_branch.sh
new file mode 100755
index 000000000..60968cebf
--- /dev/null
+++ b/tools/release/create_release_branch.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Script to create a release branch and associated working 'in progress' branch
+#
+# Usage: bash tools/release/create_release_branch.sh [--stable]
+
+set -e
+
+if [[ -n $(git status -s) ]]; then
+    echo "Error: git directory is not clean; check 'git status'"
+    exit 1
+fi
+
+echo "Syncing main branch"
+git remote update
+git checkout main
+git pull
+
+DATE=$(date -u "+%Y_%m_%d")
+if [[ $1 == "--stable" ]]; then
+    RELEASE_BRANCH="axt_${DATE}_stable_release_branch"
+else
+    RELEASE_BRANCH="axt_${DATE}_release_branch"
+fi
+
+echo "Creating $RELEASE_BRANCH"
+git checkout -b $RELEASE_BRANCH
+git push --set-upstream origin $RELEASE_BRANCH
+
+echo "Creating ${RELEASE_BRANCH}_in_progress"
+git checkout -b ${RELEASE_BRANCH}_in_progress
+
+echo "Creating complete. Now do the following steps"
+echo "vim build_extensions/axt_versions.bzl"
+echo "bash tools/release/validate_and_propagate_versions.sh"
+echo "git diff"
+echo "Examine the output and ensure the changes to settings.gradle and BUILD look correct"
+echo "git commit -a -m 'Update artifacts and version numbers for $DATE release'"
+echo "git push --set-upstream origin ${RELEASE_BRANCH}_in_progress"
+echo "Navigate to https://github.com/android/android-test/compare/${RELEASE_BRANCH}...${RELEASE_BRANCH}_in_progress to create a PR"
+
diff --git a/tools/release/java/androidx/test/tools/releaseupdater/BUILD b/tools/release/java/androidx/test/tools/releaseupdater/BUILD
new file mode 100644
index 000000000..5ddabc1ac
--- /dev/null
+++ b/tools/release/java/androidx/test/tools/releaseupdater/BUILD
@@ -0,0 +1,27 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_binary", "kt_jvm_library")
+
+package(
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+kt_jvm_library(
+    name = "release_updater_lib",
+    srcs = glob([
+        "ReleaseUpdater.kt",
+    ]),
+)
+
+kt_jvm_binary(
+    name = "releaseupdater",
+    srcs = ["Main.kt"],
+    main_class = "androidx.test.tools.releaseupdater.Main",
+    resources = [
+        "//build_extensions:axt_released_versions.bzl",
+        "//build_extensions:axt_versions.bzl",
+    ],
+    deps = [
+        ":release_updater_lib",
+    ],
+)
diff --git a/tools/release/java/androidx/test/tools/releaseupdater/Main.kt b/tools/release/java/androidx/test/tools/releaseupdater/Main.kt
new file mode 100644
index 000000000..5dd5ffc53
--- /dev/null
+++ b/tools/release/java/androidx/test/tools/releaseupdater/Main.kt
@@ -0,0 +1,55 @@
+package androidx.test.tools.releaseupdater
+
+import java.io.InputStream
+import java.util.Scanner
+import kotlin.text.CharCategory
+
+/** Entry point for running the release updating logic. Run via
+ *
+ * bazelisk run //tools/release/java/androidx/test/tools/releaseupdater:releaseupdater | xargs buildozer
+ *
+ * to validate axt_versions.bzl/axt_released_versions.bzl and update //:axt_m2repository
+ */
+class Main {
+
+  companion object {
+    fun parseVersionsToMap(stream: InputStream): MutableMap<String, String> {
+      val map = mutableMapOf<String, String>()
+      Scanner(stream).use {
+        while (it.hasNextLine()) {
+          val line = it.nextLine()
+          if (line.isNotBlank()) {
+            val firstChar = line[0]
+            if (firstChar.category == CharCategory.UPPERCASE_LETTER) {
+              val parsedLine = line.split(" ")
+              // line is of the form 'KEY_VERSION = "value" # comment'
+              if (parsedLine[0].endsWith("VERSION")) {
+                map[parsedLine[0]] = parsedLine[2].drop(1).dropLast(1)
+              }
+            }
+          }
+        }
+      }
+
+      return map
+    }
+
+    @JvmStatic
+    fun main(args: Array<String>) {
+      val versionsToUpdate =
+        parseVersionsToMap(
+          Main::class.java.getClassLoader().getResourceAsStream("build_extensions/axt_versions.bzl")
+        )
+
+      val releasedVersions =
+        parseVersionsToMap(
+          Main::class
+            .java
+            .getClassLoader()
+            .getResourceAsStream("build_extensions/axt_released_versions.bzl")
+        )
+
+      println(ReleaseUpdater().validateAndMakeRemoveSrcsCommand(releasedVersions, versionsToUpdate))
+    }
+  }
+}
diff --git a/tools/release/java/androidx/test/tools/releaseupdater/ReleaseUpdater.kt b/tools/release/java/androidx/test/tools/releaseupdater/ReleaseUpdater.kt
new file mode 100644
index 000000000..a8a4dadc7
--- /dev/null
+++ b/tools/release/java/androidx/test/tools/releaseupdater/ReleaseUpdater.kt
@@ -0,0 +1,247 @@
+package androidx.test.tools.releaseupdater
+
+/** Utility class to use during releases of AndroidX Test maven artifacts.
+ *
+ * This utility does two things:
+ * 1) Reads the old and new version numbers of each artifact, making sure that the versions of any
+ * to-be-released artifacts are bumped correctly
+ * 2) Takes the version mappings and outputs a buildozer command to update //:axt_m2repository so
+ * that we only bundle artifacts that are getting a version bump
+ */
+class ReleaseUpdater {
+
+  /**
+   * Validates that the version is correctly incremented.
+   *
+   * "Correct" increments fall under two categories:
+   * 1) X.X.X (stable) -> Y.Y.Y-alpha01 where validateVersionNumberIncrement('X.X.X', 'Y.Y.Y')
+   *    passes
+   * 2) X.X.X-suffix1 -> X.X.X-suffix2 where validateSuffixIncrement(suffix1, suffix2) passes
+   *
+   * @param oldVersion The original version
+   * @param newVersion The incremented "+1" version
+   * @throws IllegalArgumentException If the version was incorrectly incremented
+   */
+  fun validateVersions(oldVersion: String, newVersion: String): Unit {
+    if (newVersion.indexOf("-") == -1) {
+      // if newVersion doesn't have a -, it means it is a stable version, which
+      // means 'oldVersion' must be an rc with the same version number
+      if (oldVersion.indexOf("-") == -1) {
+        // we don't currently support stable -> stable
+        throw invalidVersionNumberException(newVersion, oldVersion)
+      }
+      val oldVersionNum = oldVersion.split("-")[0]
+      val oldVersionSuffix = oldVersion.split("-")[1]
+      if (newVersion != oldVersionNum || !oldVersionSuffix.startsWith("rc")) {
+        throw invalidVersionException(newVersion, oldVersion)
+      }
+    } else if (oldVersion.indexOf("-") == -1) {
+      // if oldVersion doesn't have a -, it means it is a stable version, which
+      // means 'newVersion' must be an alpha01 of the next version number
+      val newVersionNum = newVersion.split("-")[0]
+      val newVersionSuffix = newVersion.split("-")[1]
+      if (newVersionSuffix != "alpha01") {
+        throw invalidVersionException(newVersion, oldVersion)
+      }
+
+      validateVersionNumberIncrement(oldVersion, newVersionNum)
+    } else {
+      val oldVersionNum = oldVersion.split("-")[0]
+      val oldVersionSuffix = oldVersion.split("-")[1]
+      val newVersionNum = newVersion.split("-")[0]
+      val newVersionSuffix = newVersion.split("-")[1]
+
+      if (oldVersionNum == newVersionNum) {
+        // same number, so check the alpha/beta/rc part
+        validateSuffixIncrement(oldVersionSuffix, newVersionSuffix)
+      } else {
+        // we've already explicitly checked for the two cases where the numbers are different, so
+        // we know this one is invalid
+        throw invalidVersionException(newVersion, oldVersion)
+      }
+    }
+  }
+
+  /**
+   * Validates that the suffix is correctly incremented.
+   *
+   * "Correct" increments fall under two categories:
+   * 1) alphaXX -> beta01, betaXX -> rc01
+   * 2) alphaXX -> alphaYY, betaXX -> betaYY, rcXX -> rcYY, where XX + 1 = YY
+   *
+   * Used in alpha/beta/rc releases. Stable releases do not have a suffix and thus this method does
+   * not handle them.
+   *
+   * @param oldSuffix The original suffix in (alpha/beta/rc)XX format
+   * @param newSuffix The "incremented" suffix in (alpha/beta/rc)XX format
+   * @throws IllegalArgumentException If the suffix was incorrectly incremented
+   */
+  private fun validateSuffixIncrement(oldSuffix: String, newSuffix: String): Unit {
+    val ordering = listOf("alpha", "beta", "rc")
+    val oldAlphaBetaOrRc = oldSuffix.dropLast(2)
+    val oldSuffixNum = oldSuffix.takeLast(2)
+    val newAlphaBetaOrRc = newSuffix.dropLast(2)
+    val newSuffixNum = newSuffix.takeLast(2)
+
+    if (!ordering.contains(oldAlphaBetaOrRc) || !ordering.contains(newAlphaBetaOrRc)) {
+      throw invalidSuffixException(newSuffix, oldSuffix)
+    }
+
+    if (newSuffixNum == "01") {
+      // ensure alpha -> beta01 or beta -> rc01
+      if (ordering.indexOf(oldAlphaBetaOrRc) + 1 != ordering.indexOf(newAlphaBetaOrRc)) {
+        throw invalidSuffixException(newSuffix, oldSuffix)
+      }
+    } else if (oldAlphaBetaOrRc != newAlphaBetaOrRc) {
+      // already checked alpha -> beta or beta -> rc, so if they're still different, it's some
+      // invalid combination
+      throw invalidSuffixException(newSuffix, oldSuffix)
+    } else {
+      // both alpha or both beta or both rc, so just need to make sure that the number at the end
+      // is getting incremented by 1
+      if (oldSuffixNum.toInt(10) + 1 != newSuffixNum.toInt(10)) {
+        throw invalidSuffixException(newSuffix, oldSuffix)
+      }
+    }
+  }
+
+  /**
+   * Validates that the version number is correctly incremented.
+   *
+   * @param oldNumber The original version number in major.minor.bugfix format
+   * @param newNumber The "incremented" version number in major.minor.bugfix format
+   * @throws IllegalArgumentException If the version number was incorrectly incremented
+   */
+  private fun validateVersionNumberIncrement(oldNumber: String, newNumber: String): Unit {
+    val oldMajor = oldNumber.split(".")[0].toInt()
+    val oldMinor = oldNumber.split(".")[1].toInt()
+    val newMajor = newNumber.split(".")[0].toInt()
+    val newMinor = newNumber.split(".")[1].toInt()
+    val newBugfix = newNumber.split(".")[2].toInt()
+
+    if (oldMajor + 1 == newMajor) {
+      if (newMinor != 0 || newBugfix != 0) {
+        throw invalidVersionNumberException(newNumber, oldNumber)
+      }
+    } else if (oldMajor != newMajor) {
+      throw invalidVersionNumberException(newNumber, oldNumber)
+    } else if (oldMinor + 1 == newMinor) {
+      if (newBugfix != 0) {
+        throw invalidVersionNumberException(newNumber, oldNumber)
+      }
+    } else if (oldMinor != newMinor) {
+      throw invalidVersionNumberException(newNumber, oldNumber)
+    } else {
+      // major and minor are the same. But we don't currently want to support "bugfix-only" updates
+      // via this library, (or the version didn't get incremented at all) so we throw
+      throw invalidVersionNumberException(newNumber, oldNumber)
+    }
+  }
+
+  /** Given an "old" and a "new" version mapping, output the arguments to buildozer to use to remove
+   * the maven artifacts *not* being released (i.e. the artifacts for which the version number 
+   * hasn't changed between the two mappings.)
+   *
+   * The keys are variable names from build_extensions/axt_*.bzl, and the values are the maven
+   * artifacts whose versions are controlled by that variable. See
+   * build_extensions/maven/maven_registry.bzl for the corresponding logic.
+   *
+   * For more information about buildozer, see
+   * https://github.com/bazelbuild/buildtools/blob/master/buildozer/README.md
+   *
+   * @param oldVersions The "old" version mapping
+   * @param newVersions The "new" version mapping
+   *
+   * @return The buildozer command to run, as a String
+   */
+  fun validateAndMakeRemoveSrcsCommand(
+    oldVersions: Map<String, String>,
+    newVersions: Map<String, String>
+  ): String {
+    val depsToRemove = mutableListOf<String>()
+
+    for (key in artifactMap.keys) {
+      if (oldVersions[key] == newVersions[key]) {
+        depsToRemove.addAll(artifactMap[key] as Array<String>)
+      }
+    }
+
+    return if (depsToRemove.isEmpty()) {
+      ""
+    } else {
+      "'remove srcs ${depsToRemove.joinToString(" ")}' //:axt_m2repository"
+    }
+  }
+
+  companion object {
+    private fun invalidSuffixException(newSuffix: String, oldSuffix: String) =
+      IllegalArgumentException(String.format("Invalid suffix %s after %s", newSuffix, oldSuffix))
+
+    private fun invalidVersionException(newVersion: String, oldVersion: String) =
+      IllegalArgumentException(
+        String.format("Invalid version %s after %s", newVersion, oldVersion)
+      )
+
+    private fun invalidVersionNumberException(newNumber: String, oldNumber: String) =
+      IllegalArgumentException(
+        String.format("Invalid version number %s after %s", newNumber, oldNumber)
+      )
+
+    private val artifactMap: Map<String, Array<String>> =
+      mapOf(
+        "ANNOTATION_VERSION" to
+          arrayOf("//annotation/java/androidx/test/annotation:annotation_maven_artifact"),
+        "CORE_VERSION" to
+          arrayOf(
+            "//core/java/androidx/test/core:core_maven_artifact",
+            "//ktx/core/java/androidx/test/core:core_maven_artifact",
+          ),
+        "ESPRESSO_VERSION" to
+          arrayOf(
+            "//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
+            "//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",
+            "//espresso/core/java/androidx/test/espresso:espresso_core_maven_artifact",
+            "//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:idling_concurrent_maven_artifact",
+            "//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_maven_artifact",
+            "//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:idling_net_maven_artifact",
+            "//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact",
+            "//espresso/remote/java/androidx/test/espresso/remote:espresso_remote_maven_artifact",
+            "//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact",
+          ),
+        "ESPRESSO_DEVICE_VERSION" to
+          arrayOf(
+            "//espresso/device/java/androidx/test/espresso/device:device_maven_artifact",
+          ),
+        "ANDROIDX_JUNIT_VERSION" to
+          arrayOf(
+            "//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
+            "//ktx/ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
+          ),
+        "ANDROIDX_TRUTH_VERSION" to
+          arrayOf(
+            "//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact",
+          ),
+        "MONITOR_VERSION" to
+          arrayOf(
+            "//runner/monitor/java/androidx/test:monitor_maven_artifact",
+          ),
+        "ORCHESTRATOR_VERSION" to
+          arrayOf(
+            "//runner/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact",
+          ),
+        "RUNNER_VERSION" to
+          arrayOf(
+            "//runner/android_junit_runner/java/androidx/test:runner_maven_artifact",
+          ),
+        "RULES_VERSION" to
+          arrayOf(
+            "//runner/rules/java/androidx/test:rules_maven_artifact",
+          ),
+        "SERVICES_VERSION" to
+          arrayOf(
+            "//services:test_services_maven_artifact",
+            "//services/storage/java/androidx/test/services/storage:test_storage_maven_artifact",
+          ),
+      )
+  }
+}
diff --git a/tools/release/javatests/androidx/test/tools/releaseupdater/BUILD b/tools/release/javatests/androidx/test/tools/releaseupdater/BUILD
new file mode 100644
index 000000000..ede11f2ae
--- /dev/null
+++ b/tools/release/javatests/androidx/test/tools/releaseupdater/BUILD
@@ -0,0 +1,17 @@
+load("@io_bazel_rules_kotlin//kotlin:jvm.bzl", "kt_jvm_test")
+
+package(
+    default_visibility = [
+        "//:__subpackages__",
+    ],
+)
+
+kt_jvm_test(
+    name = "ReleaseUpdaterTest",
+    srcs = ["ReleaseUpdaterTest.kt"],
+    deps = [
+        "//tools/release/java/androidx/test/tools/releaseupdater:release_updater_lib",
+        "@maven//:com_google_truth_truth",
+        "@maven//:junit_junit",
+    ],
+)
diff --git a/tools/release/javatests/androidx/test/tools/releaseupdater/ReleaseUpdaterTest.kt b/tools/release/javatests/androidx/test/tools/releaseupdater/ReleaseUpdaterTest.kt
new file mode 100644
index 000000000..8e5a02803
--- /dev/null
+++ b/tools/release/javatests/androidx/test/tools/releaseupdater/ReleaseUpdaterTest.kt
@@ -0,0 +1,121 @@
+package androidx.test.tools.releaseupdater
+
+import org.junit.Assert.assertThrows
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+/** Unit tests around ReleaseUpdater's version validating logic */
+@RunWith(JUnit4::class)
+class ReleaseUpdaterTest {
+
+  private val releaseUpdater = ReleaseUpdater()
+
+  @Test
+  fun testValidateVersionsSimple() {
+    releaseUpdater.validateVersions("1.0.1-alpha01", "1.0.1-alpha02")
+    releaseUpdater.validateVersions("1.0.1-beta01", "1.0.1-beta02")
+    releaseUpdater.validateVersions("1.0.1-rc01", "1.0.1-rc02")
+  }
+
+  @Test
+  fun testValidateVersionsSameSuffixIncrementToTen() {
+    releaseUpdater.validateVersions("1.0.0-alpha09", "1.0.0-alpha10")
+    releaseUpdater.validateVersions("1.0.0-beta09", "1.0.0-beta10")
+    releaseUpdater.validateVersions("1.0.0-rc09", "1.0.0-rc10")
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnSuffixPlusTwo() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0-alpha01", "1.0.0-alpha03")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnDoubleIncrement() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0-alpha01", "1.1.0-alpha02")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsStableToAlpha() {
+    releaseUpdater.validateVersions("1.0.0", "1.1.0-alpha01")
+    releaseUpdater.validateVersions("1.0.0", "2.0.0-alpha01")
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnStableToAlphaOnVersionPlusTwo() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.2.0-alpha01")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnStableToAlphaSuffixPlusTwo() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.1.0-alpha02")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnStableToAlphaOnPatchIncrement() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.0.1-alpha01")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnStableToAlphaOnNoIncrement() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.0.0-alpha01")
+    }
+  }
+
+  @Test
+  fun testValidateVersiosnFailsOnStableToAlphaOnBadIncrement() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "2.1.0-alpha01")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnStableToBeta() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.1.0-beta01")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsFailsOnStableToRc() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.1.0-rc01")
+    }
+  }
+
+  @Test
+  fun testValidateVeresionsFailsOnStableToStable() {
+    assertThrows(IllegalArgumentException::class.java) {
+      releaseUpdater.validateVersions("1.0.0", "1.0.1")
+    }
+  }
+
+  @Test
+  fun testValidateVersionsAlphaToBeta() {
+    releaseUpdater.validateVersions("1.0.1-alpha01", "1.0.1-beta01")
+    releaseUpdater.validateVersions("1.0.1-alpha02", "1.0.1-beta01")
+  }
+
+  @Test
+  fun testValidateVersionsBetaToRc() {
+    releaseUpdater.validateVersions("1.0.1-beta01", "1.0.1-rc01")
+    releaseUpdater.validateVersions("1.0.1-beta02", "1.0.1-rc01")
+  }
+
+  @Test
+  fun testValidateVersionsRcToStable() {
+    releaseUpdater.validateVersions("1.0.1-rc01", "1.0.1")
+    releaseUpdater.validateVersions("1.0.1-rc02", "1.0.1")
+  }
+}
diff --git a/tools/release/validate_and_propagate_versions.sh b/tools/release/validate_and_propagate_versions.sh
new file mode 100755
index 000000000..fc65ed72d
--- /dev/null
+++ b/tools/release/validate_and_propagate_versions.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+# This script will do the following:
+#
+# 1) Validate that the version numbers in axt_versions.bzl were incremented
+# correctly
+# 2) Update //:axt_m2repository based off of axt_versions.bzl
+# 3) Update gradle-tests/settings.gradle using axt_versions.bzl
+#
+# To run, execute this script from the repository root:
+#
+# cd $REPOSITORY_ROOT
+# bash tools/release/validate_and_propagate_versions.sh
+#
+
+OUTPUT=`bazelisk run //tools/release/java/androidx/test/tools/releaseupdater:releaseupdater`
+if [[ ! -z "$OUTPUT" ]]; then
+  echo $OUTPUT | xargs buildozer
+fi
+bazelisk build //gradle-tests:update_settings_gradle_rule
+cp bazel-bin/gradle-tests/settings.gradle.generated gradle-tests/settings.gradle